From b306d1106b915bb13fd7a02217ae9c65de2fd03d Mon Sep 17 00:00:00 2001
From: ws183 <1143478319@qq.com>
Date: 星期一, 28 四月 2025 17:19:52 +0800
Subject: [PATCH] 新增质检页面附件上传
---
igds-core/src/main/java/com/ld/igds/m/view/QualityManagerPR.java | 78 +++++++++++++++++++++++++++++++-------
1 files changed, 63 insertions(+), 15 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 63588b7..903c971 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>();
@@ -116,15 +115,39 @@
*/
@DataResolver
public void saveQuality(MQuality data) {
- String id = "";
if (StringUtils.isEmpty(data.getId())) {
- id = ManageUtil.createQualityId(data.getType(), data.getTime());
+ 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 +162,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