From 9912b4d813794ab0fea59bf249b09249876da90e Mon Sep 17 00:00:00 2001
From: zhaoxiaolin <khd@123>
Date: Tue, 27 Aug 2024 13:25:23 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=87=E8=AF=86=E5=8D=A1=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ProOrderWorkorderServiceImpl.java     | 10 ++++++++--
 .../resources/mapper/plan/ProOrderWorkorderMapper.xml  |  9 ++++++---
 .../op/quality/controller/QcStaticTableController.java |  1 -
 3 files changed, 14 insertions(+), 6 deletions(-)

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 0eed90e7..3790df4f 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
@@ -1292,8 +1292,11 @@ public class ProOrderWorkorderServiceImpl implements IProOrderWorkorderService {
                         }else{
                             pw.setBatchQuantity(pn);
                         }
+                        pw.setUnit(pow.getUnit());
+                        pw.setUmrez(pw.getBatchQuantity().multiply(pow.getUmrez()));//子单数量
                         pw.setPalletNo(i++);
-                        pw.setPalletCode(pow.getWorkorderCode() + "-" + pow.getBatchCode() + "-" + pw.getPalletNo());//workorderCode 实际上是订单号
+                        pw.setPalletCode(pow.getProductCode().replace("0000000","") + "-" +pow.getWorkorderCode() + "-"
+                                + pow.getBatchCode() + "-" + pw.getPalletNo());//workorderCode 实际上是订单号
                         pw.setCreateTime(nowDate);
                         pw.setCreateBy(SecurityUtils.getUsername());
                         pw.setAddFlag("0");//增打标志
@@ -1312,7 +1315,8 @@ public class ProOrderWorkorderServiceImpl implements IProOrderWorkorderService {
             List<ProOrderWorkorder> dtos1 = proOrderWorkorderMapper.getPreIdCardList(proOrderWorkorder);
             ProOrderWorkorder pow = dtos1.get(0);
             proOrderWorkorder.setPalletNo(palletNo);
-            String uniqueBarCode = pow.getWorkorderCode() + "-" + proOrderWorkorder.getBatchCode() + "-" + palletNo;//订单号+批次+板次 唯一二维码标识
+            String uniqueBarCode = pow.getProductCode().replace("0000000","") +
+                    pow.getWorkorderCode() + "-" + proOrderWorkorder.getBatchCode() + "-" + palletNo;//订单号+批次+板次 唯一二维码标识
             ProOrderWorkorder pw = new ProOrderWorkorder();
             pw.setProductName(pow.getProductName());//产品名
             pw.setWorkorderCode(pow.getWorkorderCode());//工单号 实际是订单号
@@ -1320,6 +1324,8 @@ public class ProOrderWorkorderServiceImpl implements IProOrderWorkorderService {
             pw.setProductDateStr(pow.getProductDateStr());//生产日期
             pw.setRecordId(IdUtils.fastSimpleUUID());//记录
             pw.setBatchQuantity(proOrderWorkorder.getBatchQuantity());//批次数量
+            pw.setUnit(pow.getUnit());
+            pw.setUmrez(pw.getBatchQuantity().multiply(pow.getUmrez()));//子单数量
             pw.setPalletNo(palletNo);//板次
             pw.setPalletCode(uniqueBarCode);//唯一二维码
             pw.setUpdateTime(DateUtils.getNowDate());
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 ef9f462d..55ddc3c3 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
@@ -682,17 +682,20 @@
     </select>
     <select id="getPreIdCardList" resultType="com.op.plan.domain.ProOrderWorkorder">
         select pow.product_name productName,
+               pow.product_code productCode,
                pow.product_date productDateStr,
                pow.workorder_code_sap workorderCode,
                powb.batch_code batchCode,
                case when powbp.quantity is not null then powbp.quantity
-               else powb.batch_quantity end batchQuantity,
+               else powb.batch_quantity end batchQuantity,pow.unit,
                bpa.pallet_num palletNum,
-               concat(pow.workorder_code_sap,'-', powb.batch_code,'-',powbp.pallet_num) palletCode,
-               powbp.pallet_num palletNo
+               concat(REPLACE(pow.product_code, '0000000', ''),'-',pow.workorder_code_sap,'-', powb.batch_code,'-',powbp.pallet_num) palletCode,
+               powbp.pallet_num palletNo,
+               bp.umrez
         from pro_order_workorder pow
         left join pro_order_workorder_batch powb on pow.workorder_id = powb.workorder_id
         left join base_product_attached bpa on concat('0000000',bpa.product_code) = pow.product_code
+        left join base_product bp on bp.product_code = pow.product_code
         left join pro_order_workorder_batch_pallet powbp on powbp.workorder_code = pow.workorder_code_sap
                                                                 and powbp.batch_code = powb.batch_code
         where pow.workorder_code = #{workorderCode} and pow.del_flag = '0' and powb.del_flag = '0'
diff --git a/op-modules/op-quality/src/main/java/com/op/quality/controller/QcStaticTableController.java b/op-modules/op-quality/src/main/java/com/op/quality/controller/QcStaticTableController.java
index 130dfc2c..0f19454a 100644
--- a/op-modules/op-quality/src/main/java/com/op/quality/controller/QcStaticTableController.java
+++ b/op-modules/op-quality/src/main/java/com/op/quality/controller/QcStaticTableController.java
@@ -93,7 +93,6 @@ public class QcStaticTableController extends BaseController {
             String ymStr = dtf.format(date);
             qcStaticTable.setYearMonth(ymStr);//end
         }
-        startPage();
         List<QcStaticTable> list = qcStaticTableService.getIncomeChartList(qcStaticTable);
         return list;
     }