From 59e2283a10aee45e6a98e34b432ba345095116db Mon Sep 17 00:00:00 2001
From: wujian <14790700720@163.com>
Date: 星期三, 10 七月 2024 16:36:42 +0800
Subject: [PATCH] add 选瓦
---
jcdm-main/src/main/java/com/jcdm/main/bs/orderScheduling/controller/BsOrderSchedulingController.java | 37 +++++++++++++++++++++++++++++--------
1 files changed, 29 insertions(+), 8 deletions(-)
diff --git a/jcdm-main/src/main/java/com/jcdm/main/bs/orderScheduling/controller/BsOrderSchedulingController.java b/jcdm-main/src/main/java/com/jcdm/main/bs/orderScheduling/controller/BsOrderSchedulingController.java
index db9c038..4fe09fa 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/bs/orderScheduling/controller/BsOrderSchedulingController.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/bs/orderScheduling/controller/BsOrderSchedulingController.java
@@ -1,6 +1,7 @@
package com.jcdm.main.bs.orderScheduling.controller;
import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.StrUtil;
import com.alibaba.excel.EasyExcel;
import com.alibaba.excel.ExcelWriter;
import com.alibaba.excel.write.metadata.WriteSheet;
@@ -12,7 +13,6 @@
import com.jcdm.common.core.domain.entity.SysDictData;
import com.jcdm.common.core.page.TableDataInfo;
import com.jcdm.common.enums.BusinessType;
-import com.jcdm.common.utils.SecurityUtils;
import com.jcdm.common.utils.StringUtils;
import com.jcdm.common.utils.poi.ExcelUtil;
import com.jcdm.main.bs.orderScheduling.common.Constants;
@@ -23,8 +23,9 @@
import com.jcdm.main.bs.orderScheduling.vo.SumDataVO;
import com.jcdm.main.da.paramCollection.domain.DaParamCollection;
import com.jcdm.main.da.paramCollection.mapper.DaParamCollectionMapper;
-import com.jcdm.main.da.paramCollection.service.IDaParamCollectionService;
import com.jcdm.main.da.passingStationCollection.domain.DaPassingStationCollection;
+import com.jcdm.main.da.passingStationCollection.domain.ProductNewPassStation;
+import com.jcdm.main.da.passingStationCollection.service.ProductNewPassStationService;
import com.jcdm.main.da.tileMatchCollection.domain.DaTileMatchCollection;
import com.jcdm.main.da.tileMatchCollection.service.IDaTileMatchCollectionService;
import com.jcdm.main.om.productionOrde.domain.OmProductionOrdeInfo;
@@ -43,9 +44,10 @@
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
-import java.time.LocalDateTime;
import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
+import java.util.UUID;
import java.util.stream.Collectors;
/**
@@ -71,6 +73,8 @@
private DaParamCollectionMapper daParamCollectionService;
@Resource
private IDaTileMatchCollectionService daTileMatchCollectionService;
+ @Resource
+ private ProductNewPassStationService productNewPassStationService;
@Autowired
MiloService miloService;
@@ -315,7 +319,6 @@
BsOrderScheduling bsOrderScheduling = new BsOrderScheduling();
bsOrderScheduling.setOrderNo(orderNo);
- //bsOrderScheduling.setProductionStatus("1");
List<BsOrderScheduling> allList = bsOrderSchedulingService.selectBsOrderSchedulingList(bsOrderScheduling);
List<BsOrderScheduling> dlist = allList.stream().filter(x->x.getProductionStatus().equals(Constants.WAIT_PRODUCTION)).collect(Collectors.toList());
List<BsOrderScheduling> collect = allList.stream().filter(x -> x.getProductionStatus().equals(Constants.ORDER_STATUS_ING)
@@ -325,7 +328,7 @@
DaParamCollection daParamCollection = new DaParamCollection();
daParamCollection.setParamValue(engineNo);
- daParamCollection.setSfcCode("OP010");
+ daParamCollection.setLocationCode("OP010");
List<DaParamCollection> list = daParamCollectionService.selectDaParamCollectionList(daParamCollection);
if (CollUtil.isNotEmpty(list)){
return R.ok(500,"宸插瓨鍦ㄦ绠变綋鐮侊紝璇峰嬁閲嶅鎵弿");
@@ -358,6 +361,25 @@
MatchCollection.setParamName("绠变綋");
daTileMatchCollectionService.insertDaTileMatchCollection(MatchCollection);
+ if (StrUtil.isNotBlank(OrderScheduling.getEngineNo())){
+ String snCode = OrderScheduling.getEngineNo();
+ if (snCode.startsWith("280") || snCode.startsWith("380")){
+ ProductNewPassStation productNewPassStation = new ProductNewPassStation();
+ UUID uuid = UUID.randomUUID();
+ productNewPassStation.setId(uuid.getMostSignificantBits());
+ productNewPassStation.setFinishFlag("0");
+ productNewPassStation.setSfcCode(OrderScheduling.getEngineNo());
+ productNewPassStation.setCreateTime(new Date());
+ productNewPassStation.setBoxCode(engineNo);
+ if (snCode.startsWith("280")){
+ productNewPassStation.setProductType("280");
+ } else {
+ productNewPassStation.setProductType("380");
+ }
+ productNewPassStationService.insertPassStation(productNewPassStation);
+ }
+ }
+
//鏇存柊涓婄嚎鏁伴噺
int onlineNum = 0;
List<BsOrderScheduling> onlineNumList = bsOrderSchedulingService.selectBsOrderSchedulingList(bsOrderScheduling)
@@ -377,10 +399,9 @@
}
//OPC鎿嶄綔
- ReadWriteEntity entity = new ReadWriteEntity("CFL4HX.HOP010.Code", OrderScheduling.getEngineNo());
+ ReadWriteEntity entity = new ReadWriteEntity("CFL4HX.OP010.Code", OrderScheduling.getEngineNo());
OPCUaSubscription.miloService.writeToOpcUa(entity);//鍐橲N
- ReadWriteEntity entity2 = new ReadWriteEntity("CFL4HX.HOP010.SNDoor", 1);
- OPCUaSubscription.miloService.writeToOpcByte(entity2);//鍐欏畬鎴�
+
OrderScheduling.setProductionStatus("2");
bsOrderSchedulingService.updateBsOrderScheduling(OrderScheduling);
--
Gitblit v1.9.3