From 687d250bf7f02bebc03e660933a2669fa28d93b5 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 06 八月 2020 15:55:48 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 102 +++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 98 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index 8ccdcaa..2aa80f7 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -1,28 +1,59 @@
package com.zy.asrs.service.impl;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
+import com.core.exception.CoolException;
+import com.zy.asrs.entity.LocMast;
+import com.zy.asrs.entity.WaitPakin;
+import com.zy.asrs.entity.WrkMast;
+import com.zy.asrs.mapper.WaitPakinMapper;
+import com.zy.asrs.mapper.WrkMastMapper;
+import com.zy.asrs.service.LocMastService;
+import com.zy.asrs.service.WrkDetlService;
+import com.zy.common.model.StartupDto;
+import com.zy.core.cache.MessageQueue;
import com.zy.core.cache.SlaveConnection;
import com.zy.core.enums.SlaveType;
import com.zy.core.model.DevpSlave;
+import com.zy.core.model.Task;
import com.zy.core.model.protocol.StaProtocol;
import com.zy.core.properties.SlaveProperties;
import com.zy.core.thread.BarcodeThread;
import com.zy.core.thread.DevpThread;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Date;
+import java.util.List;
+import java.util.stream.Collectors;
/**
* Created by vincent on 2020/8/6
*/
+@Slf4j
@Service("mainService")
public class MainServiceImpl {
@Autowired
+ private CommonService commonService;
+ @Autowired
private SlaveProperties slaveProperties;
+ @Autowired
+ private WrkMastMapper wrkMastMapper;
+ @Autowired
+ private WrkDetlService wrkDetlService;
+ @Autowired
+ private WaitPakinMapper waitPakinMapper;
+ @Autowired
+ private LocMastService locMastService;
+ @Autowired
+ private JdbcTemplate jdbcTemplate;
/**
- * 鍏ュ簱绔欙紝鏍规嵁鏉＄爜鎵弿鐢熸垚鍏ュ簱宸ヤ綔妗ｏ紝宸ヤ綔鐘舵��1
+ * 鍏ュ簱绔欙紝鏍规嵁鏉＄爜鎵弿鐢熸垚鍏ュ簱宸ヤ綔妗ｏ紝宸ヤ綔鐘舵�� 2
*/
@Transactional
public void generateStoreWrkFile() {
@@ -39,16 +70,79 @@
// 鍒ゆ柇鏄惁婊¤冻鍏ュ簱鏉′欢
if (staProtocol.isAutoing() && staProtocol.isLoading() && staProtocol.isInreq1()
&& !staProtocol.isEmptyMk() && staProtocol.isInreq1() && staProtocol.getWorkNO() ==0
- && !Cools.isEmpty(barcode)) {
- // 鐢熸垚宸ヤ綔妗�
+ && staProtocol.isPakMk() && !Cools.isEmpty(barcode)) {
+ // 鍒ゆ柇閲嶅宸ヤ綔妗�
+ WrkMast wrkMast = wrkMastMapper.selectPakInStep1(inSta.getStaNo(), barcode);
+ if (wrkMast != null) {
+ log.warn("宸ヤ綔妗ｄ腑宸插瓨鍦ㄨ绔欑姸鎬佷负1鐨勬暟鎹�,宸ヤ綔鍙�-{}", wrkMast.getWrkNo());
+ continue;
+ }
+ // 鑾峰彇鍏ュ簱閫氱煡妗�
+ List<WaitPakin> waitPakins = waitPakinMapper.selectList(new EntityWrapper<WaitPakin>().eq("barcode", barcode));
+ // 宸ヤ綔鍙�
+ int workNo = commonService.getWorkNo(0);
+ // 妫�绱㈠簱浣�
+ List<String> matNos = waitPakins.stream().map(WaitPakin::getMatnr).distinct().collect(Collectors.toList());
+ StartupDto startupDto = commonService.getLocNo(1, 1, inSta.getStaNo(), matNos);
+ String locNo = startupDto.getLocNo();
+ if (!waitPakins.isEmpty()) {
+ // 鎻掑叆宸ヤ綔鏄庣粏妗�
+ wrkDetlService.createWorkDetail(workNo, waitPakins, barcode);
+ } else {
+ log.warn("鏃犳鍏ュ簱鏉＄爜鏁版嵁---{}", barcode);
+ continue;
+ }
+
+ // 鎻掑叆宸ヤ綔涓绘。
+ wrkMast = new WrkMast();
+ wrkMast.setWrkNo(workNo);
+ wrkMast.setIoTime(new Date());
+ wrkMast.setWrkSts(2L); // 宸ヤ綔鐘舵�侊細2.璁惧涓婅蛋
+ wrkMast.setIoType(1); // 鍏ュ嚭搴撶姸鎬侊細1.鍏ュ簱
+ wrkMast.setIoPri(10D); // 浼樺厛绾э細10
+ wrkMast.setCrnNo(startupDto.getCrnNo());
+ wrkMast.setSourceStaNo(startupDto.getSourceStaNo());
+ wrkMast.setStaNo(startupDto.getStaNo());
+ wrkMast.setLocNo(startupDto.getLocNo());
+ wrkMast.setBarcode(barcode); // 鎵樼洏鐮�
+ wrkMast.setFullPlt("Y"); // 婊℃澘锛歒
+ wrkMast.setPicking("N"); // 鎷ｆ枡
+ wrkMast.setExitMk("N"); // 閫�鍑�
+ wrkMast.setEmptyMk("N"); // 绌烘澘
+ wrkMast.setLinkMis("N");
+// wrkMast.setCtnType(sourceStaNo.getCtnType()); // 瀹瑰櫒绫诲瀷
+ // 鎿嶄綔浜哄憳鏁版嵁
+ wrkMast.setAppeTime(new Date());
+ wrkMast.setModiTime(new Date());
+ Integer insert = wrkMastMapper.insert(wrkMast);
+ if (insert == 0) {
+ throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐�");
+ }
+ // 鏇存柊鐩爣搴撲綅鐘舵��
+ LocMast locMast = locMastService.selectById(startupDto.getLocNo());
+ locMast.setLocSts("S"); // S.鍏ュ簱棰勭害
+ locMast.setModiTime(new Date());
+ if (!locMastService.updateById(locMast)){
+ throw new CoolException("鏀瑰彉搴撲綅鐘舵�佸け璐�");
+ }
+
+ // 鏇存柊绔欑偣淇℃伅 涓� 涓嬪彂plc鍛戒护
+ staProtocol
+ boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task<>(4, staProtocol));
+ if (!result) {
+ throw new CoolException("鏇存柊plc绔欑偣淇℃伅澶辫触");
+ }
}
}
-
}
}
+ public static void main(String[] args) {
+
+ }
+
}
--
Gitblit v1.9.1