diff --git a/acs/acs2/nladmin-ui/src/views/acs/device/driver/unpacking_machine.vue b/acs/acs2/nladmin-ui/src/views/acs/device/driver/unpacking_machine.vue index b66acab..dd0a8d8 100644 --- a/acs/acs2/nladmin-ui/src/views/acs/device/driver/unpacking_machine.vue +++ b/acs/acs2/nladmin-ui/src/views/acs/device/driver/unpacking_machine.vue @@ -60,106 +60,6 @@ - -
- 指令相关： -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- AGV相关： -
- - - - - - - - - - - - - - - -
PLC读取字段： @@ -274,7 +174,6 @@ import { selectListByOpcID } from '@/api/acs/device/opcPlc' import crud from '@/mixins/crud' import deviceCrud from '@/api/acs/device/device' - export default { name: 'UnpackingMachine', mixins: [crud], diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/sch_manage/service/impl/PdaJBServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/sch_manage/service/impl/PdaJBServiceImpl.java index 5249836..4a8ca62 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/sch_manage/service/impl/PdaJBServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/sch_manage/service/impl/PdaJBServiceImpl.java @@ -332,6 +332,7 @@ public class PdaJBServiceImpl implements PdaJBService { if (ObjectUtil.isEmpty(materialbase)) { throw new BadRequestException("物料【" + workorder.getMaterial_id() + "】不存在！"); } + JSONObject extData = JSONObject.parseObject(workorder.getExt_data()); // 0、创建组盘 GroupPlate groupPlate = new GroupPlate(); groupPlate.setGroup_id(IdUtil.getStringId()); @@ -339,7 +340,6 @@ public class PdaJBServiceImpl implements PdaJBService { // 料桶类型根据工单，工单是根据点位 groupPlate.setStoragevehicle_type(workorder.getVehicle_type()); groupPlate.setMaterial_id(materialbase.getMaterial_id()); - groupPlate.setPcsn(DateUtil.format(new Date(), "yyyy-MM-dd")); groupPlate.setQty(weight); groupPlate.setQty_unit_id("11"); groupPlate.setQty_unit_name("kg"); @@ -348,6 +348,9 @@ public class PdaJBServiceImpl implements PdaJBService { groupPlate.setCreate_id(currentUserId); groupPlate.setCreate_name(nickName); groupPlate.setCreate_time(now); + groupPlate.setPcsn(extData.getString("pcsn")); + groupPlate.setSupp_code(extData.getString("supp_code")); + groupPlate.setSupp_name(extData.getString("supp_name")); groupplateService.save(groupPlate); Dict dict = dictService.getDictByCodeAndValue("storagevehicle_type", workorder.getVehicle_type()); @@ -517,6 +520,7 @@ public class PdaJBServiceImpl implements PdaJBService { @Override @Transactional(rollbackFor = Exception.class) public PdaResponse jbReturnMaterial(JSONObject param) { + MDC.put(TagNameEnum.TAG_NAME.getTag(), TagNameEnum.PDA_JB_BACK_MATERIAL.getTag()); // param: area, point_code, workorder_id String currentUserId = SecurityUtils.getCurrentUserId(); String nickName = SecurityUtils.getCurrentNickName(); @@ -539,6 +543,7 @@ public class PdaJBServiceImpl implements PdaJBService { throw new BadRequestException("物料【" + workOrder.getMaterial_id() + "】不存在！"); } Structattr structattr = structattrService.findByCode(workOrder.getStruct_code()); + JSONObject extData = JSONObject.parseObject(workOrder.getExt_data()); // 0 组盘（涉及什么库区，通过工单对应的仓位的属性。） GroupPlate groupPlate = new GroupPlate(); groupPlate.setGroup_id(IdUtil.getStringId()); @@ -546,7 +551,6 @@ public class PdaJBServiceImpl implements PdaJBService { // 料桶类型根据工单，工单是根据点位 groupPlate.setStoragevehicle_type(vehicleInfo.getStoragevehicle_type()); groupPlate.setMaterial_id(workOrder.getMaterial_id()); - groupPlate.setPcsn(DateUtil.format(new Date(), "yyyy-MM-dd")); groupPlate.setQty(workOrder.getPlan_weight()); groupPlate.setQty_unit_id("11"); groupPlate.setQty_unit_name("kg"); @@ -555,6 +559,9 @@ public class PdaJBServiceImpl implements PdaJBService { groupPlate.setCreate_id(currentUserId); groupPlate.setCreate_name(nickName); groupPlate.setCreate_time(now); + groupPlate.setPcsn(extData.getString("pcsn")); + groupPlate.setSupp_code(extData.getString("supp_code")); + groupPlate.setSupp_name(extData.getString("supp_name")); groupplateService.save(groupPlate); // 1 创建退料入库单、明细单、分配单 Map insertInvObj = new HashMap(); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pm_manage/service/dao/PdmBdWorkorder.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pm_manage/service/dao/PdmBdWorkorder.java index ac92cdb..7a7f779 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pm_manage/service/dao/PdmBdWorkorder.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pm_manage/service/dao/PdmBdWorkorder.java @@ -115,5 +115,4 @@ public class PdmBdWorkorder implements Serializable { @TableField(exist = false) private String material_spec; - } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pm_manage/service/impl/PdmBdWorkorderServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pm_manage/service/impl/PdmBdWorkorderServiceImpl.java index 72141e4..2bfb1c0 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pm_manage/service/impl/PdmBdWorkorderServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pm_manage/service/impl/PdmBdWorkorderServiceImpl.java @@ -3,6 +3,7 @@ package org.nl.wms.pm_manage.service.impl; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.ObjectUtil; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/enums/TagNameEnum.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/enums/TagNameEnum.java index 32549fb..c1bc2fc 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/enums/TagNameEnum.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/enums/TagNameEnum.java @@ -27,6 +27,10 @@ public enum TagNameEnum { * 解包手持下料 */ PDA_JB_DOWN_MATERIAL("解包手持下料"), + /** + * 解包手持退料 + */ + PDA_JB_BACK_MATERIAL("解包手持退料"), /** * 标记符号 */ diff --git a/lms/nladmin-ui/src/views/wms/pm_manage/workerorder/MaterialDialog.vue b/lms/nladmin-ui/src/views/wms/pm_manage/workerorder/MaterialDialog.vue index fb46bfd..2ed9b67 100644 --- a/lms/nladmin-ui/src/views/wms/pm_manage/workerorder/MaterialDialog.vue +++ b/lms/nladmin-ui/src/views/wms/pm_manage/workerorder/MaterialDialog.vue @@ -85,9 +85,11 @@ + + diff --git a/lms/nladmin-ui/src/views/wms/pm_manage/workerorder/index.vue b/lms/nladmin-ui/src/views/wms/pm_manage/workerorder/index.vue index 45d1379..2fffb39 100644 --- a/lms/nladmin-ui/src/views/wms/pm_manage/workerorder/index.vue +++ b/lms/nladmin-ui/src/views/wms/pm_manage/workerorder/index.vue @@ -391,25 +391,26 @@ label="实际结束时间" :min-width="flexWidth('realproduceend_date',crud.data,'实际结束时间')" /> - - - - - - - + + + + + + + + + + + + + + + + + + + + { - this.crud.notify('下发成功', CRUD.NOTIFICATION_TYPE.SUCCESS) - this.crud.toQuery() - }).catch(() => { - this.fullscreenLoading = false - }).finally(() => { - this.fullscreenLoading = false - }) - }, - synchronize() { - this.fullscreenLoading = true - crudPdmBdWorkorder.orderSynchronize(this.crud.query).then(res => { - this.fullscreenLoading = false - this.crud.notify('同步成功！', CRUD.NOTIFICATION_TYPE.SUCCESS) - }).catch(() => { - this.fullscreenLoading = false - }).finally(() => { - this.fullscreenLoading = false - }) - }, + // submits(row) { + // this.fullscreenLoading = true + // crudPdmBdWorkorder.submits(row).then(res => { + // this.crud.notify('下发成功', CRUD.NOTIFICATION_TYPE.SUCCESS) + // this.crud.toQuery() + // }).catch(() => { + // this.fullscreenLoading = false + // }).finally(() => { + // this.fullscreenLoading = false + // }) + // }, + // synchronize() { + // this.fullscreenLoading = true + // crudPdmBdWorkorder.orderSynchronize(this.crud.query).then(res => { + // this.fullscreenLoading = false + // this.crud.notify('同步成功！', CRUD.NOTIFICATION_TYPE.SUCCESS) + // }).catch(() => { + // this.fullscreenLoading = false + // }).finally(() => { + // this.fullscreenLoading = false + // }) + // }, forceFinish(row) { this.fullscreenLoading = true crudPdmBdWorkorder.forceFinish(row).then(res => {