From 256f9c48f2c52985a094a220b644d60d24cb6ed4 Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期二, 14 十月 2025 09:49:32 +0800
Subject: [PATCH] 省质检报告提交

---
 igds-core/src/main/java/com/ld/igds/m/view/QualityManagerPR.java |   84 ++++++++++++++++++++++++++++++++++--------
 1 files changed, 68 insertions(+), 16 deletions(-)

diff --git a/igds-core/src/main/java/com/ld/igds/m/view/QualityManagerPR.java b/igds-core/src/main/java/com/ld/igds/m/view/QualityManagerPR.java
index 9b7272b..0a1ca04 100644
--- a/igds-core/src/main/java/com/ld/igds/m/view/QualityManagerPR.java
+++ b/igds-core/src/main/java/com/ld/igds/m/view/QualityManagerPR.java
@@ -5,10 +5,13 @@
 import com.bstek.dorado.annotation.Expose;
 import com.bstek.dorado.data.provider.Page;
 import com.ld.igds.check.CheckStandardManager;
-import com.ld.igds.m.ManageUtil;
+import com.ld.igds.check.dto.CheckItemData;
+import com.ld.igds.m.ReportManage;
 import com.ld.igds.m.service.HQualityManageService;
+import com.ld.igds.models.Depot;
 import com.ld.igds.models.DicTrigger;
 import com.ld.igds.models.MQuality;
+import com.ld.igds.view.service.HDepotService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -29,6 +32,10 @@
     private HQualityManageService qualityManageService;
     @Autowired
     private CheckStandardManager checkStandardManager;
+    @Autowired
+    private ReportManage reportManage;
+    @Autowired
+    private HDepotService depotService;
 
     /**
      * 妫�楠岀被鍒�
@@ -37,14 +44,6 @@
      *
      * @return
      */
-//    @DataProvider
-//    public List<DicTrigger> triggerType() {
-//        List<DicTrigger> list = new ArrayList<DicTrigger>();
-//        list.add(new DicTrigger("01", "婊′粨鍒濇"));
-//        list.add(new DicTrigger("02", "鍑轰粨妫�楠�"));
-//        list.add(new DicTrigger("03", "鏈堝害鏅"));
-//        return list;
-//    }
     @DataProvider
     public List<DicTrigger> triggerType() {
         List<DicTrigger> list = new ArrayList<DicTrigger>();
@@ -97,7 +96,7 @@
     /**
      * 鍒嗛〉鑾峰彇璐ㄩ噺宸℃璁板綍淇℃伅
      * <p>
-     * qualityManagerPR#listQuality
+     * qualityManager1PR#listQuality
      *
      * @param page
      * @param param
@@ -105,6 +104,10 @@
      */
     @DataProvider
     public void listQuality(Page<MQuality> page, Map<String, Object> param) throws Exception {
+        if (param == null) {
+            param = new java.util.HashMap<>();
+        }
+        param.put("provReserve", "N");
         qualityManageService.listQuality(page, param);
     }
 
@@ -116,15 +119,39 @@
      */
     @DataResolver
     public void saveQuality(MQuality data) {
-        String id = "";
         if (StringUtils.isEmpty(data.getId())) {
-            id = ManageUtil.createQualityId(data.getType());
+            data.setId( "ZJ_" + qualityManageService.getIdByTime(data.getTime()));
         }
-        qualityManageService.saveQuality(id, data);
+        try {
+            qualityManageService.saveQuality(data.getId(), data);
+            //淇濆瓨璐т綅璐ㄦ鏁版嵁
+            Depot depot = depotService.getDepotById(data.getCompanyId(), data.getDepotId());
+            depot.setCheckDate(data.getTime());
 
-        //淇濆瓨妫�娴嬬殑鍖栭獙椤逛俊鎭�
-        if (null != data.getCheckItems()) {
-            checkStandardManager.updateCheckItems(id, null, data.getCheckItems());
+            //淇濆瓨妫�娴嬬殑鍖栭獙椤逛俊鎭�
+            if (null != data.getCheckItems()) {
+                checkStandardManager.updateCheckItems(data.getId(), null, data.getCheckItems());
+                List<CheckItemData> checkItems = data.getCheckItems();
+
+                for (CheckItemData checkItem : checkItems) {
+                    if("C01".equals(checkItem.getStandardId())){
+                        String value = checkItem.getValue();
+                        depot.setPerWet(Double.valueOf(value));
+                    }
+                    if("C02".equals(checkItem.getStandardId())){
+                        String value = checkItem.getValue();
+                        depot.setPerImpurity(Double.valueOf(value));
+                    }
+                    if("C03".equals(checkItem.getStandardId())){
+                        String value = checkItem.getValue();
+                        depot.setBulkWeight(Double.valueOf(value));
+                    }
+                }
+            }
+
+            depotService.updateDepot(depot);
+        } catch (Exception e) {
+            e.printStackTrace();
         }
     }
 
@@ -139,4 +166,29 @@
         return qualityManageService.delQuality(data);
     }
 
+    /**
+     * qualityManagerPR#getPer
+     *
+     * @param checkId
+     * @return
+     */
+    @Expose
+    public CheckItemData getPer(String checkId) {
+        return qualityManageService.getCheckItem(checkId);
+    }
+
+    /**
+     * qualityManagerPR#printQualityBill 鎵撳嵃璐ㄦ鎶ュ憡鍗�
+     *
+     * @param data
+     * @return
+     */
+    @Expose
+    public String printQualityBill(MQuality data) {
+        if (StringUtils.isEmpty(data.getFoodVariety())) {
+            return "绮儏鍝佺涓虹┖锛屼笉鏀寔鎵撳嵃锛�";
+        }
+        return reportManage.printQualityBill(data);
+    }
+
 }

--
Gitblit v1.9.3