修改盘点bug

src/main/java/com/dk/mdm/service/ivt/CheckService.java

@@ -114,7 +114,7 @@ public class CheckService extends BaseService<Check> {
 		check.setMakeTime(LocalDateTime.now()).setStaffId(checkVO.getStaffId()).setCheckId(codeMap.get("outId").toString())
 				.setRemarks(checkVO.getRemarks()).setCheckNo(codeMap.get("outNote").toString()).setCheckDate(LocalDate.now())
 				.setOrgId(checkVO.getOrgId()).setFlgLock(checkVO.getFlgLock()).setCheckStatus(checkVO.getCheckStatus())
-				.setRemarks(checkVO.getRemarks()).setStaffId(checkVO.getStaffId());
+				.setRemarks(checkVO.getRemarks()).setStaffId(checkVO.getStaffId()).setMakeStaff(checkVO.getMakeStaff());
 		// 先插入盘点单主表数据
 		super.insert(check);
 		// 插入盘点明细
@@ -153,7 +153,7 @@ public class CheckService extends BaseService<Check> {
 				inboundVO.setOrgId(checkVO.getOrgId()).setStaffId(checkVO.getStaffId()==null?checkVO.getMakeStaff():checkVO.getStaffId())
 						.setMakeStaff(checkVO.getMakeStaff()).setIntoingQty(intoQtySum).setFromId(check.getCheckId()).setFromNo(check.getCheckNo())
 						.setMakeTime(LocalDateTime.now()).setIntoDate(LocalDate.now()).setWhId(checkVO.getWhId()).setFlgAutoHandle(true)
-						.setIntoingAmt(intoingAmtSum).setIntoType(Constant.IntoType.PROFIT.getName());;
+						.setIntoingAmt(intoingAmtSum).setIntoType(Constant.IntoType.PROFIT.getName());
 				// 赋值入库接口参数 总表和明细
 				inboundCheckMap.put("total",inboundVO);
 
@@ -277,7 +277,11 @@ public class CheckService extends BaseService<Check> {
 				inboundVO.setOrgId(checkVO.getOrgId()).setStaffId(checkVO.getStaffId()==null?checkVO.getMakeStaff():checkVO.getStaffId())
 						.setMakeStaff(checkVO.getMakeStaff()).setIntoingQty(intoQtySum).setFromId(checkVO.getCheckId())
 						.setFromNo(checkVO.getCheckNo()).setMakeTime(LocalDateTime.now()).setIntoDate(LocalDate.now()).setWhId(checkVO.getWhId())
-						.setFlgAutoHandle(true).setIntoingAmt(intoingAmtSum);
+						.setFlgAutoHandle(true).setIntoingAmt(intoingAmtSum).setIntoType(Constant.IntoType.PROFIT.getName());
+				// 编辑时需要清空item_id值
+				for (CheckItemVO checkItemVO : inCheckItemVOList) {
+					checkItemVO.setItemId(null);
+				}
 				// 赋值入库接口参数 总表和明细
 				inboundCheckMap.put("total",inboundVO);
 				inboundCheckMap.put("detail",inCheckItemVOList);
@@ -296,7 +300,13 @@ public class CheckService extends BaseService<Check> {
 				OutboundVO outboundVO = new OutboundVO();
 				outboundVO.setOrgId(checkVO.getOrgId()).setStaffId(checkVO.getStaffId()==null?checkVO.getMakeStaff():checkVO.getStaffId())
 						.setMakeStaff(checkVO.getMakeStaff()).setOutingQty(outtoQtySum.abs()).setFromId(checkVO.getCheckId())
-						.setFromNo(checkVO.getCheckNo()).setMakeTime(LocalDateTime.now()).setOutDate(LocalDate.now()).setOutingAmt(BigDecimal.ZERO);
+						.setFromNo(checkVO.getCheckNo()).setMakeTime(LocalDateTime.now()).setOutDate(LocalDate.now()).setOutingAmt(BigDecimal.ZERO)
+						.setOutType(Constant.OutType.INVENTORY_LOSS.getName());
+
+				// 编辑时需要清空item_id值
+				for (CheckItemVO checkItemVO : inCheckItemVOList) {
+					checkItemVO.setItemId(null);
+				}
 				// 赋值出库接口参数 总表和明细
 				outboundCheckMap.put("total",outboundVO);
 				outboundCheckMap.put("detail",inCheckItemVOList);

src/main/java/com/dk/mdm/service/ivt/inbound/InboundCheckService.java

@@ -143,7 +143,8 @@ public class InboundCheckService extends BaseService<Inbound> {
                     .setIntoingQty(BigDecimal.ZERO)
                     .setIntoingAmt(BigDecimal.ZERO)
                     .setCostPrice(inboundItemVO.getPriceInto())
-                    .setCostAmt(inboundItemVO.getIntoQty().multiply(inboundItemVO.getPriceInto()).setScale(2, BigDecimal.ROUND_HALF_UP))
+                    .setCostAmt(inboundItemVO.getIntoQty()
+                            .multiply(inboundItemVO.getPriceInto()).setScale(2, BigDecimal.ROUND_HALF_UP))
             ;
             //入库状态
             inboundItemVO.setIntoStatus(inboundVO.getIntoStatus());

src/main/java/com/dk/mdm/service/ivt/outbound/OutboundCheckService.java

@@ -157,6 +157,7 @@ public class OutboundCheckService extends BaseService<Outbound> {
             //盘亏出库
             if(Constant.OutType.INVENTORY_LOSS.getName().equals(outboundItemVO.getOutType())){
                 outboundItemVO.setInventoryDocCode(Constant.InventoryDocCode.INVENTORY_LOSS.getValue());
+                outboundItemVO.setOutAmt(BigDecimal.ZERO);
             }
             //仓库调整
             else{