From a6884be9732bd7213faaee92f449725d263f66a0 Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期五, 12 十二月 2025 16:59:24 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/LocMastController.java | 8 ++++++++
src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java | 2 ++
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 1 +
src/main/webapp/static/js/common.js | 2 +-
src/main/java/com/zy/asrs/entity/LocMast.java | 6 ++++++
5 files changed, 18 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/LocMastController.java b/src/main/java/com/zy/asrs/controller/LocMastController.java
index 723e3f6..a3df70e 100644
--- a/src/main/java/com/zy/asrs/controller/LocMastController.java
+++ b/src/main/java/com/zy/asrs/controller/LocMastController.java
@@ -13,6 +13,7 @@
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.LocMastInitParam;
+import com.zy.asrs.enums.LocAreaType;
import com.zy.asrs.mapper.LocDetlMapper;
import com.zy.asrs.service.*;
import com.zy.common.entity.Parameter;
@@ -46,6 +47,9 @@
private WrkMastLogService wrkMastLogService;
@Resource
private WrkDetlLogService wrkDetlLogService;
+
+ @Autowired
+ private BasAreasService basAreasService;
@RequestMapping(value = "/locMast/init/pwd")
public R locMastInitPwd(@RequestParam(required = false) String pwd) {
@@ -277,6 +281,8 @@
// @Transactional
public R init(LocMastInitParam param) {
try {
+ BasAreas basAreas = basAreasService
+ .selectOne(new EntityWrapper<BasAreas>().eq("whs_type_id", LocAreaType.LOC_AREA_TYPE_CRN.type));
List<LocMast> list = new ArrayList<>();
BasWhsType basWhsType = basWhsTypeService.selectByIdentifying(param.getIdentifying());
if (Cools.isEmpty(basWhsType)) {
@@ -322,6 +328,8 @@
locMast.setModiUser(getUserId());
locMast.setModiTime(now);
locMast.setWhsType(basWhsType.getId());
+ locMast.setAreaId(basAreas.getId());
+ locMast.setAreaName(basAreas.getName());
list.add(locMast);
}
}
diff --git a/src/main/java/com/zy/asrs/entity/LocMast.java b/src/main/java/com/zy/asrs/entity/LocMast.java
index 7eaa33e..de2ae49 100644
--- a/src/main/java/com/zy/asrs/entity/LocMast.java
+++ b/src/main/java/com/zy/asrs/entity/LocMast.java
@@ -195,6 +195,12 @@
@TableField("frozen_memo")
private String frozenMemo;
+ @TableField("area_id")
+ private Long areaId;
+
+ @TableField("area_name")
+ private String areaName;
+
public String getWhsType$(){
BasWhsTypeService service = SpringUtils.getBean(BasWhsTypeService.class);
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 afefe07..ff99833 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -761,6 +761,7 @@
waitPakin.setZpallet(param.getBarcode()); // 鎵樼洏鐮�
waitPakin.setThreeCode(detlDto.getThreeCode());
waitPakin.setSuppCode(detlDto.getStandby1());
+ waitPakin.setStandby1(detlDto.getStandby1());
waitPakin.setIoStatus("N"); // 鍏ュ嚭鐘舵��
waitPakin.setAnfme(detlDto.getAnfme()); // 鏁伴噺
waitPakin.setStatus("Y"); // 鐘舵��
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 b3c5038..2417e9d 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
@@ -141,6 +141,8 @@
} else {
locDetl = new LocDetl();
locDetl.sync(wrkDetl);
+ locDetl.setAreaId(locMast.getAreaId());
+ locMast.setAreaName(locMast.getAreaName());
locDetl.setLocNo(wrkMast.getLocNo()); // 搴撲綅鍙�
locDetl.setAnfme(wrkDetl.getAnfme()); // 鏁伴噺
locDetl.setZpallet(wrkDetl.getZpallet()); // 鎵樼洏鏉＄爜
diff --git a/src/main/webapp/static/js/common.js b/src/main/webapp/static/js/common.js
index f42a5f1..04b19f5 100644
--- a/src/main/webapp/static/js/common.js
+++ b/src/main/webapp/static/js/common.js
@@ -246,7 +246,7 @@
{field: 'matnr', align: 'center',title: '鍟嗗搧缂栧彿', sort:true}
,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О', sort:true}
,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿', hide: false}
- ,{field: 'suppCode', align: 'center',title: '渚涘簲鍟嗙紪鐮�', hide: false}
+ ,{field: 'standby1', align: 'center',title: '渚涘簲鍟嗙紪鐮�', hide: false}
,{field: 'threeCode', align: 'center',title: 'BS Code', hide: false}
,{field: 'tag$', align: 'center',title: '闆朵欢绫诲瀷', hide: false}
,{field: 'batch', align: 'center',title: '鎵瑰彿', hide: true}
--
Gitblit v1.9.1