From 10ef2405ffc1f402e7941a81602b76b93cb6f076 Mon Sep 17 00:00:00 2001 From: liyongde <1419499670@qq.com> Date: Tue, 18 Jul 2023 18:15:33 +0800 Subject: [PATCH] =?UTF-8?q?rev:=20=E5=B7=A5=E5=8D=95=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lms/nladmin-system/doc/wms.xls | Bin 307712 -> 309248 bytes .../nl/wms/ext/service/dto/PalletizeDto.java | 120 ++++++++++++++++++ .../ext/service/impl/AcsToWmsServiceImpl.java | 35 ++++- .../wms/pdm/service/dao/PdmBdWorkorder.java | 9 ++ .../dao/mapper/PdmBdWorkorderMapper.xml | 3 + .../pdm/service/dto/PdmBdWorkorderDto.java | 3 + .../nl/wms/sch/task_manage/AbstractTask.java | 5 +- .../sch/task_manage/GeneralDefinition.java | 5 + .../task_manage/task/tasks/hn/HNMLTask.java | 25 ++-- .../task_manage/task/tasks/yz/YZSLTask.java | 9 +- .../src/views/wms/pdm/workerorder/index.vue | 35 +++-- .../views/wms/sch/group/MaterialDialog.vue | 8 +- 12 files changed, 224 insertions(+), 33 deletions(-) create mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/service/dto/PalletizeDto.java diff --git a/lms/nladmin-system/doc/wms.xls b/lms/nladmin-system/doc/wms.xls index 425daf78748a563f9d9d438794511ca6db006d70..5d5a54fabbcc3f571674c4c12a9297b6fb1bf5f4 100644 GIT binary patch delta 21033 zcma)k2V4}#_xQ~09Y;T^2!b3Z2r9h@C`iYGT@p1`5LA?=V(dALHI`T|I?)&zh2^b2Aj=2`?cUSD2(K%Bytxw^Z_aHHznn?V=B;}tnERm#@4(9(Q_sZfXBXPx z3;HgDJoGoGI+9mdzrI&Pz1uX6e&95B{mv{q{Et3vdNcirX~Ft--R;QRT7p*7IRQaL zA3wcmS?Tm(%t_1$=W*x@4N(#OmwE2`?!6p|IY5Vd=`Zzl(9f7?M=XebSDxGaB0IGu zL5Lt5a5X$2q~DkC<&aQEQG~2&8`tk^N30p!`ud|IT!;IFCUy+zso(pt9kDkt(<&Wg8n=Fpm5z04PVdy5$}DDVb=DmVfS5!C{>@W+G_}d*`iOrVK4~~ zp01tX+>cTH_>+<9RrmPOto0Od$?oS2W`@7%^i|)~wja$(U*0P+lM#=J0rfz%=g1Wu zy@qt>Vh&F>!lYS0^)&#>t~bg-n zb_wWH|3&?N$r~-3_MX!9KRmfxHA4I4tm`w~C&lh>F~IL`z&UN~mj|8)jC*`E;pHC< z?G$sH>86i#8(h#*XV&_A2fOGe*KZEpcCzBWxr3SZ?4gBPM_;QNspA^O`l*G9)>hk} zhPEEmr1_?Q_WoX8j*6DXS?l)9TYfk6i?m;l=k43D<@k_{0WMG4dpq>sxnh;(cF&

5wyic6cS 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 LL-EgwVzd7TaWj`Q delta 20264 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 workorder_status IN diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/service/dto/PdmBdWorkorderDto.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/service/dto/PdmBdWorkorderDto.java index 440a270..82fde9f 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/service/dto/PdmBdWorkorderDto.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/service/dto/PdmBdWorkorderDto.java @@ -28,6 +28,9 @@ public class PdmBdWorkorderDto implements Serializable { /** 物料标识 */ private String material_id; + /** 原材料物料标识 */ + private String raw_material_id; + /** 载具类型 */ private String vehicle_type; diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/AbstractTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/AbstractTask.java index 8a09aeb..a67064d 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/AbstractTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/AbstractTask.java @@ -182,6 +182,7 @@ public abstract class AbstractTask { SchBaseTask task = new SchBaseTask(); // 任务实体 String apply_point_code = param.getString("device_code"); // 请求点 String config_code = param.getString("config_code"); + String requestNo = param.getString("requestNo"); // 1、校验数据 SchBaseTaskconfig taskConfig = taskConfigService.getOne(new LambdaQueryWrapper() .eq(SchBaseTaskconfig::getConfig_code, config_code)); @@ -220,10 +221,10 @@ public abstract class AbstractTask { return; } // 2、创建申请任务 + task.setAcs_trace_id(requestNo); task.setTask_code(IdUtil.getSnowflake(1, 1).nextIdStr()); - task.setAcs_trace_id(param.getString("acs_trace_id")); task.setConfig_code(config_code); - task.setCreate_mode(param.getString("create_mode")); + task.setCreate_mode(GeneralDefinition.ACS_CREATION); task.setVehicle_code(param.getString("vehicle_code")); task.setVehicle_qty(param.getInteger("vehicle_qty")); task.setTask_status(TaskStatus.APPLY.getCode()); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/GeneralDefinition.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/GeneralDefinition.java index feeaa9b..418b7c7 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/GeneralDefinition.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/GeneralDefinition.java @@ -28,4 +28,9 @@ public class GeneralDefinition { public static final String ENTRANCE = "1"; /**出口**/ public static final String EXIT = "2"; + // 任务生产方式 + /**自动创建**/ + public static final String AUTO_CREATION = "1"; + /**ACS创建**/ + public static final String ACS_CREATION = "2"; } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/hn/HNMLTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/hn/HNMLTask.java index 5c9949c..67f004b 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/hn/HNMLTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/hn/HNMLTask.java @@ -1,6 +1,7 @@ package org.nl.wms.sch.task_manage.task.tasks.hn; import cn.hutool.core.date.DateUtil; +import cn.hutool.core.lang.Assert; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.ObjectUtil; import com.alibaba.fastjson.JSONObject; @@ -8,6 +9,8 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import lombok.Data; import org.nl.common.exception.BadRequestException; import org.nl.system.service.notice.ISysNoticeService; +import org.nl.wms.database.material.service.IMdBaseMaterialService; +import org.nl.wms.database.material.service.dao.MdBaseMaterial; import org.nl.wms.pdm.record.service.IPdmBdRequestMaterialRecordService; import org.nl.wms.pdm.record.service.dao.PdmBdRequestMaterialRecord; import org.nl.wms.pdm.record.service.dto.PdmBdRequestMaterialRecordDto; @@ -63,6 +66,8 @@ public class HNMLTask extends AbstractTask { @Autowired private ISysNoticeService noticeService; @Autowired + private IMdBaseMaterialService materialService; + @Autowired private HNMapper hnMapper; @Autowired private TaskUtils taskUtils; @@ -116,11 +121,13 @@ public class HNMLTask extends AbstractTask { continue; } // 将找到的要料数据删除 + // todo: 可能出现事务问题 requestMaterialRecordService.removeById(point.getRecord_id()); // 设置终点并修改创建成功状态 task.setPoint_code2(point.getPoint_code()); task.setTask_status(TaskStatus.CREATED.getCode()); task.setRemark(""); + task.setVehicle_type(GeneralDefinition.STEEL_TRAY); taskService.updateById(task); point.setIng_task_code(task.getTask_code()); @@ -139,24 +146,20 @@ public class HNMLTask extends AbstractTask { } /** - * 根据提前要料表的物料与混料机的物料相同 + * 根据提前要料表的物料与混料入库请求的物料相同 * * @param nextRegionStr * @param requestParam * @return */ private SchBasePoint findNextPoint(List nextRegionStr, JSONObject requestParam) { - // todo: 混碾无工单 - String workorderCode = requestParam.getString("workorder_code"); // 混碾工单 - PdmBdWorkorder one = ObjectUtil.isNotEmpty(workorderCode) - ? workorderService.getOne(new LambdaQueryWrapper() - .eq(PdmBdWorkorder::getWorkorder_code, workorderCode)) - : null; - if (one == null) { - throw new BadRequestException("混碾机的工单不能为空!"); - } + // *: 混碾无工单 + String materialCode = requestParam.getString("material_code"); + Assert.notNull(materialCode, "物料编码不能为空!"); + MdBaseMaterial baseMaterialObj = materialService.findByCode(materialCode); + Assert.notNull(materialCode, "物料: "+ materialCode + "未找到!"); // 根据工单物料标识寻找点位 - List points = hnMapper.findPointForHNML(nextRegionStr, one.getMaterial_id()); + List points = hnMapper.findPointForHNML(nextRegionStr, baseMaterialObj.getMaterial_id()); return ObjectUtil.isNotEmpty(points) ? points.get(0) : null; } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yz/YZSLTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yz/YZSLTask.java index c48025e..2134715 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yz/YZSLTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yz/YZSLTask.java @@ -73,7 +73,8 @@ public class YZSLTask extends AbstractTask { .eq(SchBaseTaskconfig::getConfig_code, TASK_CONFIG_CODE)); for (SchBaseTask task : tasks) { taskUtils.setUpdateByAcs(task); // 修改修改者 - List nextRegionStr = Arrays.stream(taskConfig.getNext_region_str().split(",")).collect(Collectors.toList()); + List nextRegionStr = Arrays.stream(taskConfig.getNext_region_str().split(",")) + .collect(Collectors.toList()); // 找终点 String requestParam = task.getRequest_param(); JSONObject jsonObject = JSONObject.parseObject(requestParam); @@ -168,7 +169,7 @@ public class YZSLTask extends AbstractTask { } String vehicleType = param.getString("vehicle_type"); String workorderCode = param.getString("workorder_code"); - JSONObject stackParameters = param.getJSONObject("stackParameters"); + JSONObject stackParameters = param.getJSONObject("PalletizeDto"); if (vehicleType == null) { vehicleType = GeneralDefinition.STEEL_TRAY; } @@ -200,8 +201,8 @@ public class YZSLTask extends AbstractTask { groupEntity.setVehicle_code(vehicleCode); groupEntity.setVehicle_type(vehicleType); groupEntity.setMaterial_qty(qty); - groupEntity.setSource_vehicle_code(deviceCode); - groupEntity.setPoint_code(basePoint.getPoint_code()); // 哪台压机 + groupEntity.setExt_data(JSONObject.toJSONString(stackParameters)); + groupEntity.setPoint_code(basePoint.getPoint_code()); // 对接位 groupEntity.setPoint_name(basePoint.getPoint_name()); groupEntity.setPcsn(DateUtil.format(DateUtil.date(), "yyyyMMdd")); groupEntity.setInstorage_time(DateUtil.now()); diff --git a/lms/nladmin-ui/src/views/wms/pdm/workerorder/index.vue b/lms/nladmin-ui/src/views/wms/pdm/workerorder/index.vue index 76c3844..02b4ae0 100644 --- a/lms/nladmin-ui/src/views/wms/pdm/workerorder/index.vue +++ b/lms/nladmin-ui/src/views/wms/pdm/workerorder/index.vue @@ -93,7 +93,7 @@ - + @@ -108,6 +108,12 @@ style="width: 240px;" /> + + + + + + - + @@ -355,6 +361,9 @@ const defaultForm = { plan_qty: null, real_qty: null, material_id: null, + raw_material_id: null, + raw_material_name: null, + raw_material_code: null, vehicle_type: null, planproducestart_date: null, planproduceend_date: null, @@ -425,7 +434,8 @@ export default { regionList: [], pointList: [], regionCodeParam: null, - materialDialog: false + materialDialog: false, + flag: 1 } }, created() { @@ -464,14 +474,21 @@ export default { }) } }, - getMaterial() { + getMaterial(flag) { this.materialDialog = true + this.flag = flag }, - tableChanged(row) { - this.form.material_name = row.material_name - this.form.material_id = row.material_id - this.form.material_spec = row.material_spec - this.form.material_code = row.material_code + tableChanged(row, flag) { + if (flag === 1) { + this.form.material_name = row.material_name + this.form.material_id = row.material_id + this.form.material_spec = row.material_spec + this.form.material_code = row.material_code + } else { + this.form.raw_material_name = row.material_name + this.form.raw_material_id = row.material_id + this.form.raw_material_code = row.material_code + } }, setRegionName(data) { // 清空 diff --git a/lms/nladmin-ui/src/views/wms/sch/group/MaterialDialog.vue b/lms/nladmin-ui/src/views/wms/sch/group/MaterialDialog.vue index 4747488..09e0ab2 100644 --- a/lms/nladmin-ui/src/views/wms/sch/group/MaterialDialog.vue +++ b/lms/nladmin-ui/src/views/wms/sch/group/MaterialDialog.vue @@ -101,6 +101,10 @@ export default { isSingle: { type: Boolean, default: true + }, + flag: { + type: Number, + default: 1 } }, data() { @@ -143,7 +147,7 @@ export default { // 处理单选 if (this.isSingle && this.tableRadio) { this.$emit('update:dialogShow', false) - this.$emit('tableChanged', this.tableRadio) + this.$emit('tableChanged', this.tableRadio, this.flag) return } this.rows = this.$refs.table.selection @@ -153,7 +157,7 @@ export default { } this.crud.resetQuery(false) this.$emit('update:dialogShow', false) - this.$emit('tableChanged', this.rows) + this.$emit('tableChanged', this.rows, this.flag) } } }