From a2cd0f560c226d7830c79fa3c0a6cb3db72927b4 Mon Sep 17 00:00:00 2001
From: hdy <1105738590@qq.com>
Date: 星期三, 26 二月 2025 08:25:31 +0800
Subject: [PATCH] 修改
---
billion-main/src/main/java/com/billion/main/plcServer/CustomRunner.java | 96 +++++++++-
billion-main/src/main/java/com/billion/main/om/service/IOmProductionOrderInfoService.java | 10 +
billion-main/src/main/java/com/billion/main/om/domain/OmProductionOrderInfo.java | 2
billion-main/src/main/resources/mapper/om/OmProductionOrderInfoMapper.xml | 55 ++++++
billion-main/src/main/java/com/billion/main/om/mapper/OmProductionOrderInfoMapper.java | 15 +
billion-main/src/main/java/com/billion/main/om/service/impl/OmProductionOrderInfoServiceImpl.java | 30 +++
billion-main/src/main/java/com/billion/main/plcServer/conf/OPCElement.java | 19 ++
billion-main/src/main/java/com/billion/main/constant/Constants.java | 73 ++++++++
billion-main/src/main/java/com/billion/main/plcServer/sub/OPCUaSubscription.java | 223 +++++++++++++++++++++++
9 files changed, 499 insertions(+), 24 deletions(-)
diff --git a/billion-main/src/main/java/com/billion/main/constant/Constants.java b/billion-main/src/main/java/com/billion/main/constant/Constants.java
new file mode 100644
index 0000000..372d88f
--- /dev/null
+++ b/billion-main/src/main/java/com/billion/main/constant/Constants.java
@@ -0,0 +1,73 @@
+package com.billion.main.constant;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class Constants {
+
+ public static final String ONE= "1";
+ public static final String ZERO= "0";
+ public static final String TWO= "2";
+ public static final String RecordData= "RecordData";
+ public static final String WorkOrderRequest= "WorkOrderRequest";
+
+ public static final List<String> PLC = new ArrayList<>();
+
+ public static final String C005= "C005";
+ public static final String C010= "C010";
+ public static final String C020= "C020";
+ public static final String C030= "C030";
+ public static final String C060= "C060";
+ public static final String C070= "C070";
+
+ public static final String P010= "P010";
+ public static final String P020= "P020";
+ public static final String P030= "P030";
+ public static final String OP005= "OP005";
+ public static final String OP010= "OP010";
+ public static final String OP020= "OP020";
+ public static final String OP040= "OP040";
+ public static final String OP045= "OP045";
+ public static final String OP060= "OP060";
+ public static final String OP075= "OP075";
+ public static final String OP080= "OP080";
+ public static final String OP090= "OP090";
+ public static final String OP095= "OP095";
+ public static final String OP100= "OP100";
+ public static final String OP120= "OP120";
+ public static final String OP130= "OP130";
+ public static final String OP145= "OP145";
+ public static final String OP150= "OP150";
+ public static final String OP160= "OP160";
+ public static final String OP165= "OP165";
+ public static final String OP170= "OP170";
+ public static final String OP180= "OP180";
+ public static final String OP190= "OP190";
+ public static final String OP200= "OP200";
+ public static final String OP210= "OP210";
+ public static final String OP220= "OP220";
+ public static final String OP230= "OP230";
+ public static final String OP240= "OP240";
+ public static final String OP250= "OP250";
+ public static final String OP260= "OP260";
+ public static final String OP270= "OP270";
+ public static final String OP275= "OP275";
+ public static final String OP280= "OP280";
+ public static final String OP290= "OP290";
+ public static final String OP295= "OP295";
+ public static final String OP300= "OP300";
+ public static final String OP310= "OP310";
+ public static final String C040= "C040";
+ public static final String OP030= "OP030";
+ public static final String OP050= "OP050";
+ public static final String OP070= "OP070";
+ public static final String OP110= "OP110";
+ public static final String OP140= "OP140";
+
+
+
+
+
+
+
+}
diff --git a/billion-main/src/main/java/com/billion/main/om/domain/OmProductionOrderInfo.java b/billion-main/src/main/java/com/billion/main/om/domain/OmProductionOrderInfo.java
index e7758b7..2c0addc 100644
--- a/billion-main/src/main/java/com/billion/main/om/domain/OmProductionOrderInfo.java
+++ b/billion-main/src/main/java/com/billion/main/om/domain/OmProductionOrderInfo.java
@@ -56,7 +56,7 @@
/** 澶囨敞 */
@Excel(name = "澶囨敞")
- private String remarks;
+ private Long remarks;
/** 鍙戝姩鏈哄瀷鍙� */
@Excel(name = "鍙戝姩鏈哄瀷鍙�")
diff --git a/billion-main/src/main/java/com/billion/main/om/mapper/OmProductionOrderInfoMapper.java b/billion-main/src/main/java/com/billion/main/om/mapper/OmProductionOrderInfoMapper.java
index 00b8ddf..9b27072 100644
--- a/billion-main/src/main/java/com/billion/main/om/mapper/OmProductionOrderInfoMapper.java
+++ b/billion-main/src/main/java/com/billion/main/om/mapper/OmProductionOrderInfoMapper.java
@@ -14,6 +14,19 @@
*/
public interface OmProductionOrderInfoMapper extends BaseMapper<OmProductionOrderInfo>
{
+ // 鏌ヨ order_status 涓� 1 涓� plan_start_time 鏈�鏃╃殑涓�鏉¤褰�
+ public OmProductionOrderInfo selectEarliestOrder();
+ public OmProductionOrderInfo selectEarliestOrder2();
+ public OmProductionOrderInfo getSerialNumber();
+ public OmProductionOrderInfo updateSerialNumber();
+ public OmProductionOrderInfo updateYear();
+ public OmProductionOrderInfo updateOrderStatus5();
+
+ public OmProductionOrderInfo updateOrderStatus2();
+
+
+
+
/**
* 鏌ヨ鐢熶骇宸ュ崟
*
@@ -61,4 +74,6 @@
* @return 缁撴灉
*/
public int deleteOmProductionOrderInfoByIds(Long[] ids);
+
+
}
diff --git a/billion-main/src/main/java/com/billion/main/om/service/IOmProductionOrderInfoService.java b/billion-main/src/main/java/com/billion/main/om/service/IOmProductionOrderInfoService.java
index fba650a..2e7e4f3 100644
--- a/billion-main/src/main/java/com/billion/main/om/service/IOmProductionOrderInfoService.java
+++ b/billion-main/src/main/java/com/billion/main/om/service/IOmProductionOrderInfoService.java
@@ -14,6 +14,16 @@
*/
public interface IOmProductionOrderInfoService extends IService<OmProductionOrderInfo>
{
+ public OmProductionOrderInfo getEarliestOrder();
+ public OmProductionOrderInfo getEarliestOrder2();
+ public OmProductionOrderInfo getSerialNumber();
+ public OmProductionOrderInfo updateSerialNumber();
+ public OmProductionOrderInfo updateYear();
+ public OmProductionOrderInfo updateOrderStatus5();
+ public OmProductionOrderInfo updateOrderStatus2();
+
+
+
/**
* 鏌ヨ鐢熶骇宸ュ崟
*
diff --git a/billion-main/src/main/java/com/billion/main/om/service/impl/OmProductionOrderInfoServiceImpl.java b/billion-main/src/main/java/com/billion/main/om/service/impl/OmProductionOrderInfoServiceImpl.java
index ab8d6cf..36a4102 100644
--- a/billion-main/src/main/java/com/billion/main/om/service/impl/OmProductionOrderInfoServiceImpl.java
+++ b/billion-main/src/main/java/com/billion/main/om/service/impl/OmProductionOrderInfoServiceImpl.java
@@ -27,6 +27,36 @@
@Resource
private OmProductionOrderInfoMapper OmProductionOrderInfoMapper;
+
+ @Override
+ public OmProductionOrderInfo getEarliestOrder()
+ {
+ return OmProductionOrderInfoMapper.selectEarliestOrder();
+ }
+ @Override
+ public OmProductionOrderInfo getEarliestOrder2() {return OmProductionOrderInfoMapper.selectEarliestOrder2();}
+ @Override
+ public OmProductionOrderInfo getSerialNumber()
+ {
+ return OmProductionOrderInfoMapper.getSerialNumber();
+ }
+ @Override
+ public OmProductionOrderInfo updateSerialNumber() {return OmProductionOrderInfoMapper.updateSerialNumber();}
+ @Override
+ public OmProductionOrderInfo updateYear() {return OmProductionOrderInfoMapper.updateYear();}
+ @Override
+ public OmProductionOrderInfo updateOrderStatus5()
+ {
+ return OmProductionOrderInfoMapper.updateOrderStatus5();
+ }
+ @Override
+ public OmProductionOrderInfo updateOrderStatus2()
+ {
+ return OmProductionOrderInfoMapper.updateOrderStatus2();
+ }
+
+
+
/**
* 鏌ヨ鐢熶骇宸ュ崟
*
diff --git a/billion-main/src/main/java/com/billion/main/plcServer/CustomRunner.java b/billion-main/src/main/java/com/billion/main/plcServer/CustomRunner.java
index f184d18..6d08b39 100644
--- a/billion-main/src/main/java/com/billion/main/plcServer/CustomRunner.java
+++ b/billion-main/src/main/java/com/billion/main/plcServer/CustomRunner.java
@@ -1,27 +1,100 @@
package com.billion.main.plcServer;
+import com.billion.main.bs.service.IBsBomChildInfoService;
+import com.billion.main.constant.Constants;
import com.billion.main.da.service.IDaParamCollectionService;
+import com.billion.main.da.service.IDaStationCollectionService;
+import com.billion.main.om.service.IOmOrderSchedulingService;
+import com.billion.main.om.service.IOmProductionOrderInfoService;
import com.billion.main.plcServer.sub.OPCUaSubscription;
import com.kangaroohy.milo.service.MiloService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.ApplicationArguments;
import org.springframework.boot.ApplicationRunner;
+import org.springframework.stereotype.Component;
import java.util.ArrayList;
import java.util.List;
-
+@Component
public class CustomRunner implements ApplicationRunner {
@Autowired
private MiloService miloService;
-
@Autowired
public IDaParamCollectionService daParamCollectionService;
+
+ @Autowired
+ public IDaStationCollectionService daStationCollectionService;
+
+ @Autowired
+ public IOmProductionOrderInfoService omProductionOrderInfoService;
+ @Autowired
+ public IOmOrderSchedulingService omOrderSchedulingService;
+ @Autowired
+ public IBsBomChildInfoService bomChildInfoService;
+
+
@Override
public void run(ApplicationArguments args) throws Exception {
+ //绗笁鏂硅澶�
+ Constants.PLC.add(Constants.C040);
+ Constants.PLC.add(Constants.OP030);
+ Constants.PLC.add(Constants.OP050);
+ Constants.PLC.add(Constants.OP070);
+ Constants.PLC.add(Constants.OP110);
+ Constants.PLC.add(Constants.OP140);
+ //PLC1璁惧
+ Constants.PLC.add(Constants.C010);
+ Constants.PLC.add(Constants.C020);
+ Constants.PLC.add(Constants.C030);
+ Constants.PLC.add(Constants.C060);
+ Constants.PLC.add(Constants.C070);
+ //PLC2璁惧
+ Constants.PLC.add(Constants.P010);
+ Constants.PLC.add(Constants.P020);
+ Constants.PLC.add(Constants.P030);
+ Constants.PLC.add(Constants.OP005);
+ Constants.PLC.add(Constants.OP010);
+ Constants.PLC.add(Constants.OP020);
+ Constants.PLC.add(Constants.OP040);
+ Constants.PLC.add(Constants.OP045);
+ Constants.PLC.add(Constants.OP060);
+ Constants.PLC.add(Constants.OP075);
+ Constants.PLC.add(Constants.OP080);
+ Constants.PLC.add(Constants.OP090);
+ Constants.PLC.add(Constants.OP095);
+ Constants.PLC.add(Constants.OP100);
+ Constants.PLC.add(Constants.OP120);
+ //PLC3璁惧
+ Constants.PLC.add(Constants.OP130);
+ Constants.PLC.add(Constants.OP145);
+ Constants.PLC.add(Constants.OP150);
+ Constants.PLC.add(Constants.OP160);
+ Constants.PLC.add(Constants.OP165);
+ Constants.PLC.add(Constants.OP170);
+ Constants.PLC.add(Constants.OP180);
+ Constants.PLC.add(Constants.OP190);
+ Constants.PLC.add(Constants.OP200);
+ Constants.PLC.add(Constants.OP210);
+ Constants.PLC.add(Constants.OP220);
+ Constants.PLC.add(Constants.OP230);
+ Constants.PLC.add(Constants.OP240);
+ Constants.PLC.add(Constants.OP250);
+ Constants.PLC.add(Constants.OP260);
+ Constants.PLC.add(Constants.OP270);
+ Constants.PLC.add(Constants.OP275);
+ Constants.PLC.add(Constants.OP280);
+ Constants.PLC.add(Constants.OP290);
+ Constants.PLC.add(Constants.OP295);
+ Constants.PLC.add(Constants.OP300);
+ //
OPCUaSubscription OPCUaSubscription = new OPCUaSubscription(miloService,
- daParamCollectionService);
+ daParamCollectionService,
+ daStationCollectionService,
+ omProductionOrderInfoService,
+ omOrderSchedulingService,
+ bomChildInfoService);
List<String> lists = getList();
System.out.println("璁㈤槄鍐呭锛�"+lists);
@@ -31,18 +104,11 @@
public List<String> getList(){
List<String> lists = new ArrayList<>();
- lists.add("CFL4CVT.BCOP010.RecordData");//璇锋眰淇濆瓨
- lists.add("CFL4CVT.BCOP040.RecordData");//璇锋眰淇濆瓨
- lists.add("CFL4CVT.BCOP060.RecordData");//璇锋眰淇濆瓨
- lists.add("CFL4CVT.BCOP100.RecordData");//璇锋眰淇濆瓨
- lists.add("CFL4CVT.BP020.RecordData");//璇锋眰淇濆瓨
- lists.add("CFL4CVT.OP220.RecordData");//璇锋眰淇濆瓨
- lists.add("CFL4CVT.BCOP010.MesRecordDataDone");//璇锋眰淇濆瓨
- lists.add("CFL4CVT.BCOP040.MesRecordDataDone");//璇锋眰淇濆瓨
- lists.add("CFL4CVT.BCOP060.MesRecordDataDone");//璇锋眰淇濆瓨
- lists.add("CFL4CVT.BCOP100.MesRecordDataDone");//璇锋眰淇濆瓨
- lists.add("CFL4CVT.BP020.MesRecordDataDone");//璇锋眰淇濆瓨
- lists.add("CFL4CVT.OP220.MesRecordDataDone");//璇锋眰淇濆瓨
+ lists.add("PLC1.C005.RecordData");//璇锋眰淇濆瓨
+ lists.add("PLC1.C005.WorkOrderRequest");//璇锋眰淇濆瓨
+ lists.add("PLC1.OP010.RecordData");//璇锋眰淇濆瓨
+ lists.add("PLC1.A1.RecordData");//璇锋眰淇濆瓨
+
return lists;
}
}
diff --git a/billion-main/src/main/java/com/billion/main/plcServer/conf/OPCElement.java b/billion-main/src/main/java/com/billion/main/plcServer/conf/OPCElement.java
new file mode 100644
index 0000000..203126c
--- /dev/null
+++ b/billion-main/src/main/java/com/billion/main/plcServer/conf/OPCElement.java
@@ -0,0 +1,19 @@
+package com.billion.main.plcServer.conf;
+
+/**
+ * @ClassName: OPCElement
+ * @Description: PC鍜孭LC閫氫俊浣跨敤鐨凮PCserver涓婄殑鏍囪鍚嶇О鍒楄〃
+ */
+public class OPCElement {
+
+
+ /**
+ * C005
+ */
+
+
+ public static final String PLC1_C005_RecordData = "PLC1.C005.RecordData";//璇锋眰璁板綍鏁版嵁
+ public static final String PLC1_C005_WorkOrderRequest = "PLC1.C005.WorkOrderRequest";//璇锋眰鎷х揣鏁版嵁
+
+
+}
\ No newline at end of file
diff --git a/billion-main/src/main/java/com/billion/main/plcServer/sub/OPCUaSubscription.java b/billion-main/src/main/java/com/billion/main/plcServer/sub/OPCUaSubscription.java
index e2976ca..1ab1bbf 100644
--- a/billion-main/src/main/java/com/billion/main/plcServer/sub/OPCUaSubscription.java
+++ b/billion-main/src/main/java/com/billion/main/plcServer/sub/OPCUaSubscription.java
@@ -1,31 +1,238 @@
package com.billion.main.plcServer.sub;
+import com.billion.main.bs.domain.BsBomChildInfo;
+import com.billion.main.bs.service.IBsBomChildInfoService;
+import com.billion.main.constant.Constants;
import com.billion.main.da.service.IDaParamCollectionService;
+import com.billion.main.da.service.IDaStationCollectionService;
+import com.billion.main.om.domain.OmOrderScheduling;
+import com.billion.main.om.domain.OmProductionOrderInfo;
+import com.billion.main.om.service.IOmOrderSchedulingService;
+import com.billion.main.om.service.IOmProductionOrderInfoService;
+import com.kangaroohy.milo.model.ReadWriteEntity;
import com.kangaroohy.milo.runner.subscription.SubscriptionCallback;
import com.kangaroohy.milo.service.MiloService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.CompletableFuture;
@Slf4j
@Component
public class OPCUaSubscription implements SubscriptionCallback {
public static MiloService miloService;
-
-
public IDaParamCollectionService daParamCollectionService;
-
-
+ public IDaStationCollectionService daStationCollectionService;
+ public IOmProductionOrderInfoService omProductionOrderInfoService;
+ public IOmOrderSchedulingService omOrderSchedulingService;
+ public IBsBomChildInfoService bomChildInfoService;
public OPCUaSubscription(MiloService miloService,
- IDaParamCollectionService daParamCollectionService) {
+ IDaParamCollectionService daParamCollectionService,
+ IDaStationCollectionService daStationCollectionService,
+ IOmProductionOrderInfoService omProductionOrderInfoService,
+ IOmOrderSchedulingService omOrderSchedulingService,
+ IBsBomChildInfoService bomChildInfoService
+ ) {
OPCUaSubscription.miloService = miloService;
this.daParamCollectionService = daParamCollectionService;
-
-
+ this.daStationCollectionService = daStationCollectionService;
+ this.omProductionOrderInfoService = omProductionOrderInfoService;
+ this.omOrderSchedulingService = omOrderSchedulingService;
+ this.bomChildInfoService = bomChildInfoService;
}
-
@Override
public void onSubscribe(String identifier, Object value) {
+ log.info("鍦板潃锛�"+identifier+"鍊硷細"+value);
+ try {
+ if(null != value ) {
+ String[] nodes = identifier.split("[.]");
+ String thoroughfare = nodes[0];//閫氶亾
+ String device = nodes[1];//璁惧
+ String tab = nodes[2];//鏍囪
+ String valueString = value.toString();//鍦板潃鍊�
+ CompletableFuture<Void> cp1 = CompletableFuture.runAsync(() -> {
+ onSubscribe(thoroughfare,device,tab,valueString);
+ plackWorkOrder(thoroughfare,device,tab,valueString);
+ });
+ }
+ } catch (Exception e) {
+ log.error(e.getMessage());
+ }
+ }
+ public void onSubscribe(String thoroughfare,String device,String tab,String valueString) {
+ try {
+ if (Constants.RecordData.equals(tab)){
+ //宸ョ珯浜や簰鍒濆鍖�
+ if (Constants.ZERO.equals(valueString)){
+ miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordDataDone").value("0").build());
+ //璇锋眰杩涚珯
+ } else if (Constants.ONE.equals(valueString)){
+ //棣栧伐绔�
+ if(Constants.C005.equals(device)){
+ miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordDataDone").value("11").build());
+ }
+ //闄ら宸ョ珯鎵�鏈夊伐绔�
+ else if(Constants.PLC.contains(device) && Constants.OP310.contains(device)){
+ //鏍￠獙SFCCode鏄惁瀛樺湪
+ Object SFCCode = miloService.readFromOpcUa(thoroughfare + "." + device + ".SFCCode").getValue();
+ Object PalletID = miloService.readFromOpcUa(thoroughfare + "." + device + ".PalletID").getValue();
+ if (SFCCode == null ) {
+ miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordDataDone").value("23").build());
+ } else {
+ OmOrderScheduling omOrderScheduling = new OmOrderScheduling();
+ omOrderScheduling.setRemarks(PalletID.toString());
+ List<OmOrderScheduling> resultList = omOrderSchedulingService.selectOmOrderSchedulingList(omOrderScheduling);
+ log.info("鏌ヨ缁撴灉鏁伴噺: {}", resultList);
+ BsBomChildInfo bsbomChildInfo= new BsBomChildInfo();
+ bsbomChildInfo.setLocationCode(device);
+ bsbomChildInfo.setBomCode(resultList.get(0).getWorkOrderNo());
+ //涓嬪彂閰嶆柟
+ formula(thoroughfare, device, bsbomChildInfo);
+ miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordDataDone").value("11").build());
+ }
+ }
+ //
+ //
+ //鍑虹珯淇濆瓨鏁版嵁
+ } else if (Constants.TWO.equals(valueString)) {
+ //棣栧姛绔�
+ if(Constants.C005.equals(device)){
+ // 鍒ゆ柇鎺ュ崟鏄惁鎴愬姛
+ OmOrderScheduling omOrderScheduling = new OmOrderScheduling();
+ List<OmOrderScheduling> omOrderSchedulinglist = new ArrayList<>();
+ Object workOrderNumber = miloService.readFromOpcUa(thoroughfare + "." + device + ".WorkOrderNumber").getValue();
+ Object PalletID = miloService.readFromOpcUa(thoroughfare + "." + device + ".PalletID").getValue();
+ Object SFCCode = miloService.readFromOpcUa(thoroughfare + "." + device + ".SFCCode").getValue();
+ //鎵樼洏缁戝畾SFCCode鍜屽伐鍗�
+ omOrderScheduling.setWorkOrderNo(workOrderNumber.toString());
+ omOrderScheduling.setRemarks(PalletID.toString());
+ omOrderScheduling.setSfcCode(SFCCode.toString());
+ omOrderSchedulinglist.add(omOrderScheduling);
+ omOrderSchedulingService.saveBatch(omOrderSchedulinglist);
+ // 缂哄皯淇濆瓨鏁版嵁鐨勬柟娉�
+
+ miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordDataDone").value("21").build());
+ }else if(Constants.PLC.contains(device) && Constants.OP310.contains(device)){
+
+ }
+ }
+ }
+ }
+ catch (Exception e) {
+ log.error(e.getMessage());
+ }
+}
+ //棣栧伐绔欎笅鍙戝伐鍗�,骞剁敓鎴怱N鐮�
+ private static final String[] MONTH = {"A","B","C","D","E","F","G","H","I","J","K","L"};
+ public void plackWorkOrder(String thoroughfare, String device, String tab, String valueString) {
+ try {
+ if (Constants.WorkOrderRequest.equals(tab)) {
+ if (Constants.ZERO.equals(valueString)) {
+ miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".WorkOrderRequestDone").value("0").build());
+ } else if (Constants.ONE.equals(valueString)) {
+ // 鏌ヨ鏁版嵁搴撹幏鍙栫鍚堟潯浠剁殑璁㈠崟淇℃伅
+ OmProductionOrderInfo getEarliestOrder = omProductionOrderInfoService.getEarliestOrder();
+ if (getEarliestOrder != null) {
+ //鍒ゆ柇褰撳墠涓嬪彂鏁伴噺
+ if(getEarliestOrder.getRemarks() >= getEarliestOrder.getPlanQty()){
+ //鏇存柊宸ュ崟鐘舵��
+ omProductionOrderInfoService.updateOrderStatus5();
+ //鏌ヨ鏂版弧瓒崇殑宸ュ崟
+ OmProductionOrderInfo getEarliestOrder2 = omProductionOrderInfoService.getEarliestOrder();
+ if (getEarliestOrder2 != null) {
+ // 灏嗘暟鎹啓鍏ュ埌鍦板潃鍧椾腑
+ miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".WorkOrderNumber").value(getEarliestOrder2.getWorkOrderNo()).build());
+ miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".ProductionPlan").value(String.valueOf(getEarliestOrder2.getPlanQty())).build());
+ miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".EngineType").value(getEarliestOrder2.getEngineType()).build());
+ //鐢熸垚sn鐮�
+ OmProductionOrderInfo serialNumber = omProductionOrderInfoService.getSerialNumber();
+ String A3 = String.valueOf(LocalDateTime.now().getYear()).substring(2);
+ if(A3.equals(String.valueOf(serialNumber.getRemarks()))){
+ String A1 = getEarliestOrder2.getEngineType();//鑾峰彇浜у搧鍨嬪彿
+ String A2 = "3";
+ String A4 = MONTH[LocalDateTime.now().getMonthValue() - 1];// 鑾峰彇褰撳墠鏈堜唤锛�1-12锛�
+ String A5 = String.format("%05d", serialNumber.getPlanQty());
+ String SFCCode = A1 + A2 + A3+ A4 + A5;
+ miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".SFCCode").value(SFCCode).build());
+ omProductionOrderInfoService.updateSerialNumber();
+ }else{
+ OmProductionOrderInfo newNumber = omProductionOrderInfoService.updateYear();
+ String A1 = getEarliestOrder2.getEngineType();//鑾峰彇浜у搧鍨嬪彿
+ String A2 = "3";
+ String A4 = MONTH[LocalDateTime.now().getMonthValue() - 1];// 鑾峰彇褰撳墠鏈堜唤锛�1-12锛�
+ String A5 = String.format("%05d", newNumber.getPlanQty());
+ String SFCCode = A1 + A2 + A3+ A4 + A5;
+ miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".SFCCode").value(SFCCode).build());
+ omProductionOrderInfoService.updateSerialNumber();
+ }
+ // 鏇存柊 WorkOrderRequestDone 鍦板潃鍧�
+ miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".WorkOrderRequestDone").value("11").build());
+ BsBomChildInfo bsbomChildInfo= new BsBomChildInfo();
+ bsbomChildInfo.setLocationCode(device);
+ bsbomChildInfo.setBomCode(getEarliestOrder2.getWorkOrderNo());
+ //鍙戜笅宸ヨ壓閰嶆柟
+ formula(thoroughfare, device, bsbomChildInfo);
+ omProductionOrderInfoService.updateOrderStatus2();
+
+ }
+ } else if (getEarliestOrder.getRemarks() < getEarliestOrder.getPlanQty()) {
+ //鏇存柊宸ュ崟鐘舵��
+ miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".WorkOrderNumber").value(getEarliestOrder.getWorkOrderNo()).build());
+ miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".ProductionPlan").value(String.valueOf(getEarliestOrder.getPlanQty())).build());
+ miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".EngineType").value(getEarliestOrder.getEngineType()).build());
+ //鐢熸垚sn鐮�
+ OmProductionOrderInfo serialNumber = omProductionOrderInfoService.getSerialNumber();
+ String A3 = String.valueOf(LocalDateTime.now().getYear()).substring(2);
+ if(A3.equals(String.valueOf(serialNumber.getRemarks()))){
+ String A1 = getEarliestOrder.getEngineType();//鑾峰彇浜у搧鍨嬪彿
+ String A2 = "3";
+ String A4 = MONTH[LocalDateTime.now().getMonthValue() - 1];// 鑾峰彇褰撳墠鏈堜唤锛�1-12锛�
+ String A5 = String.format("%05d", serialNumber.getPlanQty());
+ String SFCCode = A1 + A2 + A3+ A4 + A5;
+ miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".SFCCode").value(SFCCode).build());
+ omProductionOrderInfoService.updateSerialNumber();
+ }else{
+ OmProductionOrderInfo newNumber = omProductionOrderInfoService.updateYear();
+ String A1 = getEarliestOrder.getEngineType();//鑾峰彇浜у搧鍨嬪彿
+ String A2 = "3";
+ String A4 = MONTH[LocalDateTime.now().getMonthValue() - 1];// 鑾峰彇褰撳墠鏈堜唤锛�1-12锛�
+ String A5 = String.format("%05d", newNumber.getPlanQty());
+ String SFCCode = A1 + A2 + A3+ A4 + A5;
+ miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".SFCCode").value(SFCCode).build());
+ omProductionOrderInfoService.updateSerialNumber();
+ }
+ // 鏇存柊 WorkOrderRequestDone 鍦板潃鍧�
+ miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".WorkOrderRequestDone").value("11").build());
+ BsBomChildInfo bsbomChildInfo= new BsBomChildInfo();
+ bsbomChildInfo.setLocationCode(device);
+ bsbomChildInfo.setBomCode(getEarliestOrder.getWorkOrderNo());
+ //鍙戜笅宸ヨ壓閰嶆柟
+ formula(thoroughfare, device, bsbomChildInfo);
+ omProductionOrderInfoService.updateOrderStatus2();
+ }
+ }
+ }
+ }
+ } catch (Exception e) {
+ log.error(e.getMessage());
}
}
+
+ //鍙戜笅宸ヨ壓閰嶆柟鏂规硶
+ private void formula(String thoroughfare, String device, BsBomChildInfo bsbomChildInfo) throws Exception {
+ List<BsBomChildInfo> bomChildList = bomChildInfoService.selectBsBomChildInfoList(bsbomChildInfo);
+ for (int i = 1; i <= bomChildList.size(); i++) {
+ // 鐢熸垚 MaterialCode 鑺傜偣
+ miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".Material1Code"+ i).value(bomChildList.get(i-1).getMaterialCode()).build());
+ // 鐢熸垚 MaterialNumber 鑺傜偣
+ miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".Material1Number"+ i).value(bomChildList.get(i-1).getCostQty()).build());
+ }
+ }
+
+}
+//
+
diff --git a/billion-main/src/main/resources/mapper/om/OmProductionOrderInfoMapper.xml b/billion-main/src/main/resources/mapper/om/OmProductionOrderInfoMapper.xml
index f70d4b8..25c5522 100644
--- a/billion-main/src/main/resources/mapper/om/OmProductionOrderInfoMapper.xml
+++ b/billion-main/src/main/resources/mapper/om/OmProductionOrderInfoMapper.xml
@@ -26,6 +26,61 @@
select id, work_order_no, sales_order_code, product_code, line_code, plan_qty, plan_start_time, plan_end_time, order_status, create_time, update_time, create_by, update_by, remarks, del_flag from om_production_order_info
</sql>
+ <!-- 鏌ヨ order_status 涓� 1 涓� plan_start_time 鏈�鏃╃殑涓�鏉¤褰� -->
+ <select id="selectEarliestOrder" resultType="OmProductionOrderInfo">
+ SELECT TOP 1 *
+ FROM om_production_order_info
+ WHERE order_status IN (1, 2)
+ ORDER BY plan_start_time ASC
+ </select>
+
+ <select id="selectEarliestOrder2" resultType="OmProductionOrderInfo">
+ SELECT TOP 1 *
+ FROM om_production_order_info
+ WHERE order_status IN (5)
+ ORDER BY plan_start_time ASC
+ </select>
+
+ <select id="updateOrderStatus" resultType="OmProductionOrderInfo">
+ UPDATE om_production_order_info
+ SET order_status = 5
+ WHERE id = (
+ SELECT TOP 1 id
+ FROM om_production_order_info
+ WHERE order_status IN (1, 2)
+ ORDER BY plan_start_time ASC
+ );
+ </select>
+ <select id="updateOrderStatus2" resultType="OmProductionOrderInfo">
+ UPDATE om_production_order_info
+ SET order_status = 2
+ WHERE id = (
+ SELECT TOP 1 id
+ FROM om_production_order_info
+ WHERE order_status IN (1, 2)
+ ORDER BY plan_start_time ASC
+ );
+ </select>
+
+ <select id="getSerialNumber" resultType="OmProductionOrderInfo">
+ SELECT *
+ FROM om_production_order_info
+ WHERE id = 1
+ </select>
+
+ <select id="updateSerialNumber" resultType="OmProductionOrderInfo">
+ UPDATE om_production_order_info
+ SET plan_qty = plan_qty + 1
+ WHERE id = 1;
+ </select>
+ <select id="updateYear" resultType="OmProductionOrderInfo">
+ UPDATE om_production_order_info
+ SET remarks = remarks + 1,
+ qty = 1
+ WHERE id = 1;
+ </select>
+
+
<select id="selectOmProductionOrderInfoList" parameterType="OmProductionOrderInfo" resultMap="OmProductionOrderInfoResult">
<include refid="selectOmProductionOrderInfoVo"/>
<where>
--
Gitblit v1.9.3