koushanshan 2 rokov pred
rodič
commit
dbc5531d59

+ 9 - 1
src/main/java/com/dk/mdm/service/ivt/inbound/InboundCheckService.java

@@ -97,7 +97,15 @@ public class InboundCheckService extends BaseService<Inbound> {
 
         //region  总单
         //获取 id/单号
-        Map<String, Object> codeMap = commonService.getUniqueNoteCode(Constant.docNameConstant.INVENTORYPROFITINBOUND.getName(), false);
+        Map<String, Object> codeMap = new HashMap<>();
+        // 盘盈入库
+        if(Constant.IntoType.PROFIT.getName().equals(inboundVO.getIntoType())){
+            codeMap = commonService.getUniqueNoteCode(Constant.docNameConstant.INVENTORYPROFITINBOUND.getName(), false);
+        }
+        //仓库调整
+        else{
+            codeMap =  commonService.getUniqueNoteCode(Constant.docNameConstant.MOVE.getName(), false);
+        }
         inboundVO.setIntoId(codeMap.get("outId").toString()).
                 setIntoNo(codeMap.get("outNote").toString());
         //todo  入库类型可能是盘盈可能是库位移动 调用的时候传

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

@@ -168,9 +168,9 @@ public class OutboundCheckService extends BaseService<Outbound> {
         //endregion
 
         //region 修改库存
-//        Map<String, Object> invMap = new HashMap<>();
-//        invMap.put("outDetail", outboundVO.getItemList());
-//        inventoryService.operatingInventoryInformation(invMap);
+        Map<String, Object> invMap = new HashMap<>();
+        invMap.put("outDetail", outboundVO.getItemList());
+        inventoryService.operatingInventoryInformation(invMap);
         //endregion