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

Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one

Browse Source
This commit is contained in:
ZHOUZ\Noble'lift
2023-02-21 14:52:04 +08:00
parent 85f664bea1 642cecc8a6
commit 2ed5d8e716
6 changed files with 54 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java
View File

@@ -395,6 +395,18 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
if (ObjectUtil.isEmpty(sub_jo)) {
throw new BadRequestException("未查询到该木箱对应的包装关系！");
}
// 校验木箱长度类型
double box_length = sub_jo.getDoubleValue("box_length");
if (522 <= box_length && box_length <= 614) {
device_code = device_code + "_1";
} else if (672 <= box_length && box_length <= 814) {
device_code = device_code + "_2";
} else {
device_code = device_code + "_3";
}
String sale_order_name = sub_jo.getString("sale_order_name");
//查询是否存在可用的空位
@@ -580,7 +592,6 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
data.put("box_length", box_length);
data.put("box_width", box_width);
data.put("box_high", box_high);
data.put("bundle_times", 2);
Double box_length_value = Double.valueOf(box_length);
if (box_length_value >= 772) {

7
lms/nladmin-system/src/main/java/org/nl/wms/st/instor/rest/CheckController.java
View File

@@ -153,4 +153,11 @@ public class CheckController {
checkService.disposeConfirm(whereJson);
return new ResponseEntity<>(HttpStatus.NO_CONTENT);
}
@PostMapping("/confirmBtn")
@Log("强制确认")
@ApiOperation("强制确认")
public ResponseEntity<Object> confirmBtn(@RequestBody JSONObject whereJson) {
checkService.confirmBtn(whereJson);
return new ResponseEntity<>(HttpStatus.NO_CONTENT);
}
}

5
lms/nladmin-system/src/main/java/org/nl/wms/st/instor/service/CheckService.java
View File

@@ -119,4 +119,9 @@ public interface CheckService {
* 新增全部在库木箱
*/
void allInsert(JSONObject whereJson);
/**
* 强制确认
*/
void confirmBtn(JSONObject whereJson);
}

11
lms/nladmin-system/src/main/java/org/nl/wms/st/instor/service/impl/CheckServiceImpl.java
View File

@@ -808,4 +808,15 @@ public class CheckServiceImpl implements CheckService {
dtlTab.insert(jsonDtl);
}
}
@Override
@Transactional(rollbackFor = Exception.class)
public void confirmBtn(JSONObject whereJson) {
WQLObject mstTab = WQLObject.getWQLObject("ST_IVT_CheckMst");
JSONObject jsonMst = mstTab.query("check_id = '" + whereJson.getString("check_id") + "'").uniqueResult(0);
jsonMst.put("status", "99");
mstTab.update(jsonMst);
}
}