root/longdianningxing
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'remotes/origin/b_lms' into master_merge

Browse Source 
# Conflicts:
#	lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/rest/StructattrController.java
#	lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/StructattrService.java
#	lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/StructattrServiceImpl.java
#	lms/nladmin-ui/src/views/wms/basedata/st/struct/index.vue
#	lms/nladmin-ui/src/views/wms/basedata/st/struct/structattr.js
This commit is contained in:
liuxy
2024-06-25 17:41:06 +08:00
parent 94aa93b096 2f396a9a71
commit fb6fe5f0b5
5 changed files with 135 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/rest/StructattrController.java
View File

@@ -106,6 +106,13 @@ public class StructattrController {
@Log("校验前缀是否可用")
public ResponseEntity<Object> blurQuery(@RequestBody JSONObject whereJson) {
structattrService.blurQuery(whereJson);
return new ResponseEntity<>( HttpStatus.OK);
return new ResponseEntity<>(HttpStatus.OK);
}
@PostMapping("/tunConfirm")
@Log("二期禁用巷道")
public ResponseEntity<Object> tunConfirm(@RequestBody JSONObject json) {
structattrService.tunConfirm(json);
return new ResponseEntity<>(HttpStatus.OK);
}
}

9
lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/StructattrService.java
View File

@@ -117,4 +117,13 @@ public interface StructattrService {
* }
*/
void blurQuery(JSONObject whereJson);
/*
* 二期禁用巷道
* @param json ：{
* block_num： 巷道
* is_used: 0-禁用，1-启用
* }
*/
void tunConfirm(JSONObject json);
}

13
lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/StructattrServiceImpl.java
View File

@@ -10,6 +10,7 @@ import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.nl.b_lms.storage_manage.ios.enums.IOSEnum;
import org.nl.common.utils.MapOf;
import org.nl.common.utils.SecurityUtils;
import org.nl.modules.common.exception.BadRequestException;
@@ -686,4 +687,16 @@ public class StructattrServiceImpl implements StructattrService {
}
}
@Override
public void tunConfirm(JSONObject json) {
WQLObject tab = WQLObject.getWQLObject("st_ivt_structattr");
// 将这一巷道的所有仓位都禁用
JSONObject param = new JSONObject();
param.put("is_used", json.getString("is_used"));
tab.update(param,"sect_id = '"+IOSEnum.SECT_ID.code("二期主存区")+"' AND block_num = '"+json.getString("block_num")+"' AND is_delete = '0'");
}
}