diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/pda/service/impl/VehicleTwoServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/pda/service/impl/VehicleTwoServiceImpl.java index bc19470c2..3cfce8386 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/pda/service/impl/VehicleTwoServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/pda/service/impl/VehicleTwoServiceImpl.java @@ -169,6 +169,8 @@ public class VehicleTwoServiceImpl implements VehicleTwoService { @Override public JSONObject reback(JSONObject whereJson) { String bill_type = whereJson.getString("bill_type"); + whereJson.put("material_barcode",whereJson.getString("box_no")); + whereJson.put("device_code",whereJson.getString("point_code")); //1-返检入库;2-改切入库 if (bill_type.equals("1")){ whereJson.put("bill_type", IOSEnum.IN_TYPE.code("返检入库")); diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvServiceImpl.java index ef16054e8..1c8e4a6ef 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvServiceImpl.java @@ -408,7 +408,7 @@ public class StIvtIostorinvServiceImpl extends ServiceImpl() - .eq(PdmBiSubpackagerelation::getContainer_name, whereJson.get("material_barcode"))); + .eq(PdmBiSubpackagerelation::getContainer_name, whereJson.get("material_barcode").toString().split(",")[0])); // 查询木箱信息 BstIvtBoxinfo boxDao = iBstIvtBoxinfoService.getOne( new QueryWrapper().lambda()