From db18c642bbf58d7eaa7363ab623550cb83ce6c4a Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Tue, 25 Jun 2024 09:08:25 +0800
Subject: [PATCH] =?UTF-8?q?2024-06-25=20=E5=8A=9F=E8=83=BD=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sys/modules/pms/data/QcFAIRecordData.java | 45 +++++++++++++++++++
 .../pms/service/Impl/QcServiceImpl.java       | 37 +++++----------
 src/main/resources/mapper/pms/QcMapper.xml    |  7 ++-
 3 files changed, 61 insertions(+), 28 deletions(-)

diff --git a/src/main/java/com/xujie/sys/modules/pms/data/QcFAIRecordData.java b/src/main/java/com/xujie/sys/modules/pms/data/QcFAIRecordData.java
index d663c7b..e855e11 100644
--- a/src/main/java/com/xujie/sys/modules/pms/data/QcFAIRecordData.java
+++ b/src/main/java/com/xujie/sys/modules/pms/data/QcFAIRecordData.java
@@ -255,6 +255,51 @@ public class QcFAIRecordData extends QueryPage {
     private String refInfo2;
     private String refInfo3;
     private String refInfo4;
+    private String orderRef1;
+    private String orderRef2;
+    private String orderRef3;
+    private String orderRef4;
+    private String orderRef5;
+
+    public String getOrderRef1() {
+        return orderRef1;
+    }
+
+    public void setOrderRef1(String orderRef1) {
+        this.orderRef1 = orderRef1;
+    }
+
+    public String getOrderRef2() {
+        return orderRef2;
+    }
+
+    public void setOrderRef2(String orderRef2) {
+        this.orderRef2 = orderRef2;
+    }
+
+    public String getOrderRef3() {
+        return orderRef3;
+    }
+
+    public void setOrderRef3(String orderRef3) {
+        this.orderRef3 = orderRef3;
+    }
+
+    public String getOrderRef4() {
+        return orderRef4;
+    }
+
+    public void setOrderRef4(String orderRef4) {
+        this.orderRef4 = orderRef4;
+    }
+
+    public String getOrderRef5() {
+        return orderRef5;
+    }
+
+    public void setOrderRef5(String orderRef5) {
+        this.orderRef5 = orderRef5;
+    }
 
     public String getRefInfo1() {
         return refInfo1;
diff --git a/src/main/java/com/xujie/sys/modules/pms/service/Impl/QcServiceImpl.java b/src/main/java/com/xujie/sys/modules/pms/service/Impl/QcServiceImpl.java
index 9553e20..f453926 100644
--- a/src/main/java/com/xujie/sys/modules/pms/service/Impl/QcServiceImpl.java
+++ b/src/main/java/com/xujie/sys/modules/pms/service/Impl/QcServiceImpl.java
@@ -5169,35 +5169,18 @@ public class QcServiceImpl implements QcService {
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
         //公共参数
         String site = inData.getSite();
-        String receiptNo = inData.getReceiptNo(); // 接收单号
-        int receiptItemNo = 0;
-        try {
-            receiptItemNo = Integer.parseInt(inData.getReceiptItemNo()); // 接收单号
-        } catch (NumberFormatException e) {
-            System.out.println("字符串转换数值失败(receiptItemNo): " + inData.getReceiptItemNo());
-        }
-        String inspectDate = sdf.format(inData.getInspectorDate());
-        Float arriveQty = inData.getRollCount().floatValue(); // 送检数量
-        Float qtyInspected = inData.getSamplingQty().floatValue(); // 检验数量/抽样数量
-        Float qtyApproved = inData.getPassQty() == null ? 0 : inData.getPassQty().floatValue();// 合格数量
-        Float qtyScrapt = inData.getNotPassQty() == null ? 0 : inData.getNotPassQty().floatValue();// 不合格数量
-        String inspectResult = inData.getInspectionResult(); // 检验结果
-        String handleType = inData.getDisposalMeasures(); // 不合格处理方式
-        String username = inData.getUpdateBy(); // 用户名
-        String inspector = inData.getInspectorName();// 检验员名称
+        String transNo = inData.getOrderRef1();
+        Float defectQty = inData.getNotPassQty().floatValue(); // 不合格数量
+        Float inspectedQty = inData.getRollCount().floatValue(); // 检验数量
+        String inspectStatus = inData.getInspectionResult(); // 检验结果
+        String partNo = inData.getPartNo(); // 物料名称
         List<Object> params = new ArrayList<>();
         params.add(site);
-        params.add(inspectResult);
-        params.add(receiptNo);
-        params.add(receiptItemNo);
-        params.add(inspectDate);
-        params.add(arriveQty);
-        params.add(qtyApproved);
-        params.add(qtyScrapt);
-        params.add(qtyInspected);
-        params.add(handleType);
-        params.add(username);
-        params.add(inspector);
+        params.add(transNo);
+        params.add(defectQty);
+        params.add(inspectedQty);
+        params.add(inspectStatus);
+        params.add(partNo);
         //执行方法
         List<Map<String, Object>> resultList = procedureDao.getProcedureData("update_ERPSOOpsTransfer", params);
         return resultList.get(0);
diff --git a/src/main/resources/mapper/pms/QcMapper.xml b/src/main/resources/mapper/pms/QcMapper.xml
index 640f694..49a5f52 100644
--- a/src/main/resources/mapper/pms/QcMapper.xml
+++ b/src/main/resources/mapper/pms/QcMapper.xml
@@ -3535,7 +3535,12 @@
         isnull(dbo.joint_name(site, bu_no, inspection_no, 'responsible'), '') as responsiblePersonName,
         pass_qty,
         not_pass_qty,
-        order_ref_type
+        order_ref_type,
+        order_ref1,
+        order_ref2,
+        order_ref3,
+        order_ref4,
+        order_ref5
         FROM qc_stock_record
         <where>
             site in (select site from eam_access_site where username = #{query.userName})