From ea62fbeb6a20c3513f61d49d5fa93ed0cb2d5b1b Mon Sep 17 00:00:00 2001 From: liuxy Date: Sat, 27 Jul 2024 13:29:29 +0800 Subject: [PATCH] =?UTF-8?q?rev=EF=BC=9A=E5=BC=82=E5=B8=B8=E5=8F=A3?= =?UTF-8?q?=E5=85=A5=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pda/service/impl/VehicleTwoServiceImpl.java | 15 +++++++++++++++ 1 file changed, 15 insertions(+) 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 8dded592e..33e027036 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 @@ -179,7 +179,10 @@ public class VehicleTwoServiceImpl implements VehicleTwoService { } @Override + @Transactional(rollbackFor = Exception.class) public JSONObject reback(JSONObject whereJson) { + WQLObject extTab = WQLObject.getWQLObject("md_pb_storagevehicleext"); + String bill_type = whereJson.getString("bill_type"); whereJson.put("material_barcode", whereJson.getString("box_no")); whereJson.put("device_code", whereJson.getString("point_code")); @@ -217,6 +220,8 @@ public class VehicleTwoServiceImpl implements VehicleTwoService { ); if (boxDao != null) { whereJson.put("vehicleType", boxDao.getVehicle_type()); + boxDao.setIs_packing("1"); + iBstIvtBoxinfoService.updateById(boxDao); } else { //查询mes木箱信息，插入木箱信息表 try { @@ -230,8 +235,18 @@ public class VehicleTwoServiceImpl implements VehicleTwoService { new QueryWrapper().lambda() .eq(BstIvtBoxinfo::getBox_no, boxNo) ); + boxDao1.setIs_packing("1"); + iBstIvtBoxinfoService.updateById(boxDao1); whereJson.put("vehicleType", boxDao1.getVehicle_type()); } + // 更新载具对应木箱信息 + JSONObject jsonExt = extTab.query("storagevehicle_code = '" + whereJson.getString("vehicle_code") + "'").uniqueResult(0); + if (ObjectUtil.isEmpty(jsonExt)) { + throw new BadRequestException("载具不存在!"+whereJson.getString("vehicle_code")); + } + jsonExt.put("pcsn", whereJson.getString("box_no")); + extTab.update(jsonExt); + inBussManageService.inTask(whereJson); JSONObject result = new JSONObject(); result.put("message", "入库成功!");