From dd7e8e19cf99d0dc85b64b10c192cf3e4c3dafc9 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期五, 08 十二月 2023 13:22:49 +0800
Subject: [PATCH] # 显示器
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 90 ++++++++++++++++-----------------------------
1 files changed, 32 insertions(+), 58 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 62ba267..20a1160 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -1,6 +1,7 @@
package com.zy.asrs.service.impl;
import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
@@ -36,6 +37,8 @@
import java.util.*;
import java.util.stream.Collectors;
+
+import static com.zy.asrs.utils.Utils.isJson;
/**
* 绔嬩綋浠撳簱WCS绯荤粺涓绘祦绋嬩笟鍔�
@@ -639,19 +642,6 @@
&& (staProtocol.getWorkNo() > 0)
&& staProtocol.isPakMk()){
- // 鑾峰彇鏉＄爜鎵弿浠俊鎭�
- 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 wrkMast = wrkMastMapper.selectByWorkNo(staProtocol.getWorkNo().intValue());
if (wrkMast == null) {//鎵句笉鍒板伐浣滄。
continue;
@@ -695,7 +685,7 @@
LocMast locMast = locMastService.selectById(wrkMast.getSourceLocNo());//婧愬簱浣�
SearchLocParam param = new SearchLocParam();
param.setWrkNo(wrkMast.getWrkNo());
- param.setBarcode(barcode);
+ param.setBarcode(wrkMast.getBarcode());
param.setIoType(107);//鐩樼偣
param.setSourceStaNo(wrkMast.getStaNo());
param.setLocType1(locMast.getLocType1());
@@ -730,6 +720,9 @@
News.info(wrkMast.getWrkNo() + "鏇存柊宸ヤ綔妗ｆ暟鎹姸鎬佸け璐�");
continue;
}
+
+ staProtocol.setStaNo(dto.getSourceStaNo().shortValue());//鍐欏叆鐩爣绔�
+ MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
} else if (code == 500){
News.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", wmsUrl + "/rpc/pakin/loc/v1", JSON.toJSONString(param), response);
@@ -2836,52 +2829,16 @@
ledCommand.setSourceLocNo(wrkMast.getSourceLocNo());
ledCommand.setLocNo(wrkMast.getLocNo());
ledCommand.setStaNo(wrkMast.getStaNo());
- if (wrkMast.getIoType() != 110 && wrkMast.getIoType() != 10) {
- //for (WrkDetl wrkDetl : wrkDetls) {
- // LocDetl locDetl = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("zpallet", wrkDetl.getZpallet()).eq("matnr", wrkDetl.getMatnr()));
- //
- // locDetls.forEach(locDetl1 -> {
- // //宸ヤ綔妗ｄ腑瀛樺湪璇ョ墿鏂欏垯璺宠繃
- // String suppCode = "";
- //
- // if (wrkDetl.getMatnr().equals(locDetl1.getMatnr())) {
- // Double anfme = 0D;
- // if (locDetl != null) {
- // anfme = locDetl.getAnfme();
- // }
- // if (wrkDetl.getSuppCode() != null) {
- // suppCode = wrkDetl.getSuppCode();
- // }
- // ledCommand.getMatDtos()
- // .add(new MatDto(wrkDetl.getMatnr()
- // , wrkDetl.getMaktx()
- // , wrkDetl.getAnfme()
- // , (wrkDetl.getAnfme()-anfme)
- // , wrkDetl.getSpecs()
- // , suppCode));
- // } else {
- // if (locDetl1.getSuppCode() != null) {
- // suppCode = locDetl1.getSuppCode();
- // }
- // ledCommand.getMatDtos()
- // .add(new MatDto(locDetl1.getMatnr()
- // , locDetl1.getMaktx()
- // , 0D
- // , locDetl1.getAnfme()
- // , locDetl1.getSpecs()
- // , suppCode));
- // }
- // });
- // //LocDetl locDetl = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("zpallet", wrkDetl.getZpallet()).eq("matnr", wrkDetl.getMatnr()));
- //}
+ if (wrkMast.getIoType() != 110 && wrkMast.getIoType() != 10 && wrkMast.getIoType() != 107) {
List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("loc_no", wrkMast.getSourceLocNo()));
locDetls.forEach(locDetl -> {
- Wrapper<WrkDetl> wrapper = new EntityWrapper<WrkDetl>().eq("matnr", locDetl.getMatnr()).eq("wrk_no",wrkMast.getWrkNo());
- Utils.wapperSetCondition(wrapper,"batch",locDetl.getBatch());
- Utils.wapperSetCondition(wrapper,"three_code",locDetl.getThreeCode());
- Utils.wapperSetCondition(wrapper,"dead_time",locDetl.getDeadTime());
- Utils.wapperSetCondition(wrapper,"supp_code",locDetl.getSuppCode());//鏂欑鐮�
+ Wrapper<WrkDetl> wrapper = new EntityWrapper<WrkDetl>().eq("matnr", locDetl.getMatnr()).eq("wrk_no", wrkMast.getWrkNo());
+ Utils.wapperSetCondition(wrapper, "batch", locDetl.getBatch());
+ 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);
+
if (Cools.isEmpty(detl)) {
String suppCode = "";
if (locDetl.getSuppCode() != null) {
@@ -2890,13 +2847,30 @@
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();
}
- ledCommand.getMatDtos().add(new MatDto(detl.getMatnr(), detl.getMaktx(), detl.getAnfme(), (locDetl.getAnfme() - detl.getAnfme()), detl.getSpecs(), suppCode));
+ 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")));
+ }
+ } catch (Exception e) {
+ ledCommand.getMatDtos().add(new MatDto(detl.getMatnr(), detl.getMaktx(), detl.getAnfme(), (locDetl.getAnfme() - detl.getAnfme()), detl.getSpecs(), suppCode,detl.getOrderNo()));
+ }
}
});
}
+
+ if (wrkMast.getIoType() == 107) {
+ List<WrkDetl> wrkDetls = wrkDetlService.selectList(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkMast.getWrkNo()));
+ wrkDetls.forEach(wrkDetl -> {
+ ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getAnfme(), wrkDetl.getAnfme(), wrkDetl.getSpecs(), wrkDetl.getSuppCode()));
+ });
+ }
+
commands.add(ledCommand);
}
Set<Integer> workNos = wrkMasts.stream().map(WrkMast::getWrkNo).collect(Collectors.toSet());
--
Gitblit v1.9.1