add：pc海柔半成品出库

mes/hd/nladmin-system/src/main/java/org/nl/common/enums/AcsTaskEnum.java

@@ -41,6 +41,7 @@ public enum AcsTaskEnum {
     TASK_STRUCT_CP_IN("11","入库-成品-生产入库"),
     TASK_STRUCT_CP_OUT("12","出库-成品-生产出库"),
     TASK_STRUCT_HR_IN("26","入库-海柔半成品-生产入库"),
+    TASK_STRUCT_HR_OUT("27","出库-海柔半成品-生产出库"),
     TASK_STRUCT_CP_CHECK("13","-盘点"),
     TASK_WASH_LACK("20","清洗机-缺料请求"),
     TASK_WASH_EMP("21","清洗机-空框请求"),

mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/TASKEnum.java

@@ -16,6 +16,7 @@ import org.nl.wms.storage_manage.semimanage.service.iostorInv.IStIvtIostorinvBcp
 import org.nl.wms.storage_manage.semimanage.service.iostorInv.IStIvtIostorinvBcpService;
 import org.nl.wms.storage_manage.semimanage.service.shutFrame.IStIvtShutframeinvBcpService;
 import org.nl.wms.storage_manage.semimanagehr.service.iostorInv.IStIvtIostorinvHrBcpInService;
+import org.nl.wms.storage_manage.semimanagehr.service.iostorInv.IStIvtIostorinvHrBcpOutService;
 
 import java.util.function.Consumer;
 import java.util.function.Predicate;
@@ -71,6 +72,10 @@ public enum TASKEnum implements FunctionStrategy<String, JSONObject> {
         IStIvtIostorinvHrBcpInService bean = SpringContextHolder.getBean(IStIvtIostorinvHrBcpInService.class);
         bean.taskOperate(form);
     }),
+    HR_CP_OUT_TASK(type -> AcsTaskEnum.TASK_STRUCT_HR_OUT.getCode().equals(type), form -> {
+        IStIvtIostorinvHrBcpOutService bean = SpringContextHolder.getBean(IStIvtIostorinvHrBcpOutService.class);
+        bean.taskOperate(form);
+    }),
 
     ;
 

mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanagehr/controller/iostorInv/StIvtIostorinvHrBcpOutController.java

@@ -66,15 +66,6 @@ public class StIvtIostorinvHrBcpOutController {
         return new ResponseEntity<>(HttpStatus.NO_CONTENT);
     }
 
-
-    @PostMapping("/commit")
-    @Log("出入单提交")
-    //("出入单提交")
-    public ResponseEntity<Object> commit(@RequestBody Map<String,Object> whereJson) {
-        //semiProductInService.commit(whereJson);
-        return new ResponseEntity<>(HttpStatus.NO_CONTENT);
-    }
-
     @PostMapping("/getIODtl")
     @Log("查询入库分配明细")
     //("查询入库分配明细")
@@ -82,7 +73,6 @@ public class StIvtIostorinvHrBcpOutController {
         return new ResponseEntity<>(bcpOutService.getIoDtl(whereJson.toJavaObject(HrBcpIostorInvQuery.class)), HttpStatus.OK);
     }
 
-
     @PostMapping("/confirm")
     @Log("完成单据")
     //("完成单据")

mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanagehr/service/iostorInv/impl/StIvtIostorinvHrBcpOutServiceImpl.java

@@ -52,6 +52,9 @@ import org.nl.wms.storage_manage.semimanagehr.service.iostorInv.IStIvtIostorinvH
 import org.nl.wms.storage_manage.semimanagehr.service.iostorInv.dao.StIvtIostorinvHrBcp;
 import org.nl.wms.storage_manage.semimanagehr.service.iostorInv.dao.mapper.StIvtIostorinvHrBcpMapper;
 import org.nl.wms.storage_manage.semimanagehr.service.iostorInv.dto.HrBcpIostorInvQuery;
+import org.nl.wms.storage_manage.semimanagehr.service.structIvt.IStIvtStructivtHrBcpService;
+import org.nl.wms.storage_manage.semimanagehr.service.structIvt.IStIvtStructivtflowHrService;
+import org.nl.wms.storage_manage.semimanagehr.service.structIvt.dao.StIvtStructivtHrBcp;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
@@ -74,21 +77,21 @@ import java.util.function.Consumer;
 public class StIvtIostorinvHrBcpOutServiceImpl extends ServiceImpl<StIvtIostorinvHrBcpMapper, StIvtIostorinvHrBcp> implements IStIvtIostorinvHrBcpOutService {
 
     @Autowired
-    private IStIvtBsrealstorattrService storattrService;
+    private IStIvtBsrealstorattrService storattrService; // 仓库服务
     @Autowired
-    private IStIvtStructivtBcpService structivtBcpService;
+    private IStIvtStructivtHrBcpService structivtBcpService; // 海柔半成品服务
     @Autowired
-    private IStIvtStructattrService structattrService;
+    private IStIvtStructattrService structattrService; // 仓位服务
     @Autowired
-    private DivRuleCpService divRuleCpService;
+    private DivRuleCpService divRuleCpService; // 分配规则服务
     @Autowired
-    private IStIvtSectattrService sectattrService;
+    private IStIvtSectattrService sectattrService; // 库区服务
     @Autowired
-    private ISchBaseTaskService iSchBaseTaskService; // 任务表服务
+    private ISchBaseTaskService iSchBaseTaskService; // 任务服务
     @Autowired
-    private IMdMeMaterialbaseService materialbaseService;
+    private IMdMeMaterialbaseService materialbaseService; // 物料服务
     @Autowired
-    private IStIvtStructivtflowService iStIvtStructivtflowService; // 库存变动服务
+    private IStIvtStructivtflowHrService iStIvtStructivtflowService; // 海柔库存变动服务
     @Autowired
     protected IMdPbStoragevehicleextService iMdPbStoragevehicleextService; // 载具扩展属性信息表服务
 
@@ -193,9 +196,9 @@ public class StIvtIostorinvHrBcpOutServiceImpl extends ServiceImpl<StIvtIostorin
         mst.setUpdate_name(SecurityUtils.getCurrentNickName());
         this.updateById(mst);
 
-        StIvtStructivtBcp ivtDao = structivtBcpService.getById(mst.getStruct_id());
+        StIvtStructivtHrBcp ivtDao = structivtBcpService.getById(mst.getStruct_id());
         //删除库存
-        structivtBcpService.remove(new QueryWrapper<StIvtStructivtBcp>().eq("struct_id", mst.getStruct_id()));
+        structivtBcpService.remove(new QueryWrapper<StIvtStructivtHrBcp>().eq("struct_id", mst.getStruct_id()));
 
         // 插入库存变动记录
         JSONObject param = JSONObject.parseObject(JSON.toJSONString(ivtDao));
@@ -238,10 +241,10 @@ public class StIvtIostorinvHrBcpOutServiceImpl extends ServiceImpl<StIvtIostorin
     @Transactional
     public void onlyConfirm(JSONObject form) {
 
-        StIvtStructivtBcp ivtDao = structivtBcpService.getById(form.getString("struct_id"));
+        StIvtStructivtHrBcp ivtDao = structivtBcpService.getById(form.getString("struct_id"));
         if (ivtDao!=null){
             //删除库存
-            structivtBcpService.remove(new QueryWrapper<StIvtStructivtBcp>().eq("struct_id", form.getString("struct_id")));
+            structivtBcpService.remove(new QueryWrapper<StIvtStructivtHrBcp>().eq("struct_id", form.getString("struct_id")));
 
             // 插入库存变动记录
             JSONObject param = JSONObject.parseObject(JSON.toJSONString(ivtDao));
@@ -433,7 +436,7 @@ public class StIvtIostorinvHrBcpOutServiceImpl extends ServiceImpl<StIvtIostorin
         checkParam(mst);
 
         PointEvent event = PointEvent.builder()
-                .type(AcsTaskEnum.TASK_STRUCT_OUT)
+                .type(AcsTaskEnum.TASK_STRUCT_HR_OUT)
                 .acs_task_type("7")
                 .task_group_id(IdUtil.getStringId())
                 .point_code3(mst.getPoint_code())

mes/qd/src/views/wms/storage_manage/semiproducthr/semiproducthrout/AddDialog.vue

@@ -95,7 +95,7 @@
           :disabled="crud.status.view > 0"
         >
           <el-option
-            v-for="item in dict.ST_INV_BCP_OUT_TYPE"
+            v-for="item in dict.ST_INV_HR_BCP_OUT_TYPE"
             :key="item.value"
             :label="item.label"
             :value="item.value"
@@ -211,7 +211,7 @@ import crudPoint from '@/views/wms/scheduler_manage/point/point'
 
 const defaultForm = {
   bill_code: '',
-  product_code: 'A1',
+  product_code: 'A3',
   bill_status: '10',
   total_qty: '0',
   detail_count: '0',
@@ -226,7 +226,7 @@ export default {
   name: 'AddDialog',
   components: { MaterDtl },
   mixins: [crud(), form(defaultForm)],
-  dicts: ['IO_BILL_STATUS', 'ST_QUALITY_SCODE', 'ST_INV_BCP_OUT_TYPE', 'product_area'],
+  dicts: ['IO_BILL_STATUS', 'ST_QUALITY_SCODE', 'ST_INV_HR_BCP_OUT_TYPE', 'product_area'],
   cruds() {
     return CRUD({ title: '入库新增', crudMethod: { ...crudsemiproductOut }})
   },
@@ -277,11 +277,11 @@ export default {
   },
   methods: {
     open() {
-      crudStorattr.getStor({ 'stor_type': '2' }).then(res => {
+      crudStorattr.getStor({ 'stor_type': '5' }).then(res => {
         this.storlist = res.content
       })
-      //A1_BCPCK01
+      // A3_BCPCK01
-      const area_type = 'A1_BCPRK01'
+      const area_type = 'A3_BCPCK01'
       crudPoint.getPoint({ 'area_type': area_type }).then(res => {
         this.pointList = res
       })

mes/qd/src/views/wms/storage_manage/semiproducthr/semiproducthrout/StructIvt.vue

@@ -91,8 +91,8 @@ export default {
   components: { crudOperation, rrOperation, pagination, DateRangePicker },
   cruds() {
     return CRUD({
-      title: '半成品可用库存',
+      title: '海柔半成品可用库存',
-      url: '/api/bcp/getBcpIvt',
+      url: '/api/bcp/hr/getBcpIvt',
       crudMethod: {},
       optShow: {
         reset: true

mes/qd/src/views/wms/storage_manage/semiproducthr/semiproducthrout/index.vue

@@ -40,7 +40,7 @@
               @change="crud.toQuery"
             >
               <el-option
-                v-for="item in dict.ST_INV_BCP_OUT_TYPE"
+                v-for="item in dict.ST_INV_HR_BCP_OUT_TYPE"
                 :key="item.value"
                 :label="item.label"
                 :value="item.value"
@@ -218,7 +218,7 @@ export default {
   },
   mixins: [presenter(), header(), crud()],
   // 数据字典
-  dicts: ['IO_BILL_STATUS', 'bill_type', 'product_area', 'ST_INV_BCP_OUT_TYPE', 'ST_INV_CREATE'],
+  dicts: ['IO_BILL_STATUS', 'bill_type', 'product_area', 'ST_INV_HR_BCP_OUT_TYPE', 'ST_INV_CREATE'],
   data() {
     return {
       height: document.documentElement.clientHeight - 180 + 'px;',
@@ -249,7 +249,7 @@ export default {
     }
   },
   created() {
-    crudStorattr.getStor({ 'stor_type': '2' }).then(res => {
+    crudStorattr.getStor({ 'stor_type': '5' }).then(res => {
       this.storlist = res.content
     })
   },
@@ -298,7 +298,7 @@ export default {
       }
     },
     bill_typeFormat(row, column) {
-      return this.dict.label.ST_INV_BCP_OUT_TYPE[row.bill_type]
+      return this.dict.label.ST_INV_HR_BCP_OUT_TYPE[row.bill_type]
     },
     toView(row) {
       this.mstrow = row