From 66e452d698b2fda9d3be730907fb37054f109f5a Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期日, 17 九月 2023 18:37:34 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/service/CommonService.java | 35 ++++++++++++++++++++---------------
1 files changed, 20 insertions(+), 15 deletions(-)
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index 98c7487..6b10fe2 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -88,6 +88,22 @@
return workNo;
}
+ //鎷嗙洏鏈哄绌烘澘鎵爜锛岄┍鍔ㄦ墭鐩樺悜鐮佸灈浣嶏紝涓嶅叆搴�
+ @Transactional
+ public StartupDto getScanBarcodeEmptyBoard(){
+ StartupDto startupDto = new StartupDto();
+ Integer staNo = 0;
+ if (wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("io_type", 201).eq("staNo", 216))<2){
+ staNo=216;
+ }
+ if (wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("io_type", 201).eq("staNo", 220))<2){
+ staNo=220;
+ }
+
+ startupDto.setStaNo(staNo);
+ return startupDto;
+ }
+
/**
* 妫�绱㈠簱浣嶅彿
* @param whsType 绫诲瀷 1:鍙屾繁寮忚揣鏋�
@@ -132,23 +148,9 @@
break;
}
}
- String val = String.valueOf(vo.getValue());
- if (Cools.isEmpty(batch)) {
- batch = val;
- } else {
- int year0 = Integer.parseInt(batch.substring(0, 2));
- int month0 = Integer.parseInt(batch.substring(2, 4));
- int year = Integer.parseInt(val.substring(0, 2));
- int month = Integer.parseInt(val.substring(2, 4));
- if (year <= year0) {
- if (month < month0) {
- batch = val;
- }
- }
- }
}
if (sameMatnr) {
- List<String> locNos = locDetlService.getSameDetlToday2(matnr, batch, sRow, eRow);
+ List<String> locNos = locDetlService.getSameDetlToday(matnr, sRow, eRow);
for (String locNo : locNos) {
if (Utils.isShallowLoc(slaveProperties, locNo)) {
continue;
@@ -291,6 +293,9 @@
locTypeDto.setLocType1((short) 2);
return getLocNo(1, staDescId, sourceStaNo, list, locTypeDto, times);
}
+ if (!sign){
+ throw new CoolException("鐩爣绔�"+staDesc.getCrnStn()+"涓嶅彲鐢�");
+ }
log.error("绯荤粺娌℃湁绌哄簱浣嶏紒锛侊紒 灏哄瑙勬牸锛� {}锛� 杞娆℃暟锛歿}", JSON.toJSONString(locTypeDto), times);
throw new CoolException("娌℃湁绌哄簱浣�");
}
--
Gitblit v1.9.1