From 3e9084f93b031fe5e50045097b7fe2bf0b9e58fd Mon Sep 17 00:00:00 2001 From: zhenghaoyu Date: Tue, 14 May 2024 17:59:49 +0800 Subject: [PATCH 1/3] =?UTF-8?q?1.=E5=B9=B2=E7=BA=BF-bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/TrunklineAdvanceDetailMapper.xml | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineAdvanceDetailMapper.xml b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineAdvanceDetailMapper.xml index a64eb3e5f..e37b7acf9 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineAdvanceDetailMapper.xml +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineAdvanceDetailMapper.xml @@ -350,18 +350,10 @@ From 3daf0be1a3299086b7938d7bc9c43bf27d81250f Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Tue, 14 May 2024 18:21:19 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=A4=87=E8=B4=A7=E5=BA=93=E4=BD=8D?= =?UTF-8?q?=E4=B8=8A=E6=9E=B6=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../appcontroller/DistributionStockupAppController.java | 6 ------ 1 file changed, 6 deletions(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionStockupAppController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionStockupAppController.java index 8310af7b6..ee6958b70 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionStockupAppController.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionStockupAppController.java @@ -1591,12 +1591,6 @@ public class DistributionStockupAppController extends BladeController { entity.setBillLadingId(reservationId); DistributionStockupEntity byId = distributionStockupService.getById(stockupId); entity.setStockupArea(byId.getStockupArea()); - - //修改包件备货状态 -// one.setOrderPackageStockupStatus(StockupStatusConstant.yibeihuo.getValue()); - //todo 待下架操作 -// warehouseUpdownTypeClient.downPackage(stockupDTO.getPacketBarCode()); -// distributionParcelListService.updateById(one); } else { entity.setReservationId(reservationId); } From 22bba8cb4aadd0c3ddaa67e234cf0c44330c4bcb Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Tue, 14 May 2024 18:29:04 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=A4=87=E8=B4=A7=E5=BA=93=E4=BD=8D?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DistributionStockupAppController.java | 38 +++++++-------- .../distribution/dto/app/StockupDTO.java | 2 +- .../distribution/dto/app/StockupZeroDTO.java | 2 +- .../impl/DistributionStockupServiceImpl.java | 47 ++++++++++--------- 4 files changed, 45 insertions(+), 44 deletions(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionStockupAppController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionStockupAppController.java index ee6958b70..1c92c0d2d 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionStockupAppController.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionStockupAppController.java @@ -1461,15 +1461,15 @@ public class DistributionStockupAppController extends BladeController { String audioValue = DictBizCache.getValue(DictBizConstant.PDA_AUDIO, PdaAudioLingoStatus.saomiaochenggong.getValue()); //进行备货库位上架 - if (!Func.isEmpty(stockupDTO.getStockupAllocationId())){ - JSONObject jsonObject = new JSONObject(); - jsonObject.put("warehouseId", myCurrentWarehouse.getId()); - jsonObject.put("code",packetBarCode); - jsonObject.put("stockUpAllocationId", stockupDTO.getStockupAllocationId()); - jsonObject.put("type", 2); - jsonObject.put("num", 1); - warehouseUpdownStockUpAreaClient.upStockUpShelf(jsonObject); - } +// if (!Func.isEmpty(stockupDTO.getStockupAllocationId())){ +// JSONObject jsonObject = new JSONObject(); +// jsonObject.put("warehouseId", myCurrentWarehouse.getId()); +// jsonObject.put("code",packetBarCode); +// jsonObject.put("stockUpAllocationId", stockupDTO.getStockupAllocationId()); +// jsonObject.put("type", 2); +// jsonObject.put("num", 1); +// warehouseUpdownStockUpAreaClient.upStockUpShelf(jsonObject); +// } //扫码成功 return Resp.scanSuccess(PdaAudioLingoStatus.saomiaochenggong.getName(), audioValue); @@ -1650,16 +1650,16 @@ public class DistributionStockupAppController extends BladeController { }); //查询是否货位数据是否该下架 - if (!Func.isEmpty(stockupDTO.getStockupAllocationId())){ - JSONObject jsonObject = new JSONObject(); - jsonObject.put("warehouseId", myCurrentWarehouse.getId()); - jsonObject.put("code",packetBarCode); - jsonObject.put("stockUpAllocationId", stockupDTO.getStockupAllocationId()); - jsonObject.put("type", 1); - jsonObject.put("num", 1); - //进行了备货库位的选择才进行备货库位的上架 - warehouseUpdownStockUpAreaClient.upStockUpShelf(jsonObject); - } +// if (!Func.isEmpty(stockupDTO.getStockupAllocationId())){ +// JSONObject jsonObject = new JSONObject(); +// jsonObject.put("warehouseId", myCurrentWarehouse.getId()); +// jsonObject.put("code",packetBarCode); +// jsonObject.put("stockUpAllocationId", stockupDTO.getStockupAllocationId()); +// jsonObject.put("type", 1); +// jsonObject.put("num", 1); +// //进行了备货库位的选择才进行备货库位的上架 +// warehouseUpdownStockUpAreaClient.upStockUpShelf(jsonObject); +// } //修改包件备货状态 DistributionParcelListEntity parcelListEntity = new DistributionParcelListEntity(); parcelListEntity.setId(entity.getParcelListId()); diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/app/StockupDTO.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/app/StockupDTO.java index 4c9d87751..47659be92 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/app/StockupDTO.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/app/StockupDTO.java @@ -13,7 +13,7 @@ public class StockupDTO implements Serializable { private String stockupDateEnd;//备货日期 private Integer status;//0未完成 1已完成 - private Long stockupAllocationId;//0未完成 1已完成 +// private Long stockupAllocationId;//0未完成 1已完成 private String stockupAllocationName;//0未完成 1已完成 /** diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/app/StockupZeroDTO.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/app/StockupZeroDTO.java index cc4dbfc37..836306525 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/app/StockupZeroDTO.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/app/StockupZeroDTO.java @@ -22,7 +22,7 @@ public class StockupZeroDTO implements Serializable { private String typeService;//备货类型 3 自提 private Long reservationId;//预约单id private Integer num;//预约单id - private Long stockupAllocationId;//备货库位Id +// private Long stockupAllocationId;//备货库位Id private String stockupAllocationName;//备货库位Id } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java index 8cd285367..bb1a3a515 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java @@ -1997,14 +1997,15 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl