From 67160f099f6b03531c4f337f434bd26dee0750e6 Mon Sep 17 00:00:00 2001
From: admin <15939171744@163.com>
Date: 星期三, 26 三月 2025 18:53:05 +0800
Subject: [PATCH] -
---
billion-main/src/main/java/com/billion/main/da/service/impl/DaMaterialCollectionServiceImpl.java | 65 +++++++++++++++++++++-----------
1 files changed, 42 insertions(+), 23 deletions(-)
diff --git a/billion-main/src/main/java/com/billion/main/da/service/impl/DaMaterialCollectionServiceImpl.java b/billion-main/src/main/java/com/billion/main/da/service/impl/DaMaterialCollectionServiceImpl.java
index 354b3da..66187dd 100644
--- a/billion-main/src/main/java/com/billion/main/da/service/impl/DaMaterialCollectionServiceImpl.java
+++ b/billion-main/src/main/java/com/billion/main/da/service/impl/DaMaterialCollectionServiceImpl.java
@@ -33,8 +33,9 @@
{
@Autowired
private DaMaterialCollectionMapper daMaterialCollectionMapper;
-
+ @Autowired
public IBsBomChildInfoService bsBomChildInfoService;
+ @Autowired
public IOmOrderSchedulingService omOrderSchedulingService;
/**
* 鏌ヨ鐗╂枡閲囬泦
@@ -70,6 +71,7 @@
public void insertDaMaterialCollection(DaMaterialCollection daMaterialCollection)
{
String url = "http://172.40.161.71:8890/Interaction/CollectMT";
+
CollectMT collectMT = new CollectMT();
DaMaterialCollection daMaterialCollection1 = new DaMaterialCollection();
BsBomChildInfo bsBomChildInfo = new BsBomChildInfo();
@@ -79,31 +81,40 @@
daMaterialCollection1.setParamValue(daMaterialCollection.getParamValue());
daMaterialCollection1.setCollectTime(daMaterialCollection.getCollectTime());
omOrderScheduling.setSfcCode(daMaterialCollection.getSfcCode());
- if(Objects.equals(daMaterialCollection.getLocationCode(), "OP130") || Objects.equals(daMaterialCollection.getLocationCode(), "OP020")){
- daMaterialCollection1.setMaterialCode("");
- daMaterialCollection1.setMaterialName(daMaterialCollection.getMaterialName());
- collectMT.setMaterial1(daMaterialCollection1.getParamName());
- }else{
- bsBomChildInfo.setLocationCode(daMaterialCollection.getLocationCode());
- String materialCode = daMaterialCollection.getSfcCode().length() > 9 ? daMaterialCollection.getSfcCode().substring(0, daMaterialCollection.getSfcCode().length() - 9) : daMaterialCollection.getSfcCode();
- bsBomChildInfo.setMaterialCode(materialCode);
- List<BsBomChildInfo> bsBomChildInfoList = bsBomChildInfoService.selectBsBomChildInfoList(bsBomChildInfo);
- daMaterialCollection1.setMaterialCode(bsBomChildInfoList.get(0).getMaterialCode());
- daMaterialCollection1.setMaterialName(bsBomChildInfoList.get(0).getMaterialName());
- collectMT.setMaterial1(bsBomChildInfoList.get(0).getMaterialName());
- }
- if(Objects.equals(daMaterialCollection.getLocationCode(), Constants.PLC1.toString()) ||
- Objects.equals(daMaterialCollection.getLocationCode(), Constants.C005) ||
- Objects.equals(daMaterialCollection.getLocationCode(), Constants.C060))
+ if( Constants.PLC1.contains(daMaterialCollection.getLocationCode()) ||
+ Constants.C005.equals(daMaterialCollection.getLocationCode()) ||
+ Constants.C060.equals(daMaterialCollection.getLocationCode()) )
{omOrderScheduling.setRemarks("Head");}
- else if(Objects.equals(daMaterialCollection.getLocationCode(), Constants.PLC2.toString()) ||
- Objects.equals(daMaterialCollection.getLocationCode(), Constants.OP005) ||
- Objects.equals(daMaterialCollection.getLocationCode(), Constants.OP310))
+ else if(
+ Constants.PLC2.contains(daMaterialCollection.getLocationCode()) ||
+ Constants.OP005.equals(daMaterialCollection.getLocationCode()) ||
+ Constants.OP310.equals(daMaterialCollection.getLocationCode()))
{omOrderScheduling.setRemarks("Body");}
- else if(Objects.equals(daMaterialCollection.getLocationCode(), Constants.P010))
+ else if(Constants.P010.equals(daMaterialCollection.getLocationCode()))
{omOrderScheduling.setRemarks("Pre");}
List<OmOrderScheduling> omOrderSchedulingList = omOrderSchedulingService.selectOmOrderSchedulingList(omOrderScheduling);
- collectMT.setOrderNumber(omOrderSchedulingList.get(0).getWorkOrderNo());
+ String OrderNumber = omOrderSchedulingList.get(0).getWorkOrderNo();
+ //瑕佹敼锛侊紒锛侊紒
+ if(Objects.equals(daMaterialCollection.getLocationCode(), "OP130") || Objects.equals(daMaterialCollection.getLocationCode(), "OP020")){
+ daMaterialCollection1.setMaterialCode("0");
+ daMaterialCollection1.setMaterialName("0");
+ collectMT.setMaterial1("0");
+ }else{
+// bsBomChildInfo.setLocationCode(daMaterialCollection.getLocationCode());
+// bsBomChildInfo.setBomCode(OrderNumber);
+// List<BsBomChildInfo> bsBomChildInfoList = bsBomChildInfoService.selectBsBomChildInfoList(bsBomChildInfo);
+// String MaterialCode = bsBomChildInfoList.get(0).getMaterialCode();
+// String MaterialName = bsBomChildInfoList.get(0).getMaterialName();
+// daMaterialCollection1.setMaterialCode(MaterialCode);
+// daMaterialCollection1.setMaterialName(MaterialName);
+// collectMT.setMaterial1(MaterialName);
+ daMaterialCollection1.setMaterialCode("0");
+ daMaterialCollection1.setMaterialName("0");
+ collectMT.setMaterial1("0");
+ }
+
+ this.save(daMaterialCollection1);
+ collectMT.setOrderNumber(OrderNumber);
collectMT.setEngineNumber(daMaterialCollection.getSfcCode());
collectMT.setStationName(daMaterialCollection.getLocationCode());
collectMT.setPartsNumber(daMaterialCollection.getParamValue());
@@ -116,10 +127,18 @@
// 璁板綍鏃ュ織
log.error("鎺ㄩ�佸け璐�");
}
- this.save(daMaterialCollection1);
// this.save(daMaterialCollection);
}
+
+// @Override
+// public void insertDaMaterialCollectionOP020OP130(DaMaterialCollection DaMaterialCollection)
+// {
+//
+//// this.save(daMaterialCollection);
+// }
+//
+
/**
* 淇敼鐗╂枡閲囬泦
*
--
Gitblit v1.9.3