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
2022-12-09 13:19:23 +08:00
parent 27d5e5fafe 9a4e78a555
commit 82b5575f9c
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/ProductInstorServiceImpl.java
View File

@@ -80,7 +80,7 @@ public class ProductInstorServiceImpl implements ProductInstorService {
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public JSONObject confirm(JSONObject whereJson) { public JSONObject confirm(JSONObject whereJson) {
String box_no = whereJson.getString("box_no"); String box_no = whereJson.getString("box_no");
//1-报废入库；2-生产入库；3-退货入库 //1-报废入库；2-生产入库；3-退货入库；4-拆分入库
String option = whereJson.getString("option"); String option = whereJson.getString("option");
String material_code = whereJson.getString("material_code"); String material_code = whereJson.getString("material_code");
String is_virtual = whereJson.getString("is_virtual"); String is_virtual = whereJson.getString("is_virtual");
@@ -112,6 +112,9 @@ public class ProductInstorServiceImpl implements ProductInstorService {
if (option.equals("3")) { if (option.equals("3")) {
mst_jo.put("bill_type", "0002"); mst_jo.put("bill_type", "0002");
} }
if (option.equals("4")) {
mst_jo.put("bill_type", "0005");
}
//查询成品库仓库 //查询成品库仓库
JSONObject stor = WQLObject.getWQLObject("st_ivt_bsrealstorattr").query("is_delete = '0' AND is_used = '1' AND is_productstore = '1'").uniqueResult(0); JSONObject stor = WQLObject.getWQLObject("st_ivt_bsrealstorattr").query("is_delete = '0' AND is_used = '1' AND is_productstore = '1'").uniqueResult(0);
mst_jo.put("stor_id", stor.getString("stor_id")); mst_jo.put("stor_id", stor.getString("stor_id"));

7
lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java
View File

@@ -2091,7 +2091,12 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
// 更新子卷包装关系表 状态 - 3 // 更新子卷包装关系表 状态 - 3
JSONObject jsonSub = subTab.query("container_name = '" + dis.getString("pcsn") + "' and status = '2'").uniqueResult(0); JSONObject jsonSub = subTab.query("container_name = '" + dis.getString("pcsn") + "' and status = '2'").uniqueResult(0);
if (ObjectUtil.isEmpty(jsonSub)) throw new BadRequestException("此子卷不存在或不为入库状态：" + dis.getString("pcsn")); if (ObjectUtil.isEmpty(jsonSub)) throw new BadRequestException("此子卷不存在或不为入库状态：" + dis.getString("pcsn"));
jsonSub.put("status", "3"); // 如果是拆分入库则将包装关系改为生成状态
if (jo_mst.getString("bill_type").equals("1005")){
jsonSub.put("status", "0");
} else {
jsonSub.put("status", "3");
}
subTab.update(jsonSub); subTab.update(jsonSub);
} }