diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/controller/TripartiteTransferController.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/controller/TripartiteTransferController.java index b4b38b25a..c56aa1b7c 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/controller/TripartiteTransferController.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/controller/TripartiteTransferController.java @@ -446,10 +446,10 @@ public class TripartiteTransferController { } if("2".equals(deliveryType)){ - if(Objects.isNull(driverId)){ - log.warn(method+"司机id为空 driverId={}",driverId); - return R.fail(400,"司机id为空"); - } +// if(Objects.isNull(driverId)){ +// log.warn(method+"司机id为空 driverId={}",driverId); +// return R.fail(400,"司机id为空"); +// } if(StringUtil.isBlank(driverName)){ log.warn(method+"司机名称为空 driverName={}",driverName); diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/dto/OrderDetailsDTO.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/dto/OrderDetailsDTO.java index 66ff84b04..984d0f27f 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/dto/OrderDetailsDTO.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/dto/OrderDetailsDTO.java @@ -4,6 +4,7 @@ import lombok.Data; import java.io.Serializable; import java.util.Date; +import java.util.List; @Data public class OrderDetailsDTO implements Serializable { @@ -18,6 +19,7 @@ public class OrderDetailsDTO implements Serializable { private Integer isGcp;//是否干仓配 0否 1是 private String orderCode;//订单好 + private List orderCodes;//订单好 private String waybillNo;//运单号 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 03b32589c..555074558 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 @@ -272,8 +272,11 @@ LEFT JOIN logpm_distribution_bill_lading_scan AS ldbls ON ldpl.id = ldbls.parcel_list_id where 1=1 and ltad.is_deleted = 0 - - and ltad.order_code like concat(#{param.orderCode},'%') + + and ltad.order_code in + + #{item} + and ltad.waybill_no = #{param.waybillNo} diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadLineMapper.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadLineMapper.java index 5f94747be..21efcfe98 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadLineMapper.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadLineMapper.java @@ -27,4 +27,6 @@ public interface TrunklineCarsLoadLineMapper extends BaseMapper + + update logpm_trunkline_cars_load_line + set arrive_date = #{date}, + node_status = #{nodeStatus}, + arrive_user_id = #{userId}, + arrive_user_name = #{userName} + where id = #{lineId} + + + diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.java index 8bbe17c5a..157fad364 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.java @@ -67,5 +67,7 @@ public interface TrunklineCarsLoadMapper extends BaseMapper exportCarsPageList(@Param("param")LoadCarsDTO loadCarsDTO); void updateStartTime(@Param("loadId")Long loadId, @Param("loadStatus")String loadStatus, @Param("date")Date date); + + void updateArriveTime(@Param("loadId")Long loadId, @Param("loadStatus")String loadStatus, @Param("date")Date date, @Param("warehouseId") Long warehouseId); } 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 75672b3d0..61491ae7b 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 @@ -1125,4 +1125,12 @@ where id = #{loadId} + + update logpm_trunkline_cars_load + set arrive_time = #{date}, + load_status = #{loadStatus}, + now_warehouse_id = #{warehouseId} + where id = #{loadId} + + diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineCarsLoadLineService.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineCarsLoadLineService.java index ff3e2c8e2..2d5ef7177 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineCarsLoadLineService.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineCarsLoadLineService.java @@ -30,4 +30,6 @@ public interface ITrunklineCarsLoadLineService extends BaseService orderCodeList = Arrays.asList(orderCodeArray); + orderDetailsDTO.setOrderCodes(orderCodeList); + } + IPage page = new Page<>(); page.setCurrent(orderDetailsDTO.getPageNum()); page.setSize(orderDetailsDTO.getPageSize()); @@ -330,21 +337,24 @@ public class TrunklineAdvanceDetailServiceImpl extends BaseServiceImpl records = pageList.getRecords(); //获取records所有元素的scanCode放入一个List List orderPackageCodes = records.stream().map(OrderDetailInfoVO::getOrderPackageCode).collect(Collectors.toList()); - //查询所有orderPackageCodes中包件最后一次的装车时间 - List carsLoadScanVOList = baseMapper.findCarsLoadScanInfoByOrderPackageCodes(orderPackageCodes); - //把carsLoadScanVOList转化成以scanCode为key的Map - Map carsLoadScanInfoMap = carsLoadScanVOList.stream().collect(Collectors.toMap(CarsLoadScanInfoVO::getScanCode, carsLoadScanInfoVO -> carsLoadScanInfoVO)); - records.forEach(orderDetailInfoVO -> { - String scanCode = orderDetailInfoVO.getOrderPackageCode(); - CarsLoadScanInfoVO carsLoadScanInfoVO = carsLoadScanInfoMap.get(scanCode); - if (Objects.nonNull(carsLoadScanInfoVO)) { - orderDetailInfoVO.setTrunklineCarsNo(carsLoadScanInfoVO.getLoadCode()); - orderDetailInfoVO.setScanStatus(carsLoadScanInfoVO.getScanStatus()); - orderDetailInfoVO.setTrunklineLoadingTime(carsLoadScanInfoVO.getCreateTime()); - orderDetailInfoVO.setTrunklineSignTime(carsLoadScanInfoVO.getSignTime()); - } - }); - pageList.setRecords(records); + if(CollUtil.isNotEmpty(orderPackageCodes)){ + //查询所有orderPackageCodes中包件最后一次的装车时间 + List carsLoadScanVOList = baseMapper.findCarsLoadScanInfoByOrderPackageCodes(orderPackageCodes); + //把carsLoadScanVOList转化成以scanCode为key的Map + Map carsLoadScanInfoMap = carsLoadScanVOList.stream().collect(Collectors.toMap(CarsLoadScanInfoVO::getScanCode, carsLoadScanInfoVO -> carsLoadScanInfoVO)); + records.forEach(orderDetailInfoVO -> { + String scanCode = orderDetailInfoVO.getOrderPackageCode(); + CarsLoadScanInfoVO carsLoadScanInfoVO = carsLoadScanInfoMap.get(scanCode); + if (Objects.nonNull(carsLoadScanInfoVO)) { + orderDetailInfoVO.setTrunklineCarsNo(carsLoadScanInfoVO.getLoadCode()); + orderDetailInfoVO.setScanStatus(carsLoadScanInfoVO.getScanStatus()); + orderDetailInfoVO.setTrunklineLoadingTime(carsLoadScanInfoVO.getCreateTime()); + orderDetailInfoVO.setTrunklineSignTime(carsLoadScanInfoVO.getSignTime()); + } + }); + pageList.setRecords(records); + } + return R.data(pageList); } diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadLineServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadLineServiceImpl.java index cdfcac177..62810602d 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadLineServiceImpl.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadLineServiceImpl.java @@ -83,4 +83,9 @@ public class TrunklineCarsLoadLineServiceImpl extends BaseServiceImpl orderPackageCodes = trunklineCarsLoadScanService.findPackageListByLoadId(loadId); diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/api/WarehouseTrayTypeApiController.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/api/WarehouseTrayTypeApiController.java index 55b39c4ba..ec3dc37ba 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/api/WarehouseTrayTypeApiController.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/api/WarehouseTrayTypeApiController.java @@ -135,6 +135,56 @@ public class WarehouseTrayTypeApiController { } + +// @ResponseBody +// @PostMapping("/orderScanTrayCode") +// @ApiOperationSupport(order = 1) +// @ApiOperation(value = "订单扫码托盘", notes = "传入trayTypeDTO") +// public R orderScanTrayCode(@RequestBody TrayTypeDTO trayTypeDTO) { +// String method = "###########orderScanTrayCode: "; +// log.info(method+"订单扫码托盘 trayTypeDTO={}",trayTypeDTO); +// String trayCode = trayTypeDTO.getTrayCode();//托盘码 +// //通过托盘码查询，当前托盘是否有货物，如果有就按照原来的托盘打包方式展示，如果没有就展示订单的打托方式 +// try{ +// +// //当前登录人选择的仓库 +// BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse(); +// if(Objects.isNull(myCurrentWarehouse)){ +// log.warn(method+"仓库信息为空 myCurrentWarehouse={}",myCurrentWarehouse); +// return R.fail(403,"仓库信息为空"); +// } +// +// if(StringUtil.isBlank(trayCode)){ +// log.warn(method+"托盘码不能为空 trayCode={}",trayCode); +// return R.fail(403,"托盘码不能为空"); +// } +// +// Map map = new HashMap<>(); +// //查询托盘是否被打托 +// TrayTypeDataVO trayTypeDataVO = warehouseTrayTypeService.getEntityByTrayCode(trayCode,myCurrentWarehouse.getId()); +// if(Objects.isNull(trayTypeDataVO)){ +// //如果没有对应数据就返回打托方式 +// List list = DictBizCache.getList(DictBizConstant.PALLET_ORDER_TYPE); +// map.put("isHasData",0); +// map.put("data",list); +// }else{ +// map.put("isHasData",1); +// map.put("data",trayTypeDataVO); +// } +// +// return R.data(map); +// }catch (CustomerException e){ +// log.warn(e.message); +// return R.fail(e.code,e.message); +// }catch (Exception e){ +// log.error(method+"系统异常，联系管理员",e); +// return R.fail(500,"系统异常，联系管理员"); +// } +// +// } + + + @ResponseBody @PostMapping("/orderDetail") @ApiOperationSupport(order = 1) diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseWaybillMapper.xml b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseWaybillMapper.xml index c4cfb66c8..790d4d50f 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseWaybillMapper.xml +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseWaybillMapper.xml @@ -604,10 +604,10 @@ and lww.check_time <= #{param.checkTimeEndDate} - and lww.Locate(#{param.agent},agent) > 0 + and Locate(#{param.agent},agent) > 0 - and lww.Locate(#{param.goodsName},goods_name) > 0 + and Locate(#{param.goodsName},goods_name) > 0 and lww.freeze_status = #{param.freezeStatus} @@ -871,10 +871,10 @@ and lww.check_time <= #{param.checkTimeEndDate} - and lww.Locate(#{param.agent},agent) > 0 + and Locate(#{param.agent},agent) > 0 - and lww.Locate(#{param.goodsName},goods_name) > 0 + and Locate(#{param.goodsName},goods_name) > 0 and lww.freeze_status = #{param.freezeStatus}