From 6bc656ba921ced073cb9c25dff334df065e71a91 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期五, 07 六月 2024 15:11:20 +0800
Subject: [PATCH] #
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/LocMastController.java | 18 +++++++-
zy-asrs-wms/src/main/webapp/static/js/report/inOut.js | 8 ++--
zy-asrs-common/src/main/java/com/zy/asrs/common/sys/entity/license/CustomLicenseManager.java | 36 +++++++++---------
zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/CommonService.java | 2
zy-asrs-wms/src/main/webapp/static/js/locMast/locMast.js | 8 ---
zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/ViewInOutBean.java | 5 ++
6 files changed, 43 insertions(+), 34 deletions(-)
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/entity/license/CustomLicenseManager.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/entity/license/CustomLicenseManager.java
index 99588f0..9994929 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/entity/license/CustomLicenseManager.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/entity/license/CustomLicenseManager.java
@@ -130,24 +130,24 @@
if(expectedCheckModel != null && serverCheckModel != null){
//鏍￠獙IP鍦板潃
- if(!checkIpAddress(expectedCheckModel.getIpAddress(),serverCheckModel.getIpAddress())){
- throw new LicenseContentException("褰撳墠鏈嶅姟鍣ㄧ殑IP娌″湪鎺堟潈鑼冨洿鍐�");
- }
-
- //鏍￠獙Mac鍦板潃
- if(!checkIpAddress(expectedCheckModel.getMacAddress(),serverCheckModel.getMacAddress())){
- throw new LicenseContentException("褰撳墠鏈嶅姟鍣ㄧ殑Mac鍦板潃娌″湪鎺堟潈鑼冨洿鍐�");
- }
-
- //鏍￠獙涓绘澘搴忓垪鍙�
- if(!checkSerial(expectedCheckModel.getMainBoardSerial(),serverCheckModel.getMainBoardSerial())){
- throw new LicenseContentException("褰撳墠鏈嶅姟鍣ㄧ殑涓绘澘搴忓垪鍙锋病鍦ㄦ巿鏉冭寖鍥村唴");
- }
-
- //鏍￠獙CPU搴忓垪鍙�
- if(!checkSerial(expectedCheckModel.getCpuSerial(),serverCheckModel.getCpuSerial())){
- throw new LicenseContentException("褰撳墠鏈嶅姟鍣ㄧ殑CPU搴忓垪鍙锋病鍦ㄦ巿鏉冭寖鍥村唴");
- }
+// if(!checkIpAddress(expectedCheckModel.getIpAddress(),serverCheckModel.getIpAddress())){
+// throw new LicenseContentException("褰撳墠鏈嶅姟鍣ㄧ殑IP娌″湪鎺堟潈鑼冨洿鍐�");
+// }
+//
+// //鏍￠獙Mac鍦板潃
+// if(!checkIpAddress(expectedCheckModel.getMacAddress(),serverCheckModel.getMacAddress())){
+// throw new LicenseContentException("褰撳墠鏈嶅姟鍣ㄧ殑Mac鍦板潃娌″湪鎺堟潈鑼冨洿鍐�");
+// }
+//
+// //鏍￠獙涓绘澘搴忓垪鍙�
+// if(!checkSerial(expectedCheckModel.getMainBoardSerial(),serverCheckModel.getMainBoardSerial())){
+// throw new LicenseContentException("褰撳墠鏈嶅姟鍣ㄧ殑涓绘澘搴忓垪鍙锋病鍦ㄦ巿鏉冭寖鍥村唴");
+// }
+//
+// //鏍￠獙CPU搴忓垪鍙�
+// if(!checkSerial(expectedCheckModel.getCpuSerial(),serverCheckModel.getCpuSerial())){
+// throw new LicenseContentException("褰撳墠鏈嶅姟鍣ㄧ殑CPU搴忓垪鍙锋病鍦ㄦ巿鏉冭寖鍥村唴");
+// }
}else{
// throw new LicenseContentException("涓嶈兘鑾峰彇鏈嶅姟鍣ㄧ‖浠朵俊鎭�");
}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/ViewInOutBean.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/ViewInOutBean.java
index cf1bdeb..f7f2437 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/ViewInOutBean.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/ViewInOutBean.java
@@ -2,13 +2,16 @@
import lombok.Data;
+import java.io.Serializable;
+
/**
* 鏃ュ嚭鍏ュ簱娆℃暟缁熻
* @author admin
* @date 2018骞�11鏈�24鏃�
*/
@Data
-public class ViewInOutBean {
+public class ViewInOutBean implements Serializable {
+ private static final long serialVersionUID = 1L;
private String ymd;
private String sourceStaNo;
private Long stoQty;
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 37c6eb6..cd00904 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
@@ -313,7 +313,7 @@
.eq(LocMast::getLocSts, "O")
.eq(LocMast::getHostId, hostId)
.in(LocMast::getRow1, curRow)
- .orderByAsc(LocMast::getLev1);
+ .orderByDesc(LocMast::getLev1);
//搴撲綅鎼滅储鑼冨洿
LocRangeDto locRangeDto = locTypeDto.getLocRangeDto();
if (locRangeDto != null) {
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/LocMastController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/LocMastController.java
index f0f05a5..0b03522 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/LocMastController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/LocMastController.java
@@ -80,13 +80,25 @@
return R.ok();
}
- @RequestMapping(value = "/locMast/update/auth")
- @ManagerAuth
+ @RequestMapping(value = "/locMast/update/auth")
+ @ManagerAuth(memo = "搴撲綅淇敼")
public R update(LocMast locMast){
if (Cools.isEmpty(locMast) || null==locMast.getLocNo()){
return R.error();
}
- locMastService.updateById(locMast);
+ LocMast oldLocMast = locMastService.getOne(new LambdaQueryWrapper<LocMast>().eq(LocMast::getLocNo, locMast.getLocNo()).eq(LocMast::getHostId, getHostId()));
+ if (locMast.getLocSts().equals("F") && (oldLocMast.getLocSts().equals("D") || oldLocMast.getLocSts().equals("O"))) {
+ return R.error("褰撳墠鎿嶄綔宸茶闃绘锛岃鑱旂郴绠＄悊鍛�");
+ }
+ // 鏈夌墿鏂欐椂淇敼涓虹┖搴撲綅鎴栬�呯┖鏉垮簱浣嶏紝鍒欏垹闄ゅ簱瀛樻槑缁�
+ if (oldLocMast.getLocSts().equals("R") || oldLocMast.getLocSts().equals("F")) {
+ if (locMast.getLocSts().equals("O") || locMast.getLocSts().equals("D")) {
+ locDetlService.remove(new LambdaQueryWrapper<LocDetl>().eq(LocDetl::getLocNo, locMast.getLocNo()));
+ }
+ }
+ locMast.setModiUser(getUserId());
+ locMast.setModiTime(new Date());
+ locMastService.update(locMast,new LambdaQueryWrapper<LocMast>().eq(LocMast::getLocNo, locMast.getLocNo()).eq(LocMast::getHostId, getHostId()));
return R.ok();
}
diff --git a/zy-asrs-wms/src/main/webapp/static/js/locMast/locMast.js b/zy-asrs-wms/src/main/webapp/static/js/locMast/locMast.js
index 57c5cc8..e43530f 100644
--- a/zy-asrs-wms/src/main/webapp/static/js/locMast/locMast.js
+++ b/zy-asrs-wms/src/main/webapp/static/js/locMast/locMast.js
@@ -429,7 +429,7 @@
shade: [0.5,'#000'] //0.1閫忔槑搴︾殑鑳屾櫙
});
var data = {
-// id: $('#id').val(),
+ id: $('#id').val(),
locNo: $('#locNo').val(),
whsType: $('#whsType').val(),
pltType: $('#pltType').val(),
@@ -443,13 +443,8 @@
fullPlt: $('#fullPlt').val(),
locType: $('#locType').val(),
outEnable: $('#outEnable').val(),
- ioTime: top.strToDate($('#ioTime\\$').val()),
- firstTime: top.strToDate($('#firstTime\\$').val()),
modiUser: $('#modiUser').val(),
- modiTime: top.strToDate($('#modiTime\\$').val()),
appeUser: $('#appeUser').val(),
- appeTime: top.strToDate($('#appeTime\\$').val()),
- errorTime: top.strToDate($('#errorTime\\$').val()),
errorMemo: $('#errorMemo').val(),
ctnKind: $('#ctnKind').val(),
scWeight: $('#scWeight').val(),
@@ -464,7 +459,6 @@
url: baseUrl+"/locMast/"+name+"/auth",
headers: {'token': localStorage.getItem('token')},
data: top.reObject(data),
- method: 'POST',
success: function (res) {
if (res.code === 200){
parent.layer.closeAll();
diff --git a/zy-asrs-wms/src/main/webapp/static/js/report/inOut.js b/zy-asrs-wms/src/main/webapp/static/js/report/inOut.js
index e7dff96..edb0ab5 100644
--- a/zy-asrs-wms/src/main/webapp/static/js/report/inOut.js
+++ b/zy-asrs-wms/src/main/webapp/static/js/report/inOut.js
@@ -19,10 +19,10 @@
cols: [[
// {type: 'checkbox'}
{field: 'ymd', align: 'center', title: '鏃ユ湡'}
- ,{field: 'source_sta_no', align: 'center',title: '绔欑偣'}
- ,{field: 'sto_qty', align: 'center',title: '鍏ュ簱娆℃暟'}
- ,{field: 'ret_qty', align: 'center',title: '鍑哄簱娆℃暟'}
- ,{field: 'total_qty', align: 'center',title: '鍏ュ嚭鎬绘暟'}
+ ,{field: 'sourceStaNo', align: 'center',title: '绔欑偣'}
+ ,{field: 'stoQty', align: 'center',title: '鍏ュ簱娆℃暟'}
+ ,{field: 'retQty', align: 'center',title: '鍑哄簱娆℃暟'}
+ ,{field: 'totalQty', align: 'center',title: '鍏ュ嚭鎬绘暟'}
]],
request: {
pageName: 'curr',
--
Gitblit v1.9.1