From 4163d0bededbd67bb24439f1f15ae7639008d823 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期三, 06 十二月 2023 21:33:34 +0800
Subject: [PATCH] #盘点修改
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 15 +--------------
1 files changed, 1 insertions(+), 14 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..7212770 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -639,19 +639,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 +682,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());
--
Gitblit v1.9.1