From ecb37e4432b87fa2229195444920203b4f86f200 Mon Sep 17 00:00:00 2001 From: pangshenghao Date: Sat, 29 Jul 2023 15:15:18 +0800 Subject: [PATCH] =?UTF-8?q?=E7=8E=B0=E5=9C=BA=E8=81=94=E8=B0=83=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../StandardInspectSiteDeviceDriver.java | 2 +- .../HfStationTwoDefination.java | 17 +---- .../HfStationTwoDeviceDriver.java | 9 ++- .../hongfeng/hf_station_two/ItemProtocol.java | 27 +++---- .../impl/ProduceshiftorderServiceImpl.java | 20 ++--- .../driver/hongfeng/hf_kiln_manipulator.vue | 3 +- .../acs/device/driver/hongfeng/hf_station.vue | 3 +- .../service/dto/VehicleDetailDto.java | 2 + .../impl/VehicleDetailServiceImpl.java | 4 +- .../wms/basedata/wql/QMD_PB_VEHICLE_GROUP.wql | 8 ++ .../nl/wms/pdm/service/dto/WorkorderDto.java | 18 +++++ .../service/impl/WorkorderServiceImpl.java | 12 +-- .../sch/tasks/phaseTwo/PalletizingTask.java | 2 +- .../src/main/java/org/nl/wms/wms.xls | Bin 239616 -> 240640 bytes .../src/views/wms/basedata/material/index.vue | 42 ----------- .../src/views/wms/pdm/workerorder/index.vue | 70 +++++++++++++++++- 16 files changed, 143 insertions(+), 96 deletions(-) diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_inspect_site/StandardInspectSiteDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_inspect_site/StandardInspectSiteDeviceDriver.java index 25110f9..628fd0b 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_inspect_site/StandardInspectSiteDeviceDriver.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_inspect_site/StandardInspectSiteDeviceDriver.java @@ -144,7 +144,7 @@ public class StandardInspectSiteDeviceDriver extends AbstractOpcDeviceDriver imp } if (this.getApply_handling()) { - String link_device_code = this.getDevice().getExtraValue().get("link_device_code").toString(); + String link_device_code = String.valueOf(this.getDevice().getExtraValue().get("link_device_code")); DeviceAppService appService = SpringContextHolder.getBean(DeviceAppServiceImpl.class); Device link_device = appService.findDeviceByCode(link_device_code); StandardInspectSiteDeviceDriver standardInspectSiteDevicedriver; diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/hongfeng/hf_station_two/HfStationTwoDefination.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/hongfeng/hf_station_two/HfStationTwoDefination.java index 925dbdb..37fafd7 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/hongfeng/hf_station_two/HfStationTwoDefination.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/hongfeng/hf_station_two/HfStationTwoDefination.java @@ -56,22 +56,7 @@ public class HfStationTwoDefination implements OpcDeviceDriverDefination { } public static List getReadableItemDtos2() { - List list = new ArrayList(); - list.add(new ItemDto(ItemProtocol.item_heartbeat, "心跳", "DB101.B0")); - list.add(new ItemDto(ItemProtocol.item_mode, "工作模式", "DB101.B1")); - list.add(new ItemDto(ItemProtocol.item_move, "光电信号", "DB101.B2")); - list.add(new ItemDto(ItemProtocol.item_action, "取放信号", "DB101.B3")); - list.add(new ItemDto(ItemProtocol.item_ioaction, "进出信号", "DB101.B4")); - list.add(new ItemDto(ItemProtocol.item_error, "报警信号", "DB101.B5")); - list.add(new ItemDto(ItemProtocol.item_task, "任务号", "DB101.D6")); - list.add(new ItemDto(ItemProtocol.item_status, "设备状态", "DB101.B10")); - list.add(new ItemDto(ItemProtocol.item_current_order_num, "当前工单数量", "DB101.D12")); - list.add(new ItemDto(ItemProtocol.item_order, "工单号", "DB200.STRING20.50")); - list.add(new ItemDto(ItemProtocol.item_barcode, "条码", "DB200.STRING72.50")); - list.add(new ItemDto(ItemProtocol.item_material_code, "物料号", "DB200.B72")); - list.add(new ItemDto(ItemProtocol.item_product_code,"产品编号","DB200.B124")); - list.add(new ItemDto(ItemProtocol.item_number,"托盘砖数量","DB200.B16")); - return list; + return ItemProtocol.getReadableItemDtos(); } @Override diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/hongfeng/hf_station_two/HfStationTwoDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/hongfeng/hf_station_two/HfStationTwoDeviceDriver.java index 333176d..2c3565f 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/hongfeng/hf_station_two/HfStationTwoDeviceDriver.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/hongfeng/hf_station_two/HfStationTwoDeviceDriver.java @@ -14,8 +14,6 @@ import org.nl.acs.device_driver.DeviceDriver; import org.nl.acs.device_driver.RouteableDeviceDriver; import org.nl.acs.device_driver.driver.AbstractOpcDeviceDriver; import org.nl.acs.device_driver.driver.ExecutableDeviceDriver; -import org.nl.acs.device_driver.hongfeng.hf_kiln_manipulator.HfKilnManipulatorDeviceDriver; -import org.nl.acs.device_driver.hongfeng.hf_station.HfStationDeviceDriver; import org.nl.acs.ext.wms.service.AcsToWmsService; import org.nl.acs.instruction.service.InstructionService; import org.nl.acs.instruction.service.dto.Instruction; @@ -333,6 +331,9 @@ public class HfStationTwoDeviceDriver extends AbstractOpcDeviceDriver implements finish(); } break; + case 5: + finish(); + break; case 6: //满跺完成，请求呼叫 if (!callEmptyRequireSucess && move != 0) { @@ -692,8 +693,8 @@ public class HfStationTwoDeviceDriver extends AbstractOpcDeviceDriver implements dto.setUpdate_time(DateUtil.now()); produceshiftorderService.update(dto); this.setRequireSucess(true); - this.writing(8); - this.writing(8); + this.writing(3); + this.writing(3); logServer.deviceInfo("人工排产确认", this.getDevice_code(), "人工排产确认成功!"); } return true; diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/hongfeng/hf_station_two/ItemProtocol.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/hongfeng/hf_station_two/ItemProtocol.java index cef551c..e6c1154 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/hongfeng/hf_station_two/ItemProtocol.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/hongfeng/hf_station_two/ItemProtocol.java @@ -173,20 +173,21 @@ public class ItemProtocol { public static List getReadableItemDtos() { ArrayList list = new ArrayList(); - list.add(new ItemDto(item_heartbeat, "心跳", "DB101.B0")); - list.add(new ItemDto(item_mode, "工作模式", "DB101.B1")); - list.add(new ItemDto(item_move, "光电信号", "DB101.B2")); - list.add(new ItemDto(item_action, "取放信号", "DB101.B3")); - list.add(new ItemDto(item_ioaction, "进出信号", "DB101.B4")); - list.add(new ItemDto(item_error, "报警信号", "DB101.B5")); - list.add(new ItemDto(item_task, "任务号", "DB101.D6")); - list.add(new ItemDto(item_status, "设备状态", "DB101.B10")); - list.add(new ItemDto(item_current_order_num, "当前工单数量", "DB101.D12")); + list.add(new ItemDto(item_heartbeat, "心跳", "DB200.B0")); + list.add(new ItemDto(item_mode, "工作模式", "DB200.B1")); + list.add(new ItemDto(item_move, "光电信号", "DB200.B2")); + list.add(new ItemDto(item_action, "取放信号", "DB200.B3")); + list.add(new ItemDto(item_ioaction, "进出信号", "DB200.B4")); + list.add(new ItemDto(item_error, "报警信号", "DB200.B5")); + list.add(new ItemDto(item_task, "任务号", "DB200.D6")); + list.add(new ItemDto(item_status, "设备状态", "DB200.B10")); + list.add(new ItemDto(item_current_order_num, "当前工单数量", "DB200.D12")); + list.add(new ItemDto(item_number,"托盘砖数量","DB200.W16")); + list.add(new ItemDto(item_barcode, "条码", "DB200.W18")); list.add(new ItemDto(item_order, "工单号", "DB200.STRING20.50")); - list.add(new ItemDto(item_barcode, "条码", "DB200.STRING72.50")); - list.add(new ItemDto(item_material_code, "物料号", "DB200.B72")); - list.add(new ItemDto(item_product_code,"产品编号","DB200.B124")); - list.add(new ItemDto(item_number,"托盘砖数量","DB200.B16")); + list.add(new ItemDto(item_material_code, "物料号", "DB200.STRING72.50")); + list.add(new ItemDto(item_product_code,"产品编号","DB200.W124")); + return list; } diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/order/service/impl/ProduceshiftorderServiceImpl.java b/acs/nladmin-system/src/main/java/org/nl/acs/order/service/impl/ProduceshiftorderServiceImpl.java index 1bdc939..0b5dd57 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/order/service/impl/ProduceshiftorderServiceImpl.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/order/service/impl/ProduceshiftorderServiceImpl.java @@ -142,9 +142,9 @@ public class ProduceshiftorderServiceImpl implements ProduceshiftorderService, A if (StrUtil.isNotBlank(hfStationDeviceDriver.getOrder())) { throw new BadRequestException("设备正在生产"); } - if (hfStationDeviceDriver.getStatus() != 2) { - throw new BadRequestException("设备状态不为自动"); - } +// if (hfStationDeviceDriver.getStatus() != 2) { +// throw new BadRequestException("设备状态不为自动"); +// } hfStationDeviceDriver.writing("to_order", dto.getOrder_code()); hfStationDeviceDriver.writing("to_order_num", String.valueOf(dto.getQty())); hfStationDeviceDriver.writing("to_product_number", dto.getMaterial_code()); @@ -154,7 +154,7 @@ public class ProduceshiftorderServiceImpl implements ProduceshiftorderService, A hfStationDeviceDriver.writing("to_command", "3"); hfStationDeviceDriver.writing("to_command", "3"); //压力机下发工单同时下发到关联的码盘工位 - String device_code=hfStationDeviceDriver.getExtraValue().get("link_device_code").toString(); + String device_code=String.valueOf(hfStationDeviceDriver.getExtraValue().get("link_device_code")); Device linkDevice = deviceAppService.findDeviceByCode(device_code); if (ObjectUtil.isNotEmpty(linkDevice)&&linkDevice.getDeviceDriver() instanceof HfStationTwoDeviceDriver) { HfStationTwoDeviceDriver hfStationTwoDeviceDriver = (HfStationTwoDeviceDriver) linkDevice.getDeviceDriver(); @@ -171,14 +171,16 @@ public class ProduceshiftorderServiceImpl implements ProduceshiftorderService, A hfStationTwoDeviceDriver.writing("to_product_code", dto.getProduct_code()); hfStationTwoDeviceDriver.writing("to_order", dto.getOrder_code()); hfStationTwoDeviceDriver.writing("to_order_num", String.valueOf(dto.getQty())); + hfStationTwoDeviceDriver.writing("to_material_code", dto.getMaterial_code()); hfStationTwoDeviceDriver.writing("to_a", dto.getA()); hfStationTwoDeviceDriver.writing("to_b", dto.getB()); hfStationTwoDeviceDriver.writing("to_h", dto.getH()); hfStationTwoDeviceDriver.writing("to_w", dto.getW()); hfStationTwoDeviceDriver.writing("to_number", dto.getNumber()); hfStationTwoDeviceDriver.writing("to_product_code", dto.getProduct_code()); - hfStationTwoDeviceDriver.writing("to_command", "3"); - hfStationTwoDeviceDriver.writing("to_command", "3"); + hfStationTwoDeviceDriver.writing("to_material_code", dto.getMaterial_code()); + hfStationTwoDeviceDriver.writing("to_command", "1"); + hfStationTwoDeviceDriver.writing("to_command", "1"); } }else if (device.getDeviceDriver() instanceof HfStationTwoDeviceDriver) { HfStationTwoDeviceDriver hfStationTwoDeviceDriver = (HfStationTwoDeviceDriver) device.getDeviceDriver(); @@ -203,8 +205,8 @@ public class ProduceshiftorderServiceImpl implements ProduceshiftorderService, A hfStationTwoDeviceDriver.writing("to_w", dto.getW()); hfStationTwoDeviceDriver.writing("to_number", dto.getNumber()); hfStationTwoDeviceDriver.writing("to_product_code", dto.getProduct_code()); - hfStationTwoDeviceDriver.writing("to_command", "3"); - hfStationTwoDeviceDriver.writing("to_command", "3"); + hfStationTwoDeviceDriver.writing("to_command", "1"); + hfStationTwoDeviceDriver.writing("to_command", "1"); } JSONObject json = (JSONObject) JSONObject.toJSON(dto); wo.insert(json); @@ -367,7 +369,7 @@ public class ProduceshiftorderServiceImpl implements ProduceshiftorderService, A hfStationDeviceDriver.writing("to_command", "3"); hfStationDeviceDriver.writing("to_command", "3"); //压力机下发工单同时下发到关联的码盘工位 - String link_device_code=hfStationDeviceDriver.getExtraValue().get("link_device_code").toString(); + String link_device_code=String.valueOf(hfStationDeviceDriver.getExtraValue().get("link_device_code")); Device linkDevice = deviceAppService.findDeviceByCode(link_device_code); if (linkDevice.getDeviceDriver() instanceof HfStationTwoDeviceDriver) { HfStationTwoDeviceDriver hfStationTwoDeviceDriver = (HfStationTwoDeviceDriver) linkDevice.getDeviceDriver(); diff --git a/acs/nladmin-ui/src/views/acs/device/driver/hongfeng/hf_kiln_manipulator.vue b/acs/nladmin-ui/src/views/acs/device/driver/hongfeng/hf_kiln_manipulator.vue index 8222d4d..15fb486 100644 --- a/acs/nladmin-ui/src/views/acs/device/driver/hongfeng/hf_kiln_manipulator.vue +++ b/acs/nladmin-ui/src/views/acs/device/driver/hongfeng/hf_kiln_manipulator.vue @@ -304,7 +304,8 @@ export default { is_release: true, address: '' }, - rules: {} + rules: {}, + deviceList:{} } }, created() { diff --git a/acs/nladmin-ui/src/views/acs/device/driver/hongfeng/hf_station.vue b/acs/nladmin-ui/src/views/acs/device/driver/hongfeng/hf_station.vue index 96a788a..db8aae4 100644 --- a/acs/nladmin-ui/src/views/acs/device/driver/hongfeng/hf_station.vue +++ b/acs/nladmin-ui/src/views/acs/device/driver/hongfeng/hf_station.vue @@ -283,7 +283,8 @@ export default { is_release: true, address: '' }, - rules: {} + rules: {}, + deviceList: {} } }, created() { diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/service/dto/VehicleDetailDto.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/service/dto/VehicleDetailDto.java index 2326298..f0678d6 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/service/dto/VehicleDetailDto.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/service/dto/VehicleDetailDto.java @@ -25,6 +25,8 @@ public class VehicleDetailDto implements Serializable { private String product_code; /** 点位编码(窑号1/2) */ private String point_code; + /** 点位编码(窑号1/2) */ + private String kiln_code; /** 区域编码 0-缓存区 1-窑内 2-窑外冷却区 3-已拆垛*/ private String region_code; /** 顺序号 */ diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/service/impl/VehicleDetailServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/service/impl/VehicleDetailServiceImpl.java index 627dcaa..8af6e4b 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/service/impl/VehicleDetailServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/service/impl/VehicleDetailServiceImpl.java @@ -40,7 +40,9 @@ public class VehicleDetailServiceImpl implements VehicleDetailService { @Override public Map queryAll(Map whereJson, Pageable page) { JSONObject pageQuery = WQL.getWO("QMD_PB_VEHICLE_GROUP").addParamMap(MapOf.of("flag", "1" - , "vehicle_code", whereJson.get("vehicle_code"))) + , "vehicle_code", whereJson.get("vehicle_code") + ,"region_code",whereJson.get("region_code") + ,"is_delete",whereJson.get("is_delete"))) .pageQuery(WqlUtil.getHttpContext(page), "vehicle_code asc"); return pageQuery; } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/wql/QMD_PB_VEHICLE_GROUP.wql b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/wql/QMD_PB_VEHICLE_GROUP.wql index faf9849..49c0b08 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/wql/QMD_PB_VEHICLE_GROUP.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/wql/QMD_PB_VEHICLE_GROUP.wql @@ -17,6 +17,8 @@ 输入.vehicle_code TYPEAS s_string 输入.vehicle_type TYPEAS s_string 输入.vehicle_status TYPEAS s_string + 输入.region_code TYPEAS s_string + 输入.is_delete TYPEAS s_string [临时表] --这边列出来的临时表就会在运行期动态创建 @@ -52,6 +54,12 @@ 1 = 1 OPTION 输入.vehicle_code <> "" vd.vehicle_code LIKE '%' 输入.vehicle_code '%' + ENDOPTION + OPTION 输入.region_code <> "" + vd.region_code LIKE '%' 输入.region_code '%' + ENDOPTION + OPTION 输入.is_delete <> "" + vd.is_delete LIKE '%' 输入.is_delete '%' ENDOPTION ENDSELECT ENDPAGEQUERY diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/dto/WorkorderDto.java b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/dto/WorkorderDto.java index b4c2586..2926cef 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/dto/WorkorderDto.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/dto/WorkorderDto.java @@ -90,4 +90,22 @@ public class WorkorderDto implements Serializable { /** 修改时间 */ private String update_time; + + //A长边 + private String a; + + //B短边 + private String b; + + //H梯形高 + private String h; + + //W厚度 + private String w; + + //产品编号 + private String product_code; + + //托盘砖数量 + private String number; } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/WorkorderServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/WorkorderServiceImpl.java index abd261b..136754e 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/WorkorderServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/WorkorderServiceImpl.java @@ -215,12 +215,12 @@ public class WorkorderServiceImpl implements WorkordeService { map.put("material_code", jsonObject.getString("material_code")); map.put("device_code", json.getString("device_code")); map.put("material_name",jsonObject.getString("material_name")); - map.put("a",jsonObject.getString("a")); - map.put("b",jsonObject.getString("b")); - map.put("h",jsonObject.getString("h")); - map.put("w",jsonObject.getString("w")); - map.put("product_code",jsonObject.getString("product_code")); - map.put("number",jsonObject.getString("number")); + map.put("a",json.getString("a")); + map.put("b",json.getString("b")); + map.put("h",json.getString("h")); + map.put("w",json.getString("w")); + map.put("product_code",json.getString("product_code")); + map.put("number",json.getString("number")); array.add(map); Map resp = wmsToAcsService.order(array); if (StrUtil.equals(String.valueOf(resp.get("status")), "200")) { diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/phaseTwo/PalletizingTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/phaseTwo/PalletizingTask.java index 4f800f2..eedb8ba 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/phaseTwo/PalletizingTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/phaseTwo/PalletizingTask.java @@ -289,7 +289,7 @@ public class PalletizingTask extends AbstractAcsTask { .vehicle_code(pointObj.getString("vehicle_code")) .task_status(TaskStatusEnum.START_AND_POINT.getCode()) .point_code1("YWHC0"+pointObj.getString("order_seq")) - .point_code2("YWHC0"+ (pointObj.getInteger("order_seq")>21?42:21)) + .point_code2((pointObj.getInteger("order_seq")>21?"FLW01":"FLW02")) .priority("1") .handle_class(THIS_CLASS) .is_auto_issue(is_auto_issue) diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/wms.xls b/lms/nladmin-system/src/main/java/org/nl/wms/wms.xls index 3f598e3bc939d77582dc55a1c65c1527b2e5bf4b..8088ccbbfc109f58f6171c171de30713460da626 100644 GIT binary patch delta 5874 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 delta 5193 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 gqn)q5gL5Ee1J1}MJcJ+})wfQOyPdP&$M - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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 8a06095..8bb2684 100644 --- a/lms/nladmin-ui/src/views/wms/pdm/workerorder/index.vue +++ b/lms/nladmin-ui/src/views/wms/pdm/workerorder/index.vue @@ -184,6 +184,63 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -423,7 +480,9 @@ export default { name: 'Produceshiftorder', components: { pagination, crudOperation, rrOperation, udOperation, MaterDtl, ViewDialog, DeviceDialog }, mixins: [presenter(), header(), form(defaultForm), crud()], - dicts: ['pdm_workorder_status', 'is_used', 'is_or_not', 'vehicle_type', 'workorder_procedure'], + dicts: ['pdm_workorder_status', 'is_used', 'is_or_not', 'vehicle_type', 'workorder_procedure', 'product_code', + 'product_code_1', 'product_code_2', 'product_code_3', 'product_code_4', 'product_code_5', 'product_code_6', 'product_code_7', + 'product_code_8', 'product_code_9', 'product_code_10'], cruds() { return CRUD({ title: '工单', url: 'api/workorder', idField: 'workorder_id', sort: 'workorder_id,desc', @@ -541,6 +600,15 @@ export default { return true } }, + setProduct(row) { + var product_code = 'product_code_' + row + var productValue = this.dict.label[product_code] // 获取包含观察者的对象 + // 使用 product_code 作为键名来获取对应的属性值 + this.form.a = productValue.a + this.form.b = productValue.b + this.form.h = productValue.h + this.form.w = productValue.w + }, // 新增编辑给form表单物料相关信息赋值 setMaterValue(row) { this.form.material_id = row.material_id