From f51e67d7edcc3eb3a324af45e5cf0755b7748fcc Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期二, 12 十二月 2023 08:39:43 +0800
Subject: [PATCH] #盘点修改
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 89 +++++++++++++++++++++++---------------------
1 files changed, 47 insertions(+), 42 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 9a525b5..4cdda60 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -633,10 +633,6 @@
for (DevpSlave devp : slaveProperties.getDevp()) {
// 閬嶅巻鎷ｆ枡鍏ュ簱鍙�
for (DevpSlave.Sta pickSta : devp.getPickInSta()) {
-// if (pickSta.getStaNo() == 325 || pickSta.getStaNo() == 331 || pickSta.getStaNo() == 333 || pickSta.getStaNo() == 339) {
-// continue;
-// }
-
// 鑾峰彇鎷ｆ枡鍏ュ簱绔欎俊鎭�
DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
StaProtocol staProtocol = devpThread.getStation().get(pickSta.getStaNo());
@@ -648,10 +644,33 @@
if (staProtocol.isAutoing()
&& staProtocol.isLoading()
&& staProtocol.isInEnable()
- && (staProtocol.getWorkNo() > 0)
+// && (staProtocol.getWorkNo() > 0)
&& staProtocol.isPakMk()) {
- WrkMast wrkMast = wrkMastMapper.selectByWorkNo(staProtocol.getWorkNo().intValue());
+ WrkMast wrkMast = null;
+ if (pickSta.getStaNo() == 325 || pickSta.getStaNo() == 331 || pickSta.getStaNo() == 333 || pickSta.getStaNo() == 339) {
+ if (staProtocol.getWorkNo() == 0) {
+ continue;
+ }
+ //鏍规嵁宸ヤ綔鍙锋悳绱㈠伐浣滄。
+ wrkMast = wrkMastMapper.selectByWorkNo(staProtocol.getWorkNo().intValue());
+ }else {
+ //鏍规嵁鎵樼洏鐮佹悳绱㈠伐浣滄。
+ // 鑾峰彇鏉＄爜鎵弿浠俊鎭�
+ BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, pickSta.getBarcode());
+ if (barcodeThread == null) {
+ continue;
+ }
+ String barcode = barcodeThread.getBarcode();
+ if (Cools.isEmpty(barcode)) {
+ continue;
+ }
+ if ("NG".endsWith(barcode) || "NoRead".equals(barcode) || "empty".equals(barcode)) {
+ continue;
+ }
+ wrkMast = wrkMastMapper.selectByBarcode(barcode);
+ }
+
if (wrkMast == null) {//鎵句笉鍒板伐浣滄。
continue;
}
@@ -660,28 +679,6 @@
|| Cools.isEmpty(wrkMast.getStaNo()) || Cools.isEmpty(wrkMast.getSourceStaNo())) {
continue;
}
-
- //*********************鍚屽簱浣嶇粍鏍￠獙*********************
- boolean flag = false;
- String th = "";
- List<String> innerLoc = Utils.getGroupInnerLoc(wrkMast.getSourceLocNo());
- for (String loc : innerLoc) {
- LocMast locMast = locMastService.selectById(loc);
- if (locMast == null) {
- continue;
- }
-
- if (!locMast.getLocSts().equals("F")) {
- flag = true;
- th = loc + "搴撲綅瀛樺湪鏈洖搴撲换鍔�";
- break;
- }
- }
- if (flag) {
- News.info(th);
- continue;
- }
- //*********************鍚屽簱浣嶇粍鏍￠獙*********************
// 淇濆瓨宸ヤ綔涓绘。鍘嗗彶妗�
if (wrkMastMapper.saveWrkMastLog(wrkMast.getWrkNo()) == 0) {
@@ -696,7 +693,7 @@
param.setWrkNo(wrkMast.getWrkNo());
param.setBarcode(wrkMast.getBarcode());
param.setIoType(107);//鐩樼偣
- param.setSourceStaNo(wrkMast.getStaNo());
+ param.setSourceStaNo(pickSta.getStaNo());
param.setLocType1(locMast.getLocType1());
String response = new HttpHandler.Builder()
.setUri(wmsUrl)
@@ -1301,6 +1298,15 @@
if (!(liftStaProtocol.getModel() && !liftStaProtocol.getBusy() && !liftStaProtocol.getHasTray())) {
News.info("{}浠诲姟锛寋}鍐呴儴杈撻�佺珯锛屼笉婊¤冻鑷姩銆佺┖闂层�佹棤鎵樼洏鐘舵��", wrkMast.getWrkNo(), liftStaProtocol.getStaNo());
return false;//绔欑偣蹇呴』鑷姩銆佺┖闂层�佹病鏈夋墭鐩�
+ }
+
+ if (wrkMast.getStaNo() == 300) {
+ //鍑�300绔欙紝妫�娴�300绔欎换鍔℃暟閲�
+ List<WrkMast> wrkMasts = wrkMastMapper.select300Wrk();
+ if (wrkMasts.size() >= 4) {
+ News.info("{}浠诲姟锛岃緭閫佺嚎浠诲姟杩囪浇{}", wrkMast.getWrkNo(), wrkMasts.size());
+ return false;
+ }
}
if (wrkMast.getShuttleNo() == null) {//娌℃湁缁戝畾灏忚溅锛岃繘琛岃皟搴�
@@ -2923,8 +2929,7 @@
Utils.wapperSetCondition(wrapper, "three_code", locDetl.getThreeCode());
Utils.wapperSetCondition(wrapper, "dead_time", locDetl.getDeadTime());
Utils.wapperSetCondition(wrapper, "supp_code", locDetl.getSuppCode());//鏂欑鐮�
- WrkDetl detl = wrkDetlService.selectOne(wrapper);
-
+ List<WrkDetl> detl = wrkDetlService.selectList(wrapper);
if (Cools.isEmpty(detl)) {
String suppCode = "";
if (locDetl.getSuppCode() != null) {
@@ -2932,21 +2937,21 @@
}
ledCommand.getMatDtos().add(new MatDto(locDetl.getMatnr(), locDetl.getMaktx(), 0D, locDetl.getAnfme(), locDetl.getSpecs(), suppCode));
} else {
- String suppCode = "";
- String orderNo = detl.getOrderNo();
- if (detl.getSuppCode() != null) {
- suppCode = detl.getSuppCode();
+ //鍑哄簱鏁伴噺绱
+ Double conut = 0.0;
+ for (WrkDetl wrkDetl : detl) {
+ conut = conut + wrkDetl.getAnfme();
}
- try {
- JSONArray orders = JSON.parseArray(orderNo);
- for (Object order : orders) {
- JSONObject order1 = (JSONObject) order;
- ledCommand.getMatDtos().add(new MatDto(detl.getMatnr(), detl.getMaktx(), (Double) order1.get("anfme"), (locDetl.getAnfme() - detl.getAnfme()), detl.getSpecs(), suppCode,(String) order1.get("orderNo")));
+
+ for (WrkDetl wrkDetl : detl) {
+ String suppCode = "";
+ if (wrkDetl.getSuppCode() != null) {
+ suppCode = wrkDetl.getSuppCode();
}
- } catch (Exception e) {
- ledCommand.getMatDtos().add(new MatDto(detl.getMatnr(), detl.getMaktx(), detl.getAnfme(), (locDetl.getAnfme() - detl.getAnfme()), detl.getSpecs(), suppCode,detl.getOrderNo()));
+ ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getAnfme(), (locDetl.getAnfme() - conut), wrkDetl.getSpecs(), suppCode, wrkDetl.getOrderNo()));
}
}
+
});
if (locDetls.isEmpty()) {
--
Gitblit v1.9.1