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

Merge remote-tracking branch 'origin/master' into feature/sso-server-merge-1228

Browse Source
This commit is contained in:
zhangzhiqiang
2022-12-29 17:29:18 +08:00
parent a3e8073f9a 3e2f71595a
commit da0a72cf68
4 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2873,7 +2873,11 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
String box_no = json.getString("box_no"); String box_no = json.getString("box_no");
String sub_box_no = ""; String sub_box_no = "";
if (ObjectUtil.isNotEmpty(box_no)) { if (ObjectUtil.isNotEmpty(box_no)) {
try {
sub_box_no = box_no.substring(box_no.lastIndexOf("@")+1, box_no.length()); sub_box_no = box_no.substring(box_no.lastIndexOf("@")+1, box_no.length());
} catch (Exception e) {
sub_box_no = box_no;
}
} }
HashMap<String, Object> mapFL = new HashMap<>(); HashMap<String, Object> mapFL = new HashMap<>();
@@ -2920,7 +2924,11 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
String box_no = json.getString("box_no"); String box_no = json.getString("box_no");
String sub_box_no = ""; String sub_box_no = "";
if (ObjectUtil.isNotEmpty(box_no)) { if (ObjectUtil.isNotEmpty(box_no)) {
try {
sub_box_no = box_no.substring(box_no.lastIndexOf("@")+1, box_no.length()); sub_box_no = box_no.substring(box_no.lastIndexOf("@")+1, box_no.length());
} catch (Exception e) {
sub_box_no = box_no;
}
} }
HashMap<String, Object> mapFL = new HashMap<>(); HashMap<String, Object> mapFL = new HashMap<>();

2
lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/wql/QST_IVT_CHECKOUTBILL.wql
View File

@@ -165,7 +165,7 @@
LEFT JOIN ST_IVT_IOStorInv ios ON ios.iostorinv_id = iosdtl.iostorinv_id LEFT JOIN ST_IVT_IOStorInv ios ON ios.iostorinv_id = iosdtl.iostorinv_id
LEFT JOIN pdm_bi_subpackagerelation sub ON sub.container_name = iosdtl.pcsn LEFT JOIN pdm_bi_subpackagerelation sub ON sub.container_name = iosdtl.pcsn
WHERE WHERE
1=1 sub.status = '2'
OPTION 输入.iostorinv_id <> "" OPTION 输入.iostorinv_id <> ""
iosdtl.iostorinv_id = 输入.iostorinv_id iosdtl.iostorinv_id = 输入.iostorinv_id
ENDOPTION ENDOPTION

2
lms/nladmin-system/src/main/java/org/nl/wms/st/returns/service/impl/InAndOutRetrunServiceImpl.java
View File

@@ -985,10 +985,10 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService {
new LmsToMesServiceImpl().childRollFGOutboundComplete(paramMesMst); new LmsToMesServiceImpl().childRollFGOutboundComplete(paramMesMst);
jo_mst.put("upload_mes", "1"); jo_mst.put("upload_mes", "1");
}
jo_mst.put("is_upload", "1"); jo_mst.put("is_upload", "1");
WQLObject.getWQLObject("ST_IVT_IOStorInv").update(jo_mst); WQLObject.getWQLObject("ST_IVT_IOStorInv").update(jo_mst);
} }
}
// 改切出库 // 改切出库
if (StrUtil.equals(bill_type, "1003")) { if (StrUtil.equals(bill_type, "1003")) {

3
lms/nladmin-ui/src/views/wms/pdm/bi/index.vue
View File

@@ -506,6 +506,9 @@ export default {
date_of_production: [ date_of_production: [
{ required: true, message: '制造完成日期不能为空', trigger: 'blur' } { required: true, message: '制造完成日期不能为空', trigger: 'blur' }
], ],
sale_order_name: [
{ required: true, message: '销售订单及行号不能为空', trigger: 'blur' }
],
is_un_plan_production: [ is_un_plan_production: [
{ required: true, message: '计划外分切的子卷不能为空', trigger: 'blur' } { required: true, message: '计划外分切的子卷不能为空', trigger: 'blur' }
], ],