From 16036dcbf43937482895a36126bc943939f2891b Mon Sep 17 00:00:00 2001
From: 懒羊羊 <15939171744@163.com>
Date: 星期三, 13 三月 2024 08:38:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
jcdm-main/src/main/java/com/jcdm/main/bs/formulaChild/service/impl/BsFormulaChildInfoServiceImpl.java | 20 ++++++++++++++++++++
1 files changed, 20 insertions(+), 0 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..79f3d9c 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,12 @@
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.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.jcdm.main.bs.formulaChild.mapper.BsFormulaChildInfoMapper;
@@ -21,6 +24,9 @@
{
@Autowired
private BsFormulaChildInfoMapper bsFormulaChildInfoMapper;
+
+ @Autowired
+ private DaParamCollectionMapper daParamCollectionMapper;
/**
* 鏌ヨ閰嶆柟閰嶇疆瀛愪俊鎭�
@@ -116,12 +122,26 @@
if(bsFormulaChildInfos.size()>0){
bsFormulaChildInfos.get(0).setResults("OK");
bsFormulaChildInfoMapper.updateBsFormulaChildInfo(bsFormulaChildInfos.get(0));
+ bsFormulaChildInfo.setParamValue(bsFormulaChildInfo.getMaterialCode());
+ bsFormulaChildInfo.setParamCode(bsFormulaChildInfos.get(0).getParamCode());
+ addParameterCollection(bsFormulaChildInfo);
}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());
+ daParamCollectionMapper.insertDaParamCollection(daParamCollection);
+ }
+
@Override
public AjaxResult workpieceRelease(BsFormulaChildInfo bsFormulaChildInfo) {
bsFormulaChildInfoMapper.workpieceRelease(bsFormulaChildInfo);
--
Gitblit v1.9.3