diff --git a/src/main/java/com/dreamchaser/depository_manage/entity/ApplicationOutRecord.java b/src/main/java/com/dreamchaser/depository_manage/entity/ApplicationOutRecord.java index 6a72f8ae..bd51f468 100644 --- a/src/main/java/com/dreamchaser/depository_manage/entity/ApplicationOutRecord.java +++ b/src/main/java/com/dreamchaser/depository_manage/entity/ApplicationOutRecord.java @@ -180,6 +180,11 @@ public class ApplicationOutRecord { */ private String outType; + /** + * 最后修改人员 + */ + private String editUser; + diff --git a/src/main/java/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.xml b/src/main/java/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.xml index 08cf3126..45cb7a02 100644 --- a/src/main/java/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.xml +++ b/src/main/java/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.xml @@ -118,6 +118,7 @@ + @@ -171,7 +172,7 @@ aorid,mid,mname,depositoryId,dname,applicantId,applicantTime,applyRemark,aorcode,aorpirce,aorquantity,departmenthead,departmentheadPass,departmentHeadTime,departmentheadMessage, depositoryManager,depositoryManagerPass,depositoryManagerTime,depositoryManagerMessage,aorstate,istransfer,mcode,placeId,pass,aormUnit,aorconstructionunitid,aoradminorgid,cuname, - cuintroduce,cuaddress,outTime,abstract,outType + cuintroduce,cuaddress,outTime,abstract,outType,editUser @@ -1458,6 +1459,9 @@ outType = #{outType}, + + editUser = #{editUser}, + pass = #{pass} diff --git a/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java b/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java index aea8cb2c..a72c8201 100644 --- a/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java +++ b/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java @@ -1859,7 +1859,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { Map paramForUpdateSplitInventory = new HashMap<>(); paramForUpdateSplitInventory.put("placeId", outRecordMin.getPlaceId()); paramForUpdateSplitInventory.put("depositoryId", outRecordMin.getDepositoryId()); - paramForUpdateSplitInventory.put("quantity", returnQuantity); + paramForUpdateSplitInventory.put("quantity", String.valueOf(returnQuantity)); paramForUpdateSplitInventory.put("mid", inventoryById.getMid()); paramForUpdateSplitInventory.put("unit", unit); paramForUpdateSplitInventory.put("code", inventoryById.getCode()); @@ -1900,7 +1900,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { Map paramForUpdateSplitInventory = new HashMap<>(); paramForUpdateSplitInventory.put("placeId", outRecordMin.getPlaceId()); paramForUpdateSplitInventory.put("depositoryId", outRecordMin.getDepositoryId()); - paramForUpdateSplitInventory.put("quantity", returnQuantity); + paramForUpdateSplitInventory.put("quantity", String.valueOf(returnQuantity)); paramForUpdateSplitInventory.put("mid", inventoryById.getMid()); paramForUpdateSplitInventory.put("unit", unit); paramForUpdateSplitInventory.put("code", inventoryById.getCode()); @@ -1928,7 +1928,12 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { materialMapper.updateInventory(inventoryById); // 强行完成出库 - updateApplicationMinOutInfo(id, outRecordMin, outRecord, (double) (quantity / 100), userToken, placeById.getId(), userAgent); + + // 获取当前出库人员 + UserByPort userByPort = LinkInterfaceUtil.FindUserById(outRecordMin.getCheckId(), userToken); + + outRecord.setPass(1); + updateApplicationMinOutInfo(id, outRecordMin, outRecord, (double) (quantity / 100), userByPort, placeById.getId(), userAgent); } @@ -1978,7 +1983,8 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { result = depositoryRecordMapper.updateApplicationOutRecordMin(outRecordMin); } - } else { + } + else { // 如果未开始出库的 // 设置新数量 @@ -2004,7 +2010,8 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { outRecord.setPrice(outRecord.getPrice() - inventoryById.getPrice() * (outQuantity / 100) + inventoryById.getPrice() * quantity); } - } else { + } + else { // 如果是拆单单位 if (inventoryById.getPrice() != null) { @@ -2027,6 +2034,15 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { } + outRecord.setEditUser(userToken.getId().toString()); + Map updateOutRecord = new HashMap<>(); + updateOutRecord.put("id",outRecord.getId()); + updateOutRecord.put("price",outRecord.getPrice()); + updateOutRecord.put("editUser",outRecord.getEditUser()); + updateOutRecord.put("pass",outRecord.getPass()); + depositoryRecordMapper.updateApplicationOutRecord(updateOutRecord); + + return result; } diff --git a/src/test/java/com/dreamchaser/depository_manage/TestForOther.java b/src/test/java/com/dreamchaser/depository_manage/TestForOther.java index 616a0d96..d91b220e 100644 --- a/src/test/java/com/dreamchaser/depository_manage/TestForOther.java +++ b/src/test/java/com/dreamchaser/depository_manage/TestForOther.java @@ -50,17 +50,7 @@ public class TestForOther { @Autowired DepositoryRecordService depositoryRecordService; - @Autowired - DepositoryRecordMapper depositoryRecordMapper; - - @Autowired - ExcelService excelService; - @Autowired - MaterialMapper materialMapper; - - @Autowired - QyWxOperationService qyWxOperationService; /** * 获取当月的开始和结束时间 @@ -69,11 +59,11 @@ public class TestForOther { @Test public void run() { - ApprovalInfo_Details approvalInfo = new ApprovalInfo_Details(); - ApprovalInfo_Details_Approver approver = new ApprovalInfo_Details_Approver(); - approver.setUserId("PangFuZhen"); - approvalInfo.setApprover(approver); - depositoryRecordService.reviewByQyWxApprovalOut("1",approvalInfo,"0f2162ca5229a3e68468c6e9ab957542","2","202303290021", false,2); +// ApprovalInfo_Details approvalInfo = new ApprovalInfo_Details(); +// ApprovalInfo_Details_Approver approver = new ApprovalInfo_Details_Approver(); +// approver.setUserId("PangFuZhen"); +// approvalInfo.setApprover(approver); +// depositoryRecordService.reviewByQyWxApprovalOut("1",approvalInfo,"599076aa8e931b27af7935eb69db4243","2","202303290034", false,2); // depositoryRecordService.reviewByQyWxApprovalIn("[1]",approvalInfo,"460f46eaefb46bb0c171029f62e2cea6","2","202303220009"); // UserByPort userByPort = LinkInterfaceUtil.FindUserById(78, null); // List s = excelService.writeExcelForPrint(2, 4,userByPort);