From 037498849f373f42a07349d0ab22d8f3dbc3d5e5 Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Sun, 7 Apr 2024 14:32:43 +0800 Subject: [PATCH 1/8] =?UTF-8?q?LJ04=E7=9A=84=E8=AE=A2=E5=8D=95=E6=8E=A5?= =?UTF-8?q?=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/op/plan/service/impl/ProOrderServiceImpl.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderServiceImpl.java b/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderServiceImpl.java index 537200570..8baa13530 100644 --- a/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderServiceImpl.java +++ b/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderServiceImpl.java @@ -303,7 +303,7 @@ public class ProOrderServiceImpl implements IProOrderService { workOrder.setProductName(productNameInfo.getProdDesc()); workOrder.setBelongWorkOrder(belongWorkOrder); - workOrder.setProdType("LJ01"); + workOrder.setProdType(proOrder.getOrderType()); // 将工单信息更新至数据库/**pro_order_workorder**/ proOrderWorkorderMapper.insertProOrderWorkorder(workOrder); @@ -574,7 +574,6 @@ public class ProOrderServiceImpl implements IProOrderService { order.setPlanFactoryCode(factoryCode); order.setFactoryCode(factoryCode); order.setCreateBy(SecurityUtils.getUsername()); - order.setOrderType("LJ01"); order.setProdType("prod"); order.setStatus("o0"); bpqo = new BaseProduct(); From 4a3367df37bc5677c20327724ce7c421efc4639f Mon Sep 17 00:00:00 2001 From: A0010407 Date: Sun, 7 Apr 2024 15:33:23 +0800 Subject: [PATCH 2/8] =?UTF-8?q?2024-04-07=20=E5=9F=BA=E7=A1=80=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E6=A8=A1=E5=9D=97-=E4=BA=A7=E5=93=81-=E5=8A=A0?= =?UTF-8?q?=E6=8A=A5=E5=B7=A5=E6=B1=87=E7=8E=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/wms/BaseProductMapper.xml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/op-modules/op-wms/src/main/resources/mapper/wms/BaseProductMapper.xml b/op-modules/op-wms/src/main/resources/mapper/wms/BaseProductMapper.xml index 204cd45e9..83230d23a 100644 --- a/op-modules/op-wms/src/main/resources/mapper/wms/BaseProductMapper.xml +++ b/op-modules/op-wms/src/main/resources/mapper/wms/BaseProductMapper.xml @@ -64,10 +64,11 @@ + - select product_id, product_code, product_desc_zh, product_model,product_desc_en, rule_code, old_product_code, parts_product_code, sku_barcode, length, width, height, gross_weight, net_weight, tare_weight, volume, unit_price, product_group, product_group_name, user_defined1, user_defined2, user_defined3, user_defined4, user_defined5, user_defined6, create_by, create_time, update_by, update_time, factory_code, active_flag, sync_flag, primary_uom, del_flag, bstme, basic_order, conv_order, ausme, basic_issue, conv_issue, append_flag, append_percent,mtart from base_product + select product_id, product_code, product_desc_zh, product_model,product_desc_en, rule_code, old_product_code, parts_product_code, sku_barcode, length, width, height, gross_weight, net_weight, tare_weight, volume, unit_price, product_group, product_group_name, user_defined1, user_defined2, user_defined3, user_defined4, user_defined5, user_defined6, create_by, create_time, update_by, update_time, factory_code, active_flag, sync_flag, primary_uom, del_flag, bstme, basic_order, conv_order, ausme, basic_issue, conv_issue, append_flag, append_percent, mtart, report_rate from base_product select workorder_code_sap workorderCodeSap, workorder_code workorderCode, - factory_code factoryCode + factory_code factoryCode, + product_code productCode from pro_order_workorder where belong_work_order = #{workorderCode} and del_flag = '0' order by order_code @@ -694,6 +695,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where mrwc.attr1 = '1' and mrwc.del_flag = '0' and mrwc.attr2 = '0' and mrwc.parent_order = #{workorderCode} + insert into mes_report_work diff --git a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskIncome.java b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskIncome.java index 421cf69f7..5d1e0c9ce 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskIncome.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskIncome.java @@ -168,6 +168,7 @@ public class QcCheckTaskIncome extends BaseEntity { */ private String delFlag; private String orderType; + private String orderTypeDesc; private String incomeTimeStart; private String incomeTimeEnd; private String checkTimeStart; @@ -195,6 +196,15 @@ public class QcCheckTaskIncome extends BaseEntity { private String materialType;//来料类别 private String materialFrom;//物料来源 + + public String getOrderTypeDesc() { + return orderTypeDesc; + } + + public void setOrderTypeDesc(String orderTypeDesc) { + this.orderTypeDesc = orderTypeDesc; + } + public String getMaterialType() { return materialType; } diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java index 6487e0286..4ef7ca3ff 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java @@ -256,7 +256,7 @@ public class QcCheckTaskIncomeServiceImpl implements } } qcCheckTaskIncome.setNoOkQuality(noOkQuality); - /**qc_check_task**/ + /**qc_check_task**///------------------zxl qcCheckTaskIncomeMapper.insertQcCheckTaskIncome(qcCheckTaskIncome); /**qc_check_task_detail**/ diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskIncomeMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskIncomeMapper.xml index dff8c47cf..2cf55975f 100644 --- a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskIncomeMapper.xml +++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskIncomeMapper.xml @@ -36,13 +36,17 @@ + + + select record_id, check_no, income_batch_no, order_no, material_code, material_name, quality, unit, supplier_code, supplier_name, income_time, check_loc, check_status, check_man_code, check_man_name, check_time, check_result, status, attr1, attr2, attr3, attr4, create_by, - create_time, update_by, update_time, factory_code, del_flag , check_type,sample_quality, noOk_quality + create_time, update_by, update_time, factory_code, del_flag , check_type,sample_quality, noOk_quality, + order_type,order_type_desc from qc_check_task @@ -52,7 +56,7 @@ qct.supplier_code, qct.supplier_name, qct.income_time, qct.check_loc, qct.check_status, qct.check_man_code, qct.check_man_name,qct.check_time, qct.check_result, qct.status, qct.create_by,qct.create_time, qct.update_by, qct.update_time,qct.check_type,qct.noOk_quality, - qct.sample_quality, qct.type_code + qct.sample_quality, qct.type_code, qct.order_type from qc_check_task qct and qct.check_no = #{checkNo} @@ -83,6 +87,7 @@ and #{checkTimeEnd} > CONVERT(varchar(30),qct.check_time, 120) and qct.check_type = #{checkType} and qct.type_code = #{typeCode} + and qct.order_type = #{orderType} order by qct.create_time DESC @@ -208,6 +213,7 @@ type_code, sample_quality, order_type, + order_type_desc, #{recordId}, @@ -243,6 +249,7 @@ #{typeCode}, #{sampleQuality}, #{orderType}, + #{orderTypeDesc}, diff --git a/op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapItemSyncImpl.java b/op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapItemSyncImpl.java index f08d93e35..b72170cab 100644 --- a/op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapItemSyncImpl.java +++ b/op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapItemSyncImpl.java @@ -415,7 +415,7 @@ public class SapItemSyncImpl implements SapItemSyncService { /**8010 榄菊成品；8020 榄菊半成品；8030 榄菊原材料；8040 榄菊包装材料；8050 榄菊塑料五金电子；8060 榄菊辅助用品 ；8061 榄菊办公用品；8062 榄菊劳保用品；8070 榄菊广宣品；8090 榄菊未估价的物料**/ qcCheckTaskIncomeDTO.setOrderType(maraTable.getString("MTART"));//物料类型 - qcCheckTaskIncomeDTO.setAttr4(maraTable.getString("MTBEZ"));//物料类型描述 + qcCheckTaskIncomeDTO.setOrderTypeDesc(maraTable.getString("MTBEZ"));//物料类型描述 qcCheckTaskIncomeDTO.setOrderNo(maraTable.getString("EBELN"));//采购订单 qcCheckTaskIncomeDTO.setSupplierCode(maraTable.getString("LIFNR")); qcCheckTaskIncomeDTO.setSupplierName(maraTable.getString("LIFNR_NM"));