Browse Source

修改入库功能

lwx_dev
erdanergou 3 years ago
parent
commit
ed2e3e781e
  1. 5
      src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java
  2. 2
      src/test/java/com/dreamchaser/depository_manage/TestForOther.java

5
src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java

@ -2602,7 +2602,6 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
// 如果审核通过 // 如果审核通过
map.put("state", "已入库"); map.put("state", "已入库");
// 获取具体入库订单 // 获取具体入库订单
ApplicationInRecord recordP = depositoryRecordMapper.findApplicationInRecordPById(ObjectFormatUtil.toInteger(id)); ApplicationInRecord recordP = depositoryRecordMapper.findApplicationInRecordPById(ObjectFormatUtil.toInteger(id));
@ -2613,7 +2612,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
// 用于调用入库方法而创建的 // 用于调用入库方法而创建的
Map<String, Object> paramForUpdateInventory = new HashMap<>(); Map<String, Object> paramForUpdateInventory = new HashMap<>();
paramForUpdateInventory.put("mid", recordP.getMid()); paramForUpdateInventory.put("mid", recordP.getMid());
paramForUpdateInventory.put("quantity", recordP.getQuantity()); paramForUpdateInventory.put("quantity", (double)recordP.getQuantity() / 100);
paramForUpdateInventory.put("depositoryId", recordP.getDepositoryId()); paramForUpdateInventory.put("depositoryId", recordP.getDepositoryId());
paramForUpdateInventory.put("placeId", recordP.getPlaceId()); paramForUpdateInventory.put("placeId", recordP.getPlaceId());
if (materialById.getUnit().equals(recordP.getAirUnit())) { if (materialById.getUnit().equals(recordP.getAirUnit())) {
@ -2683,7 +2682,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
splitInventory = splitUnitMapper.findSplitInventoryByIidAndSid(paramForInsertSplitInventory); splitInventory = splitUnitMapper.findSplitInventoryByIidAndSid(paramForInsertSplitInventory);
} }
} }
splitUnitService.realInInventoryToDepository((double) recordP.getQuantity(), splitInventory, paramForUpdateInventory, splitInfoForUnit, placeAndMaterialByMidAndPid, true); splitUnitService.realInInventoryToDepository((double) recordP.getQuantity() / 100, splitInventory, paramForUpdateInventory, splitInfoForUnit, placeAndMaterialByMidAndPid, true);
if (paramForUpdateInventory.containsKey("applicationInId")) { if (paramForUpdateInventory.containsKey("applicationInId")) {
depositoryRecordMapper.deleteApplicationInRecordById(ObjectFormatUtil.toInteger(paramForUpdateInventory.get("applicationInId"))); depositoryRecordMapper.deleteApplicationInRecordById(ObjectFormatUtil.toInteger(paramForUpdateInventory.get("applicationInId")));
} }

2
src/test/java/com/dreamchaser/depository_manage/TestForOther.java

@ -46,7 +46,7 @@ public class TestForOther {
ApprovalInfo_Details_Approver approver = new ApprovalInfo_Details_Approver(); ApprovalInfo_Details_Approver approver = new ApprovalInfo_Details_Approver();
approver.setUserId("PangFuZhen"); approver.setUserId("PangFuZhen");
approvalInfo.setApprover(approver); approvalInfo.setApprover(approver);
depositoryRecordService.reviewByQyWxApprovalIn("[6]",approvalInfo,"460f46eaefb46bb0c171029f62e2cea6","2","202303170017"); depositoryRecordService.reviewByQyWxApprovalIn("[12]",approvalInfo,"460f46eaefb46bb0c171029f62e2cea6","2","202303170025");
} }

Loading…
Cancel
Save