diff --git a/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryRecordController.java b/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryRecordController.java index 2454ac7d..77add5a8 100644 --- a/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryRecordController.java +++ b/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryRecordController.java @@ -887,9 +887,9 @@ public class DepositoryRecordController { SplitInfo splitInfo = splitUnitService.findSplitInfoByMidAndUnit(paramForSplitInfo); // 获取当前拆单记录与基础单位进制 int splitInfoScaleQuantity = splitUnitService.findSplitInfoScaleQuantity(splitInfo, -1); - BigDecimal bg = new BigDecimal(inventory.getPrice() / splitInfoScaleQuantity); + BigDecimal bg = new BigDecimal(inventory.getPrice() / splitInfoScaleQuantity * applicationOutRecordMin.getQuantity()); double newprice = bg.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue(); - sumPrice += (newprice * applicationOutRecordMin.getQuantity()); + sumPrice += newprice; } } outRecordP.setMcode(mcode.toString()); diff --git a/src/main/java/com/dreamchaser/depository_manage/service/impl/ExcelServiceImpl.java b/src/main/java/com/dreamchaser/depository_manage/service/impl/ExcelServiceImpl.java index 1f802f4d..a5d4134a 100644 --- a/src/main/java/com/dreamchaser/depository_manage/service/impl/ExcelServiceImpl.java +++ b/src/main/java/com/dreamchaser/depository_manage/service/impl/ExcelServiceImpl.java @@ -108,17 +108,18 @@ public class ExcelServiceImpl implements ExcelService { for (ExcelInfo excelVo : excelVos) { Map param = new HashMap<>(); param.put("mname", excelVo.getMname()); + param.put("code", excelVo.getCode()); param.put("unit", excelVo.getUnit()); param.put("version", excelVo.getVersion()); param.put("texture", excelVo.getTexture()); Long typeId = excelVo.getTypeId(); if (typeId != null) { - param.put("materialTypeId", typeId); + param.put("typeId", typeId); }else{ String typeName = excelVo.getTypeName(); MaterialType materialTypeByName = materialTypeService.findMaterialTypeByName(typeName); - param.put("materialTypeId", materialTypeByName.getOldId()); + param.put("typeId", materialTypeByName.getOldId()); } param.put("id", excelVo.getId()); param.put("brand", excelVo.getBrand()); diff --git a/target/classes/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.xml b/target/classes/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.xml index 08cf3126..45cb7a02 100644 --- a/target/classes/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.xml +++ b/target/classes/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}