From 7a08677172276853ea984a26b76bae0e88ab00ed Mon Sep 17 00:00:00 2001
From: admin <15939171744@163.com>
Date: 星期六, 27 四月 2024 09:18:33 +0800
Subject: [PATCH] -
---
jcdm-main/src/main/java/com/jcdm/main/bs/formulaChild/service/impl/BsFormulaChildInfoServiceImpl.java | 18 ++++++++++--------
1 files changed, 10 insertions(+), 8 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 91899ee..9fea30c 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,5 +1,6 @@
package com.jcdm.main.bs.formulaChild.service.impl;
+import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Map;
@@ -152,17 +153,18 @@
@Override
public AjaxResult updateResults(BsFormulaChildInfo bsFormulaChildInfo) {
String result = "";
-// BsFormulaChildInfo checkInfo = new BsFormulaChildInfo();
-// checkInfo.setProcessesCode(bsFormulaChildInfo.getLocationCode());
-// checkInfo.setProductCode(bsFormulaChildInfo.getProductCode());
-//// checkInfo.setMaterialCode(bsFormulaChildInfo.getScanBarcode());
-// bsFormulaChildInfo.setMaterialCode(bsFormulaChildInfo.getScanBarcode().substring(1,2));
-// List<BsFormulaChildInfo> bsFormulaChildInfos = bsFormulaChildInfoMapper.selectBsFormulaChildInfoList(checkInfo);
- List<BsFormulaChildInfo> bsFormulaChildInfos = bsFormulaChildInfoService.list(new LambdaQueryWrapper<BsFormulaChildInfo>()
+ List<BsFormulaChildInfo> bsFormulaChildInfos = new ArrayList<>();
+ List<BsFormulaChildInfo> infos = bsFormulaChildInfoService.list(new LambdaQueryWrapper<BsFormulaChildInfo>()
.eq(BsFormulaChildInfo::getProcessesCode, bsFormulaChildInfo.getLocationCode())
.eq(BsFormulaChildInfo::getProductCode, bsFormulaChildInfo.getProductCode())
- .eq(BsFormulaChildInfo::getMaterialCode, bsFormulaChildInfo.getScanBarcode().substring(1, 2))
+ .eq(BsFormulaChildInfo::getOperationType, "2")
);
+ for (BsFormulaChildInfo formulaChildInfo : infos) {
+ if(bsFormulaChildInfo.getScanBarcode().contains(formulaChildInfo.getMaterialCode())){
+ bsFormulaChildInfos.add(formulaChildInfo);
+ break;
+ }
+ }
if(bsFormulaChildInfos.size()>0){
String spareField4 = bsFormulaChildInfos.get(0).getSpareField4();
bsFormulaChildInfos.get(0).setCollectData(bsFormulaChildInfo.getScanBarcode());
--
Gitblit v1.9.3