From 72222ca37ee04cc3506afefecd9e2fbf4b875e78 Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Mon, 29 Jul 2024 18:03:53 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=9B=9E=E4=BC=A0=E8=A1=A5=E4=B8=81?= =?UTF-8?q?=E5=8F=96=E6=B6=88=E5=BA=93=E5=AD=98=E5=93=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/DistributionSignforServiceImpl.java | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java index c890b2952..1a105e936 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java @@ -6528,21 +6528,21 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl 0) { - - //查询库存品扫描签收 - List loadingPushOldInventory = distributionSignforMapper.selectLoadingPushOldInventory(distributionSignforEntity.getReservationId(), distributionSignforEntity.getDeliveryId()); - List signingPushOldInventory = distributionSignforMapper.selectSigningPushOldInventory(distributionSignforEntity.getReservationId(), distributionSignforEntity.getDeliveryId()); - if (Func.isNotEmpty(loadingPushOldInventory)) { - buildNameAndPhone(loadingPushOldInventory); - signPushDataUnitDTOS.addAll(loadingPushOldInventory); - } - - if (Func.isNotEmpty(signingPushOldInventory)) { - buildNameAndPhone(signingPushOldInventory); - signPushDataUnitDTOS.addAll(signingPushOldInventory); - } - } +// if (distributionReservationEntity.getReservationStockListNum() > 0) { +// +// //查询库存品扫描签收 +// List loadingPushOldInventory = distributionSignforMapper.selectLoadingPushOldInventory(distributionSignforEntity.getReservationId(), distributionSignforEntity.getDeliveryId()); +// List signingPushOldInventory = distributionSignforMapper.selectSigningPushOldInventory(distributionSignforEntity.getReservationId(), distributionSignforEntity.getDeliveryId()); +// if (Func.isNotEmpty(loadingPushOldInventory)) { +// buildNameAndPhone(loadingPushOldInventory); +// signPushDataUnitDTOS.addAll(loadingPushOldInventory); +// } +// +// if (Func.isNotEmpty(signingPushOldInventory)) { +// buildNameAndPhone(signingPushOldInventory); +// signPushDataUnitDTOS.addAll(signingPushOldInventory); +// } +// } //查询签收图片 List distributionSignPrintVOS = distributionSignforMapper.selectSignImgsUrl(distributionReservationEntity.getId()); From 75aab2664289c028aa77f2dbc6f6d97b33a31283 Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" Date: Mon, 29 Jul 2024 18:52:55 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E5=8F=B8=E6=9C=BA?= =?UTF-8?q?=E7=BB=91=E5=AE=9A=E5=A4=9A=E4=B8=AA=E8=81=8C=E8=B4=A3=E7=9A=84?= =?UTF-8?q?=E5=9C=BA=E6=99=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basicdata/entity/BasicdataDriverArteryEntity.java | 2 +- .../logpm/basicdata/vo/BasicdataDriverArteryVO.java | 6 ++++++ .../controller/BasicdataDriverArteryController.java | 11 +++++++---- .../logpm/basicdata/dto/BasicdataDriverArteryDTO.java | 2 ++ .../basicdata/mapper/BasicdataDriverArteryMapper.java | 2 +- .../basicdata/mapper/BasicdataDriverArteryMapper.xml | 4 ++-- .../impl/BasicdataDriverArteryServiceImpl.java | 2 +- 7 files changed, 20 insertions(+), 9 deletions(-) diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataDriverArteryEntity.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataDriverArteryEntity.java index 597e85090..3aa2fc6a5 100644 --- a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataDriverArteryEntity.java +++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataDriverArteryEntity.java @@ -62,7 +62,7 @@ public class BasicdataDriverArteryEntity extends TenantEntity { /** * 职务类型;1-干线,2-配送 */ - @ApiModelProperty(value = "职务类型;1-干线,2-配送,3-全部") + @ApiModelProperty(value = "职务类型;1-干线,2-配送") private String jobType; /** * 准驾车型;1-A1,2-A2,3-A3,4-B1,5-B2,6-C1,7-C2 diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataDriverArteryVO.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataDriverArteryVO.java index 72de2c0ae..894f8754f 100644 --- a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataDriverArteryVO.java +++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataDriverArteryVO.java @@ -50,6 +50,12 @@ public class BasicdataDriverArteryVO extends BasicdataDriverArteryEntity { @ApiModelProperty(value = "司机关联车辆列表") private List vehicleVOList; + /** + * 司机类型 + */ + private List jobTypeString; + + private List warehouses = new ArrayList<>(); diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataDriverArteryController.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataDriverArteryController.java index 34a572b6d..67e8fbbd2 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataDriverArteryController.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataDriverArteryController.java @@ -34,6 +34,7 @@ import com.logpm.basicdata.vo.BasicdataDriverWarehouseVO; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; +import jodd.util.ArraysUtil; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springblade.core.boot.ctrl.BladeController; @@ -54,10 +55,7 @@ import springfox.documentation.annotations.ApiIgnore; import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import java.util.Map; +import java.util.*; /** * 司机信息表 控制器 @@ -95,6 +93,11 @@ public class BasicdataDriverArteryController extends BladeController { List warehouseIds = basicdataDriverWarehouseService.findByDriverId(driverId); BasicdataDriverArteryVO basicdataDriverArteryVO = new BasicdataDriverArteryVO(); BeanUtil.copy(detail,basicdataDriverArteryVO); + + // 拆分 司机类型 + String[] split = basicdataDriverArteryVO.getJobType().split(","); + List list = Arrays.asList(split); + basicdataDriverArteryVO.setJobTypeString(list); basicdataDriverArteryVO.setWarehouses(warehouseIds); basicdataDriverArteryVO.setBindVehicles(String.join(",",vehicleIds)); return R.data(basicdataDriverArteryVO); diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/dto/BasicdataDriverArteryDTO.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/dto/BasicdataDriverArteryDTO.java index 27c8f85c0..b5ab2870f 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/dto/BasicdataDriverArteryDTO.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/dto/BasicdataDriverArteryDTO.java @@ -41,4 +41,6 @@ public class BasicdataDriverArteryDTO extends BasicdataDriverArteryEntity { private String bindVehicles; private List warehouseIds = new ArrayList<>(); + + } diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataDriverArteryMapper.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataDriverArteryMapper.java index dd5cbf1ab..e4112f933 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataDriverArteryMapper.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataDriverArteryMapper.java @@ -69,7 +69,7 @@ public interface BasicdataDriverArteryMapper extends BaseMapper selectListByWarehouseId(@Param("warehouseId") Long warehouseId); + List selectListByWarehouseId(@Param("warehouseId") Long warehouseId,@Param("jobType")String jobType); BasicdataDriverArteryEntity findEntityByPhone(@Param("phone") String phone); } diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataDriverArteryMapper.xml b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataDriverArteryMapper.xml index b15895d84..fee6fa8be 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataDriverArteryMapper.xml +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataDriverArteryMapper.xml @@ -168,13 +168,12 @@ left join logpm_basicdata_vehicle lbv on lbv.id = lbdm.brand_id where lbda.`name` like concat('%',#{driverName},'%') - and lbda.job_type = #{jobType} + and locate(#{jobType},lbda.job_type)>0 group by lbda.id, lbda.name, lbda.phone, lbda.type - limit 10 diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataDriverArteryServiceImpl.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataDriverArteryServiceImpl.java index 73c263bd4..07bad0f82 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataDriverArteryServiceImpl.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataDriverArteryServiceImpl.java @@ -140,7 +140,7 @@ public class BasicdataDriverArteryServiceImpl extends BaseServiceImpl basicdataDriverArteryVOS = new ArrayList<>(); - List list = baseMapper.selectListByWarehouseId(warehouseId); + List list = baseMapper.selectListByWarehouseId(warehouseId,"2"); log.info("################getDriverList list:{}", list); if(list.isEmpty()){ From be36f40de417b99d9ed5a05f591f51585f62d061 Mon Sep 17 00:00:00 2001 From: zhenghaoyu Date: Mon, 29 Jul 2024 18:57:41 +0800 Subject: [PATCH 3/3] =?UTF-8?q?1.=E5=B9=B2=E7=BA=BFbug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/logpm/trunkline/vo/ZeroSuppleVO.java | 1 + .../mapper/TrunklineCarsLoadMapper.xml | 13 ++++- .../impl/TrunklineCarsLoadServiceImpl.java | 52 ++++++++++++++++--- 3 files changed, 56 insertions(+), 10 deletions(-) diff --git a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/ZeroSuppleVO.java b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/ZeroSuppleVO.java index 4decd1cdb..5302f0a09 100644 --- a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/ZeroSuppleVO.java +++ b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/ZeroSuppleVO.java @@ -12,6 +12,7 @@ public class ZeroSuppleVO implements Serializable { private String orderCode; private Integer enterNum;//输入数量 private Long finalNodeId;//目的仓id + private Long signOrderId;//签收单id } diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.xml b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.xml index f753683b3..137ddb195 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.xml +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.xml @@ -52,7 +52,7 @@ and ltcl.load_status = #{param.loadStatus} - and (Locate(#{param.warehouseName},ltcl.start_warehouse_name) > 0 or Locate(#{param.warehouseName},ltcl.end_warehouse_name) > 0) + and (Locate(#{param.warehouseName},ltcl.start_warehouse_name) > 0 or Locate(#{param.warehouseName},ltcl.end_warehouse_names) > 0) and ltcl.create_time >= #{param.createTimeStart} @@ -135,6 +135,9 @@ and ltcl.end_warehouse_ids like concat('%',#{param.warehouseId},'%') + + and (Locate(#{param.warehouseName},ltcl.start_warehouse_name) > 0 or Locate(#{param.warehouseName},ltcl.end_warehouse_names) > 0) + and Locate(#{param.loadCarsNo},ltcl.cars_no) > 0 @@ -561,13 +564,19 @@ IFNULL(lww.total_freight,0) totalFreight, lww.total_count, lww.remark remark, - ROUND(lww.total_freight/lww.total_count,2) price + ROUND(lww.total_freight/lww.total_count,2) price, + ltlso.load_sign_code loadSignCode, + ltlso.id signOrderId from logpm_distribution_stock_article ldsa left join logpm_warehouse_waybill lww on lww.waybill_no = ldsa.waybill_number + left join logpm_trunkline_load_sign_order ltlso on ltlso.mall_name = ldsa.mall_name and ltlso.load_id = #{param.loadId} where ldsa.is_zero = 1 and lww.destination_warehouse_id != #{param.warehouseId} and ldsa.hand_quantity > 0 and ldsa.warehouse_id = #{param.warehouseId} + + and ltlso.id is not null + and ldsa.order_code not in diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java index 78d126c6b..ae0461c3f 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java @@ -2880,7 +2880,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl 0 ){ +// signOrderEntity.setSignStatus("10"); +// } +// trunklineLoadSignOrderService.updateById(signOrderEntity); + } } //更新数量 updateNumByLoadId(loadId); @@ -5228,10 +5242,10 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl num){ + log.warn("##############signScanPackageCode: 签收数量不能大于当前数据的装车数量 num={} enterNum={}", num, enterNum); + return R.fail(405, "签收数量不能大于当前数据的装车数量"); + } + carsLoadScanEntity.setScanStatus("3"); carsLoadScanEntity.setUnloadNum(enterNum); carsLoadScanEntity.setUnloadAbnormal(0); @@ -6002,11 +6022,27 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("sign_order_id",signOrderId) + .eq("type",2) + .eq("scan_status","3"); - + List carsLoadScanEntityList = trunklineCarsLoadScanService.list(queryWrapper); + carsLoadScanEntityList.forEach(carsLoadScanEntity -> { + Integer num = carsLoadScanEntity.getNum(); + Integer unloadNum = carsLoadScanEntity.getUnloadNum(); + String orderCode = carsLoadScanEntity.getOrderCode(); + Long fromWarehouseId = carsLoadScanEntity.getFromWarehouseId(); + if(unloadNum != num){ + int diff = num - unloadNum; + DistributionStockArticleEntity stockArticle = distributionStockArticleClient.findZeroByOrderCodeAndWarehouseId(orderCode, fromWarehouseId); + distributionStockArticleClient.addHandQuantity(stockArticle.getId(), diff); + } + }); + trunklineLoadSignOrderService.updateById(signOrderEntity); } - - return R.success("添加成功"); }