diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/common/enums/AcsTaskEnum.java b/mes/hd/nladmin-system/src/main/java/org/nl/common/enums/AcsTaskEnum.java index 2bbf5035..cc08b085 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/common/enums/AcsTaskEnum.java +++ b/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","清洗机-空框请求"), diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/TASKEnum.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/TASKEnum.java index 2b775bab..c3a8c11e 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/TASKEnum.java +++ b/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 { 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); + }), ; diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanagehr/controller/iostorInv/StIvtIostorinvHrBcpOutController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanagehr/controller/iostorInv/StIvtIostorinvHrBcpOutController.java index 995277d9..ef44c770 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanagehr/controller/iostorInv/StIvtIostorinvHrBcpOutController.java +++ b/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 commit(@RequestBody Map 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("完成单据") //("完成单据") diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanagehr/service/iostorInv/impl/StIvtIostorinvHrBcpOutServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanagehr/service/iostorInv/impl/StIvtIostorinvHrBcpOutServiceImpl.java index 1a7093d1..b57ca4e2 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanagehr/service/iostorInv/impl/StIvtIostorinvHrBcpOutServiceImpl.java +++ b/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 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().eq("struct_id", mst.getStruct_id())); + structivtBcpService.remove(new QueryWrapper().eq("struct_id", mst.getStruct_id())); // 插入库存变动记录 JSONObject param = JSONObject.parseObject(JSON.toJSONString(ivtDao)); @@ -238,10 +241,10 @@ public class StIvtIostorinvHrBcpOutServiceImpl extends ServiceImpl().eq("struct_id", form.getString("struct_id"))); + structivtBcpService.remove(new QueryWrapper().eq("struct_id", form.getString("struct_id"))); // 插入库存变动记录 JSONObject param = JSONObject.parseObject(JSON.toJSONString(ivtDao)); @@ -433,7 +436,7 @@ public class StIvtIostorinvHrBcpOutServiceImpl extends ServiceImpl { + crudStorattr.getStor({ 'stor_type': '5' }).then(res => { this.storlist = res.content }) - //A1_BCPCK01 - const area_type = 'A1_BCPRK01' + // A3_BCPCK01 + const area_type = 'A3_BCPCK01' crudPoint.getPoint({ 'area_type': area_type }).then(res => { this.pointList = res }) diff --git a/mes/qd/src/views/wms/storage_manage/semiproducthr/semiproducthrout/StructIvt.vue b/mes/qd/src/views/wms/storage_manage/semiproducthr/semiproducthrout/StructIvt.vue index 14a4869e..1801de98 100644 --- a/mes/qd/src/views/wms/storage_manage/semiproducthr/semiproducthrout/StructIvt.vue +++ b/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: '半成品可用库存', - url: '/api/bcp/getBcpIvt', + title: '海柔半成品可用库存', + url: '/api/bcp/hr/getBcpIvt', crudMethod: {}, optShow: { reset: true diff --git a/mes/qd/src/views/wms/storage_manage/semiproducthr/semiproducthrout/index.vue b/mes/qd/src/views/wms/storage_manage/semiproducthr/semiproducthrout/index.vue index 71bb4060..bfabb2fb 100644 --- a/mes/qd/src/views/wms/storage_manage/semiproducthr/semiproducthrout/index.vue +++ b/mes/qd/src/views/wms/storage_manage/semiproducthr/semiproducthrout/index.vue @@ -40,7 +40,7 @@ @change="crud.toQuery" > { + 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