From b773030f37dc06a92bdb80e8af9a408843d5b317 Mon Sep 17 00:00:00 2001
From: 懒羊羊 <15939171744@163.com>
Date: 星期五, 15 三月 2024 16:47:43 +0800
Subject: [PATCH] 操作看板

---
 jcdm-main/src/main/java/com/jcdm/main/bs/formulaChild/service/impl/BsFormulaChildInfoServiceImpl.java |   63 +++++++++++++++++++++++++++++++
 1 files changed, 62 insertions(+), 1 deletions(-)

diff --git a/jcdm-main/src/main/java/com/jcdm/main/bs/formulaChild/service/impl/BsFormulaChildInfoServiceImpl.java b/jcdm-main/src/main/java/com/jcdm/main/bs/formulaChild/service/impl/BsFormulaChildInfoServiceImpl.java
index 09972b8..3081f83 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/bs/formulaChild/service/impl/BsFormulaChildInfoServiceImpl.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/bs/formulaChild/service/impl/BsFormulaChildInfoServiceImpl.java
@@ -1,9 +1,13 @@
 package com.jcdm.main.bs.formulaChild.service.impl;
 
+import java.util.Date;
 import java.util.List;
 
 import com.jcdm.common.core.domain.AjaxResult;
 import com.jcdm.common.utils.DateUtils;
+import com.jcdm.main.da.paramCollection.domain.DaParamCollection;
+import com.jcdm.main.da.paramCollection.mapper.DaParamCollectionMapper;
+import org.aspectj.weaver.loadtime.Aj;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.jcdm.main.bs.formulaChild.mapper.BsFormulaChildInfoMapper;
@@ -21,6 +25,9 @@
 {
     @Autowired
     private BsFormulaChildInfoMapper bsFormulaChildInfoMapper;
+
+    @Autowired
+    private DaParamCollectionMapper daParamCollectionMapper;
 
     /**
      * 鏌ヨ閰嶆柟閰嶇疆瀛愪俊鎭�
@@ -106,20 +113,50 @@
     }
 
     @Override
-    public List<BsFormulaChildInfo> releaseCheck(BsFormulaChildInfo bsFormulaChildInfo) {
+    public BsFormulaChildInfo getCount(String productCode, String processesCode) {
+        BsFormulaChildInfo info = new BsFormulaChildInfo();
+        info.setProcessesCode(processesCode);
+        info.setProductCode(productCode);
+        return bsFormulaChildInfoMapper.getCount(info);
+    }
+
+    @Override
+    public BsFormulaChildInfo releaseCheck(BsFormulaChildInfo bsFormulaChildInfo) {
         return bsFormulaChildInfoMapper.releaseCheck(bsFormulaChildInfo);
     }
 
     @Override
     public AjaxResult updateResults(BsFormulaChildInfo bsFormulaChildInfo) {
+        BsFormulaChildInfo checkInfo = new BsFormulaChildInfo();
+        checkInfo.setProcessesCode(bsFormulaChildInfo.getLocationCode());
+        checkInfo.setProductCode(bsFormulaChildInfo.getProductCode());
+        bsFormulaChildInfo.setMaterialCode(bsFormulaChildInfo.getScanBarcode().substring(1,2));
         List<BsFormulaChildInfo> bsFormulaChildInfos = bsFormulaChildInfoMapper.selectBsFormulaChildInfoList(bsFormulaChildInfo);
         if(bsFormulaChildInfos.size()>0){
             bsFormulaChildInfos.get(0).setResults("OK");
             bsFormulaChildInfoMapper.updateBsFormulaChildInfo(bsFormulaChildInfos.get(0));
+            bsFormulaChildInfo.setParamValue(bsFormulaChildInfo.getScanBarcode());
+            bsFormulaChildInfo.setParamCode(bsFormulaChildInfos.get(0).getParamCode());
+            bsFormulaChildInfo.setSfcBarcode(bsFormulaChildInfo.getSfcBarcode());
+            addParameterCollection(bsFormulaChildInfo);
+//            BsFormulaChildInfo count = bsFormulaChildInfoMapper.getCount(checkInfo);
+//            Integer i = count.getCounts();
         }else {
             return AjaxResult.error("闈炴湰宸ヤ綅鐗╂枡锛岃閲嶆柊鎵弿");
         }
         return AjaxResult.success("鎴愬姛");
+    }
+
+    public void addParameterCollection(BsFormulaChildInfo bsFormulaChildInfo){
+        DaParamCollection daParamCollection = new DaParamCollection();
+        daParamCollection.setParamCode(bsFormulaChildInfo.getParamCode());
+        daParamCollection.setWorkOrderNo(bsFormulaChildInfo.getWorkOrderNo());
+        daParamCollection.setLocationCode(bsFormulaChildInfo.getLocationCode());
+        daParamCollection.setParamValue(bsFormulaChildInfo.getParamValue());
+        daParamCollection.setProductCode(bsFormulaChildInfo.getProductCode());
+        daParamCollection.setCollectionTime(new Date());
+        daParamCollection.setSfcCode(bsFormulaChildInfo.getSfcBarcode());
+        daParamCollectionMapper.insertDaParamCollection(daParamCollection);
     }
 
     @Override
@@ -127,4 +164,28 @@
         bsFormulaChildInfoMapper.workpieceRelease(bsFormulaChildInfo);
         return AjaxResult.success();
     }
+
+    @Override
+    public AjaxResult updateTighteningFormula(BsFormulaChildInfo bsFormulaChildInfo) {
+        BsFormulaChildInfo listQuery = new BsFormulaChildInfo();
+        listQuery.setParamCode(bsFormulaChildInfo.getParamCode());
+        String paramCode = bsFormulaChildInfo.getTightenTheArray();
+        if(paramCode.contains("N")){
+            List<BsFormulaChildInfo> bsFormulaChildInfos = bsFormulaChildInfoMapper.selectBsFormulaChildInfoList(listQuery);
+            bsFormulaChildInfos.get(0).setResults("NG");
+            bsFormulaChildInfos.get(0).setCollectData(bsFormulaChildInfo.getTightenTheArray());
+            bsFormulaChildInfoMapper.updateBsFormulaChildInfo(bsFormulaChildInfos.get(0));
+            return AjaxResult.error("鎵弿缁撴灉NG,璇烽噸鏂版壂鎻忥紒");
+        }else {
+            List<BsFormulaChildInfo> bsFormulaChildInfos = bsFormulaChildInfoMapper.selectBsFormulaChildInfoList(listQuery);
+            bsFormulaChildInfos.get(0).setResults("OK");
+            bsFormulaChildInfos.get(0).setCollectData(bsFormulaChildInfo.getTightenTheArray());
+            bsFormulaChildInfoMapper.updateBsFormulaChildInfo(bsFormulaChildInfos.get(0));
+        }
+        return AjaxResult.success("鎵弿鎴愬姛锛�");
+    }
+
+
+
+
 }

--
Gitblit v1.9.3