From 43f0656796951d08f4187a1597939fad66011223 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期四, 28 十二月 2023 16:43:52 +0800
Subject: [PATCH] #
---
zy-asrs-wms/src/main/webapp/views/staDesc/staDesc.html | 4 +-
zy-asrs-common/src/main/java/com/zy/asrs/common/domain/entity/StaDesc.java | 20 +++++-----
zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/CommonService.java | 18 ++------
zy-asrs-wms/src/main/webapp/views/staDesc/staDesc_detail.html | 4 +-
zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/WorkServiceImpl.java | 44 +++++++++-------------
zy-asrs-wms/src/main/webapp/static/js/staDesc/staDesc.js | 4 +-
6 files changed, 39 insertions(+), 55 deletions(-)
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/domain/entity/StaDesc.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/domain/entity/StaDesc.java
index 0d3ce27..3c328bb 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/domain/entity/StaDesc.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/domain/entity/StaDesc.java
@@ -64,15 +64,15 @@
/**
* 鍫嗗灈鏈哄彿
*/
- @ApiModelProperty(value= "鍫嗗灈鏈哄彿")
- @TableField("crn_no")
- private Integer crnNo;
+ @ApiModelProperty(value= "璁惧鍙�")
+ @TableField("device_no")
+ private Integer deviceNo;
/**
* 鍫嗗灈鏈虹珯鐐�
*/
- @ApiModelProperty(value= "鍫嗗灈鏈虹珯鐐�")
- private Integer crnStn;
+ @ApiModelProperty(value= "璁惧绔欑偣")
+ private Integer deviceStn;
/**
* 澶囨敞
@@ -114,13 +114,13 @@
public StaDesc() {}
- public StaDesc(Integer typeNo,String typeDesc,Integer stnNo,String stnDesc,Integer crnNo,Integer crnStn,String memo,Long modiUser,Date modiTime,Long appeUser,Date appeTime,Long hostId) {
+ public StaDesc(Integer typeNo,String typeDesc,Integer stnNo,String stnDesc,Integer deviceNo,Integer deviceStn,String memo,Long modiUser,Date modiTime,Long appeUser,Date appeTime,Long hostId) {
this.typeNo = typeNo;
this.typeDesc = typeDesc;
this.stnNo = stnNo;
this.stnDesc = stnDesc;
- this.crnNo = crnNo;
- this.crnStn = crnStn;
+ this.deviceNo = deviceNo;
+ this.deviceStn = deviceStn;
this.memo = memo;
this.modiUser = modiUser;
this.modiTime = modiTime;
@@ -162,9 +162,9 @@
return null;
}
- public String getCrnStn$(){
+ public String getDeviceStn$(){
BasDevpService service = SpringUtils.getBean(BasDevpService.class);
- BasDevp basDevp = service.getById(this.crnStn);
+ BasDevp basDevp = service.getById(this.deviceStn);
if (!Cools.isEmpty(basDevp)){
return String.valueOf(basDevp.getDevNo());
}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/CommonService.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/CommonService.java
index be60526..9007a55 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/CommonService.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/CommonService.java
@@ -80,15 +80,9 @@
/**
* 妫�绱㈠簱浣嶅彿
- *
- * @param whsType 绫诲瀷 1:鍙屾繁寮忚揣鏋�
- * @param staDescId 璺緞ID
- * @param sourceStaNo 婧愮珯
- * @param matnr 鐗╂枡鍙烽泦鍚�
- * @return locNo 妫�绱㈠埌鐨勫簱浣嶅彿
*/
@Transactional
- public StartupDto getLocNo(Integer whsType, Integer staDescId, Integer sourceStaNo, Integer moveCrnNo, LocTypeDto locTypeDto, int times) {
+ public StartupDto getLocNo(Integer staDescId, Integer sourceStaNo, Integer moveCrnNo, LocTypeDto locTypeDto, int times) {
// 鐩爣搴撲綅
LocMast locMast = null;
@@ -228,7 +222,7 @@
List<LocMast> locMasts = locMastService.list(new LambdaQueryWrapper<LocMast>()
.eq(LocMast::getLocSts, "O")
.eq(LocMast::getLocType1, 1)
- .eq(LocMast::getCrnNo, staDesc.getCrnNo())
+ .eq(LocMast::getCrnNo, staDesc.getDeviceNo())
.orderByAsc(LocMast::getLev1, LocMast::getBay1, LocMast::getRow1));
if (!locMasts.isEmpty()) {
for (LocMast loc : locMasts) {
@@ -281,8 +275,7 @@
// 鑾峰彇鐩爣绔�
LambdaQueryWrapper<StaDesc> wrapper = new LambdaQueryWrapper<StaDesc>()
.eq(StaDesc::getTypeNo, staDescId)
- .eq(StaDesc::getStnNo, sourceStaNo)
- .eq(StaDesc::getCrnNo,locMast.getCrnNo());
+ .eq(StaDesc::getStnNo, sourceStaNo);
StaDesc staDesc = staDescService.getOne(wrapper);
if (Cools.isEmpty(staDesc)) {
log.error("鍏ュ簱璺緞涓嶅瓨鍦�, staDescId={}, sourceStaNo={}", staDescId, sourceStaNo);
@@ -290,9 +283,9 @@
}
// 妫�娴嬬洰鏍囩珯
- BasDevp staNo = basDevpService.getById(staDesc.getCrnStn());
+ BasDevp staNo = basDevpService.getById(staDesc.getDeviceNo());
if (!staNo.getAutoing().equals("Y")) {
- throw new CoolException("鐩爣绔�" + staDesc.getCrnStn() + "涓嶅彲鐢�");
+ throw new CoolException("鐩爣绔�" + staDesc.getDeviceNo() + "涓嶅彲鐢�");
}
// 鐢熸垚宸ヤ綔鍙�
@@ -302,7 +295,6 @@
startupDto.setSourceStaNo(sourceStaNo);
startupDto.setStaNo(staNo.getDevNo());
startupDto.setLocNo(locMast.getLocNo());
- startupDto.setCrnNo(staDesc.getCrnNo());
return startupDto;
}
}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/WorkServiceImpl.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/WorkServiceImpl.java
index 065014c..0a57a7f 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/WorkServiceImpl.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/WorkServiceImpl.java
@@ -28,9 +28,6 @@
@Service
public class WorkServiceImpl implements WorkService {
- // 搴撲綅鎺掑彿鍒嗛厤榛樿绫诲埆
- private static final int DEFAULT_ROW_NO_TYPE = 1;
-
@Autowired
private BasDevpService basDevpService;
@Autowired
@@ -50,35 +47,30 @@
throw new CoolException(BaseRes.PARAM);
}
Date now = new Date();
-// // 婧愮珯鐐圭姸鎬佹娴�
-// BasDevp sourceStaNo = basDevpService.checkSiteStatus(param.getDevpNo(), true);
-// // 妫�绱㈠簱浣�
-// LocTypeDto locTypeDto = new LocTypeDto(sourceStaNo);
LocTypeDto locTypeDto = new LocTypeDto();
- StartupDto dto = commonService.getLocNo(DEFAULT_ROW_NO_TYPE, 1, param.getDevpNo(), null, locTypeDto, 0);
+ StartupDto dto = commonService.getLocNo(1, param.getDevpNo(), null, locTypeDto, 0);
// 鐢熸垚宸ヤ綔鍙�
int workNo = dto.getWorkNo();
// 鐢熸垚宸ヤ綔妗�
WrkMast wrkMast = new WrkMast();
wrkMast.setWrkNo(workNo);
- wrkMast.setIoTime(new Date());
-// wrkMast.setWrkSts(1L); // 宸ヤ綔鐘舵�侊細鐢熸垚鍏ュ簱ID
-// wrkMast.setIoType(1); // 鍏ュ嚭搴撶姸鎬侊細1.鍏ュ簱
-// wrkMast.setIoPri(13D); // 浼樺厛绾э細13
-// wrkMast.setCrnNo(dto.getCrnNo());
-// wrkMast.setSourceStaNo(dto.getSourceStaNo());
-// wrkMast.setStaNo(dto.getStaNo());
-// wrkMast.setLocNo(dto.getLocNo());
-// wrkMast.setBarcode(param.getBarcode()); // 鎵樼洏鐮�
-// wrkMast.setFullPlt("Y"); // 婊℃澘锛歒
-// wrkMast.setPicking("N"); // 鎷ｆ枡
-// wrkMast.setExitMk("N"); // 閫�鍑�
-// wrkMast.setEmptyMk("N"); // 绌烘澘
-// wrkMast.setCtnType(sourceStaNo.getCtnType()); // 瀹瑰櫒绫诲瀷
-// wrkMast.setAppeUser(String.valueOf(userId));
-// wrkMast.setAppeTime(now);
-// wrkMast.setModiUser(String.valueOf(userId));
-// wrkMast.setModiTime(now);
+ wrkMast.setIoTime(now);
+ wrkMast.setWrkSts(1L); // 宸ヤ綔鐘舵�侊細鐢熸垚鍏ュ簱
+ wrkMast.setIoType(1); // 鍏ュ嚭搴撶姸鎬侊細1.鍏ュ簱
+ wrkMast.setIoPri(13D); // 浼樺厛绾э細13
+ wrkMast.setCrnNo(dto.getCrnNo());
+ wrkMast.setSourceStaNo(dto.getSourceStaNo());
+ wrkMast.setStaNo(dto.getStaNo());
+ wrkMast.setLocNo(dto.getLocNo());
+ wrkMast.setBarcode(param.getBarcode()); // 鎵樼洏鐮�
+ wrkMast.setFullPlt("Y"); // 婊℃澘锛歒
+ wrkMast.setPicking("N"); // 鎷ｆ枡
+ wrkMast.setExitMk("N"); // 閫�鍑�
+ wrkMast.setEmptyMk("N"); // 绌烘澘
+ wrkMast.setAppeUser(String.valueOf(userId));
+ wrkMast.setAppeTime(now);
+ wrkMast.setModiUser(String.valueOf(userId));
+ wrkMast.setModiTime(now);
wrkMast.setHostId(hostId);
if (!wrkMastService.save(wrkMast)) {
throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐�");
diff --git a/zy-asrs-wms/src/main/webapp/static/js/staDesc/staDesc.js b/zy-asrs-wms/src/main/webapp/static/js/staDesc/staDesc.js
index 799fd51..bd867fe 100644
--- a/zy-asrs-wms/src/main/webapp/static/js/staDesc/staDesc.js
+++ b/zy-asrs-wms/src/main/webapp/static/js/staDesc/staDesc.js
@@ -25,8 +25,8 @@
// ,{field: 'typeDesc', align: 'center',title: '浣滀笟绫诲瀷'}
,{field: 'stnNo$', align: 'center',title: '浣滀笟绔欑偣'}
,{field: 'stnDesc', align: 'center',title: '绔欑偣鍚嶇О', edit:'text'}
- ,{field: 'crnNo', align: 'center',title: '鍫嗗灈鏈哄彿'}
- ,{field: 'crnStn$', align: 'center',title: '鍫嗗灈鏈虹珯鐐�'}
+ ,{field: 'deviceNo', align: 'center',title: '璁惧鍙�'}
+ ,{field: 'deviceStn$', align: 'center',title: '璁惧绔欑偣'}
,{field: 'memo', align: 'center',title: '澶囨敞'}
,{field: 'modiUser$', align: 'center',title: '淇敼浜哄憳', hide:true}
,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿', hide:true}
diff --git a/zy-asrs-wms/src/main/webapp/views/staDesc/staDesc.html b/zy-asrs-wms/src/main/webapp/views/staDesc/staDesc.html
index 52d7dbf..8a8e8f3 100644
--- a/zy-asrs-wms/src/main/webapp/views/staDesc/staDesc.html
+++ b/zy-asrs-wms/src/main/webapp/views/staDesc/staDesc.html
@@ -32,12 +32,12 @@
</div>
<div class="layui-inline">
<div class="layui-input-inline">
- <input class="layui-input" type="text" name="crn_no" placeholder="鍫嗗灈鏈哄彿" autocomplete="off">
+ <input class="layui-input" type="text" name="crn_no" placeholder="璁惧鍙�" autocomplete="off">
</div>
</div>
<div class="layui-inline">
<div class="layui-input-inline">
- <input class="layui-input" type="text" name="crn_stn" placeholder="鍫嗗灈鏈虹珯鐐�" autocomplete="off">
+ <input class="layui-input" type="text" name="crn_stn" placeholder="璁惧绔欑偣" autocomplete="off">
</div>
</div>
<!--<div class="layui-inline">-->
diff --git a/zy-asrs-wms/src/main/webapp/views/staDesc/staDesc_detail.html b/zy-asrs-wms/src/main/webapp/views/staDesc/staDesc_detail.html
index 1b8b66c..4ee8782 100644
--- a/zy-asrs-wms/src/main/webapp/views/staDesc/staDesc_detail.html
+++ b/zy-asrs-wms/src/main/webapp/views/staDesc/staDesc_detail.html
@@ -66,13 +66,13 @@
</div>
</div>
<div class="layui-inline" style="width:80%;">
- <label class="layui-form-label"><span class="not-null">*</span>鍫嗗灈鏈哄彿锛�</label>
+ <label class="layui-form-label"><span class="not-null">*</span>璁惧鍙凤細</label>
<div class="layui-input-inline">
<input id="crnNo" class="layui-input" type="text">
</div>
</div>
<div class="layui-inline" style="width:80%;">
- <label class="layui-form-label">鍫嗗灈鏈虹珯鐐癸細</label>
+ <label class="layui-form-label">璁惧绔欑偣锛�</label>
<div class="layui-input-inline cool-auto-complete">
<input id="crnStn" class="layui-input" type="text" lay-verify="number" style="display: none">
<input id="crnStn$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇疯緭鍏�..." onfocus=this.blur()>
--
Gitblit v1.9.1