Commit a5d317341bf1b72f2854492b79ba468bda109e5d

Authored by 肖超群
1 parent b3e78a76

修改物料增加接口

huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/erp/service/impl/ErpServiceImpl.java
... ... @@ -400,15 +400,16 @@ public class ErpServiceImpl implements IErpService {
400 400 material.setId(material1.getId());
401 401 boolean success = materialService.updateById(material);
402 402 if (!success) {
403   - throw new JeecgBootException("增加物料失败, 更新时报错");
  403 + throw new JeecgBootException("更新物料失败, 更新时报错");
404 404 }
  405 + return Result.ok("更新物料成功");
405 406 } else {
406 407 boolean success = materialService.save(material);
407 408 if (!success) {
408 409 throw new JeecgBootException("增加物料失败, 保存时报错");
409 410 }
  411 + return Result.ok("增加物料成功");
410 412 }
411   - return Result.ok("增加物料成功");
412 413 }
413 414  
414 415 @Override
... ...
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/task/taskHeader/service/impl/TaskHeaderServiceImpl.java
... ... @@ -1321,7 +1321,6 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea
1321 1321 if (receiptHeader == null) {
1322 1322 throw new JeecgBootException("未找到ID:" + receiptDetail.getReceiptId() + "入库单头");
1323 1323 }
1324   -
1325 1324 // 操作记录统计用
1326 1325 taskDetail.setReceiptCode(receiptDetail.getReceiptCode());
1327 1326 BigDecimal qty = receiptDetail.getQty();
... ... @@ -1333,21 +1332,16 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea
1333 1332 updateReceiptDetail.setReceiptId(receiptId);
1334 1333 updateReceiptDetail.setReceiptQty(receiptDetailReceiptQty);
1335 1334 if (receiptDetailReceiptQty.compareTo(qty) >= 0) {
1336   -
1337 1335 updateReceiptDetail.setStatus(QuantityConstant.RECEIPT_HEADER_COMPLETED);
1338 1336 } else {
1339   -
1340 1337 updateReceiptDetail.setStatus(QuantityConstant.RECEIPT_HEADER_SHELF);
1341 1338 }
1342   -
1343 1339 receiptDetaiList.add(updateReceiptDetail);
1344 1340 if (!receiptDetailService.updateById(updateReceiptDetail)) {
1345 1341 throw new JeecgBootException("完成入库任务时,更新入库单详情失败");
1346 1342 }
1347   -
1348 1343 // 计算换算单位数量
1349 1344 materialMultipleService.materialMultiple(taskDetail);
1350   -
1351 1345 InventoryDetail inventoryDetail = new InventoryDetail();
1352 1346 inventoryDetail.setInventoryHeaderId(inventoryHeader.getId());
1353 1347 inventoryDetail.setWarehouseCode(warehouseCode);
... ...