From 6e4800067e490984f8ec6284956241b90b28af9e Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期五, 12 十二月 2025 15:57:10 +0800
Subject: [PATCH] no message
---
src/main/webapp/static/js/waitPakin/waitPakin.js | 2 +-
src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java | 2 +-
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 4 +++-
3 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
index e03869e..a23997d 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -1332,10 +1332,12 @@
@Override
@Transactional(rollbackFor = Exception.class)
public R OutCallAgv(AgvCallParams params, Long userId) {
+ BasAreas basAreas = basAreasService.selectOne(new EntityWrapper<BasAreas>().eq("whs_type_id", LocAreaType.LOC_AREA_TYPE_IN_CACHE.type));
/**鑾峰彇鍏ュ簱鏈�鏃╃殑涓�鏉℃暟鎹�**/
List<LocCache> locCaches = locCacheService.selectList(new EntityWrapper<LocCache>()
.eq("loc_sts", LocStsType.LOC_STS_TYPE_F.type)
+ .eq("area_id", basAreas.getId())
.eq("frozen", 0)
.orderDesc(Arrays.asList("sort", "first_time")));
@@ -1345,7 +1347,7 @@
for (LocCache locCache : locCaches) {
//鑾峰彇缂撳瓨鍖轰俊鎭�
- BasAreas basAreas = basAreasService.selectOne(new EntityWrapper<BasAreas>().eq("whs_type_id", LocAreaType.LOC_AREA_TYPE_IN_CACHE.type));
+// BasAreas basAreas = basAreasService.selectOne(new EntityWrapper<BasAreas>().eq("whs_type_id", LocAreaType.LOC_AREA_TYPE_IN_CACHE.type));
if (Objects.isNull(basAreas)) {
throw new CoolException("搴撳尯涓嶅瓨鍦紒锛�");
}
diff --git a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
index ad95a82..b3c5038 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
@@ -868,6 +868,7 @@
detl.setBarcode(pakin.getBarcode());
detl.setAnfme(pakin.getAnfme());
detl.setBrand(pakin.getBrand());
+ detl.setSuppCode(pakin.getSuppCode());
detl.setAppeTime(new Date());
detl.setSpecs(pakin.getSpecs());
detl.setColor(pakin.getColor());
@@ -921,7 +922,6 @@
+ wrkMast.getLocNo() + "]");
}
for (TaskDetl wrkDetl : wrkDetls53) {
-
LocDetl locDetl = locDetlService.selectItem(locCache.getLocNo(), wrkDetl.getMatnr(),
wrkDetl.getBatch(), wrkDetl.getBrand(), wrkDetl.getStandby1(), wrkDetl.getStandby2(),
wrkDetl.getStandby3(), wrkDetl.getBoxType1(), wrkDetl.getBoxType2(),
diff --git a/src/main/webapp/static/js/waitPakin/waitPakin.js b/src/main/webapp/static/js/waitPakin/waitPakin.js
index f7e2119..72eee87 100644
--- a/src/main/webapp/static/js/waitPakin/waitPakin.js
+++ b/src/main/webapp/static/js/waitPakin/waitPakin.js
@@ -5,7 +5,7 @@
{field: 'type$', align: 'center', title: '缁勬墭绫诲瀷'}
];
cols.push.apply(cols, detlCols);
- cols.push({field: 'locNo', align: 'center', title: '搴撲綅鍙�'}
+ cols.push({field: 'locNo', align: 'center', title: '搴撲綅鍙�', hide: true}
, {
field: 'status', align: 'center', title: '鏁版嵁鐘舵��', templet: function (row) {
var html = "<input value='status' type='checkbox' lay-skin='switch' lay-text='姝ｅ父|閿佸畾'' lay-filter='tableCheckbox' disabled='disabled' table-index='" + row.LAY_TABLE_INDEX + "'";
--
Gitblit v1.9.1