diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/InchargeServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/InchargeServiceImpl.java index 22f78c29e..20f181f5d 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/InchargeServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/InchargeServiceImpl.java @@ -279,9 +279,9 @@ public class InchargeServiceImpl implements InchargeService { disTab.insert(jsonOutDis); //更新库存 - JSONObject jsonIvt = ivtTab.query("pcsn = '" + jsonOutDis.getString("pcsn") + "' and canuse_qty <> '0'").uniqueResult(0); + JSONObject jsonIvt = ivtTab.query("pcsn = '" + jsonOutDis.getString("pcsn") + "' and canuse_qty = '"+json2.getDoubleValue("real_qty")+"'").uniqueResult(0); - if (ObjectUtil.isEmpty(jsonIvt)) throw new BadRequestException("库存不存在"); + if (ObjectUtil.isEmpty(jsonIvt)) throw new BadRequestException("库存不存在或库存数量不正确"); jsonIvt.put("bill_type_scode", jsonOutMst.getString("bill_type")); jsonIvt.put("inv_id", jsonOutMst.getString("iostorinv_id")); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java index fff789380..d5f9e6ca5 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java @@ -1828,8 +1828,9 @@ public class CheckOutBillServiceImpl implements CheckOutBillService { jsonDtl.put("RSPOS", i + 1); jsonDtl.put("MATNR", jsonMater.getString("material_code")); jsonDtl.put("BWART", "311"); - jsonDtl.put("MENGE", json.getDoubleValue("plan_qty")); - jsonDtl.put("MEINS", json.getString("qty_unit_id")); + jsonDtl.put("MENGE", json.getDoubleValue("real_qty")); + jsonDtl.put("MEINS", json.getString("qty_unit_name")); + jsonDtl.put("WERKS", "2460"); JSONObject jsonSect = sectTab.query("sect_id = '" + json.getString("sect_id") + "'").uniqueResult(0); if (ObjectUtil.isNotEmpty(jsonSect)) { @@ -1847,13 +1848,14 @@ public class CheckOutBillServiceImpl implements CheckOutBillService { } jsonDtl.put("CHARG", json.getString("pcsn")); - jsonDtl.put("UMLGO", ""); // 收货库存地点:线边库外部标识 + jsonDtl.put("UMLGO", "AB01"); // 收货库存地点:线边库外部标识 jsonDtl.put("UMCHA", json.getString("pcsn")); paramArr.add(jsonDtl); } - paramMst.put("item", paramArr); + paramMst.put("T_ITEM", paramArr); // 调用接口回传 + System.out.println(paramMst.toString()); new LmsToSapServiceImpl().returnMoveDtl(paramMst); //调用母卷配送到位接口