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

修改

Browse Source
This commit is contained in:
ZHOUZ\Noble'lift
2022-07-27 14:34:12 +08:00
parent 940c9604d6
commit 0047d98aef
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mes/hd/nladmin-system/src/main/java/org/nl/pda/pdm/service/impl/PfScreenServiceImpl.java
View File

@@ -136,7 +136,7 @@ public class PfScreenServiceImpl implements PfScreenService {
scr_jo.put("msg", "投料确认异常！错误码："+err_mark.getString("error"));
scr_jo.put("flag", "1");
}else {
if (StrUtil.isNotEmpty(err_mark.getString("mes_msg"))){
if (ObjectUtil.isNotEmpty(err_mark) && StrUtil.isNotEmpty(err_mark.getString("mes_msg"))){
scr_jo.put("msg", err_mark.getString("mes_msg"));
scr_jo.put("flag", "1");
}

3
mes/hd/nladmin-system/src/main/java/org/nl/pda/st/out/service/impl/HandPFOutIvtServiceImpl.java
View File

@@ -783,9 +783,10 @@ public class HandPFOutIvtServiceImpl implements HandPFOutIvtService {
String material_id = bucketrow.getString("material_id");
String pcsn = bucketrow.getString("pcsn");
String ivt_level = bucketrow.getString("ivt_level");
String is_active = bucketrow.getString("is_active");
String quality_scode = bucketrow.getString("quality_scode");
//查询仓位库存里面的该物料批次的总重量
JSONObject ivtjo = inv_table.query("material_id='" + material_id + "' and pcsn='" + pcsn + "' and ivt_level='" + ivt_level + "' and quality_scode ='" + quality_scode + "' and struct_code='" + point_code + "' ").uniqueResult(0);
JSONObject ivtjo = inv_table.query("is_active = '"+is_active+"' and material_id='" + material_id + "' and pcsn='" + pcsn + "' and ivt_level='" + ivt_level + "' and quality_scode ='" + quality_scode + "' and struct_code='" + point_code + "' ").uniqueResult(0);
if (ObjectUtil.isEmpty(ivtjo)) {
throw new PdaRequestException("物料为【'" + material_id + "'】,批次为【'" + pcsn + "'】,库存等级为【'" + ivt_level + "'】,品质类型为【'" + quality_scode + "'】的物料在仓库未找到！");
}