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

fix:修改入烘箱逻辑

Browse Source
This commit is contained in:
zhouz
2025-10-21 11:13:34 +08:00
parent fec55953f8
commit c5c3e50b60
3 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InBoxManageServiceImpl.java
View File

@@ -717,7 +717,7 @@ public class InBoxManageServiceImpl implements InBoxManageService {
JSONObject jsonAttr = new JSONObject(); JSONObject jsonAttr = new JSONObject();
RLock lock = redissonClient.getLock("getEmptyBox-----"+block_num); RLock lock = redissonClient.getLock("getEmptyBox");
boolean tryLock = lock.tryLock(0, TimeUnit.SECONDS); boolean tryLock = lock.tryLock(0, TimeUnit.SECONDS);
try { try {
if (tryLock) { if (tryLock) {

3
lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/rest/BakingController.java
View File

@@ -1,5 +1,6 @@
package org.nl.wms.pda.mps.rest; package org.nl.wms.pda.mps.rest;
import cn.dev33.satoken.annotation.SaIgnore;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
@@ -25,7 +26,7 @@ public class BakingController {
@PostMapping("/ovenInAndOut") @PostMapping("/ovenInAndOut")
@Log("烘箱出入") @Log("烘箱出入")
@SaIgnore
public ResponseEntity<Object> queryRawFoil(@RequestBody JSONObject whereJson) { public ResponseEntity<Object> queryRawFoil(@RequestBody JSONObject whereJson) {
return new ResponseEntity<>(bakingService.ovenInAndOut(whereJson), HttpStatus.OK); return new ResponseEntity<>(bakingService.ovenInAndOut(whereJson), HttpStatus.OK);
} }

5
lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/wql/PDA_OVENINANDOUT_01.wql
View File

@@ -85,7 +85,7 @@
IFNULL(po.material_code,'') = '' IFNULL(po.material_code,'') = ''
ENDOPTION ENDOPTION
OPTION 输入.mater_flag = "1" OPTION 输入.mater_flag = "1"
IFNULL(po.material_code,'') = '' IFNULL(po.material_code,'') = ''
ENDOPTION ENDOPTION
UNION UNION
SELECT SELECT
@@ -308,6 +308,9 @@
ENDOPTION ENDOPTION
OPTION 输入.point_type <> "" OPTION 输入.point_type <> ""
p.point_type = 输入.point_type p.point_type = 输入.point_type
ENDOPTION
OPTION 输入.cant_location <> ""
p.point_location not in 输入.cant_location
ENDOPTION ENDOPTION
AND p.point_type = '4' AND p.point_type = '4'
AND p.point_status = '1' AND p.point_status = '1'