From 3a03b619592630b4806a5eca2da4114994b74f7c Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Sat, 9 Mar 2024 11:09:38 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=88=9B=E5=BB=BA=E5=8A=A0?= =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8F=B72?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/op/plan/domain/ProOrderWorkorder.java | 10 +++++++++- .../service/impl/ProOrderWorkorderServiceImpl.java | 2 +- .../resources/mapper/plan/ProOrderWorkorderMapper.xml | 6 ++++-- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/op-modules/op-plan/src/main/java/com/op/plan/domain/ProOrderWorkorder.java b/op-modules/op-plan/src/main/java/com/op/plan/domain/ProOrderWorkorder.java index 9b56b68f..7bac0bce 100644 --- a/op-modules/op-plan/src/main/java/com/op/plan/domain/ProOrderWorkorder.java +++ b/op-modules/op-plan/src/main/java/com/op/plan/domain/ProOrderWorkorder.java @@ -174,7 +174,7 @@ public class ProOrderWorkorder extends TreeEntity { * 预留字段2 */ private String attr2; - + private String atrr2; /** * 预留字段3 */ @@ -376,6 +376,14 @@ public class ProOrderWorkorder extends TreeEntity { this.bucketCode = bucketCode; } + public String getAtrr2() { + return atrr2; + } + + public void setAtrr2(String atrr2) { + this.atrr2 = atrr2; + } + public Integer getMaterialId() { return materialId; } diff --git a/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderWorkorderServiceImpl.java b/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderWorkorderServiceImpl.java index cccd8b35..a4507697 100644 --- a/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderWorkorderServiceImpl.java +++ b/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderWorkorderServiceImpl.java @@ -376,7 +376,7 @@ public class ProOrderWorkorderServiceImpl implements IProOrderWorkorderService { SapCreateOrder sap = new SapCreateOrder(); sap.setWerks(whiteOrder.getFactoryCode());//工厂编码 sap.setAufpar("LJ01");//订单类型 - sap.setVerid(whiteOrder.getAttr2());//生产版本 + sap.setVerid(whiteOrder.getAtrr2());//生产版本 sap.setMatnr(whiteOrder.getProductCode());//物料编号 sap.setQuantity(whiteOrder.getQuantitySplit() + "");//数量 sap.setDates(DateUtils.parseDateToStr("yyyy-MM-dd", whiteOrder.getProductDate()));//开始时间 diff --git a/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderWorkorderMapper.xml b/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderWorkorderMapper.xml index 6d48cb75..2528e57a 100644 --- a/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderWorkorderMapper.xml +++ b/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderWorkorderMapper.xml @@ -27,6 +27,8 @@ + + @@ -193,10 +195,10 @@ pow.product_code, pow.product_name, pow.product_spc, pow.unit, pow.quantity_produced, pow.quantity_split, pow.route_code, pow.prod_line_code, pow.product_date, - pow.shift_id, pow.parent_order, pow.ancestors, pow.status, pow.remark, pow.attr1, + pow.shift_id, pow.parent_order, pow.ancestors, pow.status, pow.remark, pow.attr1, pow.attr2, pow.attr3, pow.attr4, pow.create_by, pow.create_time, pow.update_by, pow.update_time, pow.prod_type, pow.factory_code , pow.end_flag , pow.car_num, - pow.sort_no,pow.workorder_code_sap, po.atrr2 attr2 + pow.sort_no,pow.workorder_code_sap, po.atrr2 from pro_order_workorder pow left join pro_order po on pow.order_code = po.order_code where (pow.workorder_code = #{workorderId} or pow.workorder_id = #{workorderId})