diff --git a/blade-service-api/logpm-factory-api/src/main/java/com/logpm/factory/mt/entity/MtFactoryOrderMain.java b/blade-service-api/logpm-factory-api/src/main/java/com/logpm/factory/mt/entity/MtFactoryOrderMain.java index db91893e1..912c16b92 100644 --- a/blade-service-api/logpm-factory-api/src/main/java/com/logpm/factory/mt/entity/MtFactoryOrderMain.java +++ b/blade-service-api/logpm-factory-api/src/main/java/com/logpm/factory/mt/entity/MtFactoryOrderMain.java @@ -14,6 +14,12 @@ import org.springblade.core.mp.base.BaseEntity; @EqualsAndHashCode(callSuper = true) public class MtFactoryOrderMain extends BaseEntity { + @ApiModelProperty(value = "供应基地编号") + private String siteCode; + + @ApiModelProperty(value = "供应基地") + private String siteName; + //@JsonProperty("发货单编号") @ApiModelProperty(value = "发货单编号") private String invoiceOrderCode; diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml index 9ac96eda4..792df3355 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml @@ -806,23 +806,24 @@ - select DISTINCT ldbs.bill_lading_id reservationId, GROUP_CONCAT(DISTINCT ldsa.mall_name SEPARATOR ',') customer, - ( - select count(id) - from logpm_distrilbution_bill_stock - where bill_lading_id = ldsi.reservation_id - ) orderNum, - + SELECT DISTINCT + ldbs.bill_lading_id reservationId, + GROUP_CONCAT( DISTINCT ldsa.mall_name SEPARATOR ',' ) customer, + ( SELECT count( id ) FROM logpm_distrilbution_bill_stock WHERE bill_lading_id = ldsi.reservation_id AND order_status IN ( 1, 3 ) ) orderNum, ( - select count(ldpl.id) - from logpm_distrilbution_bill_stock ldbs - LEFT JOIN logpm_distribution_parcel_list ldpl on ldpl.stock_article_id =ldbs.stock_article_id - where ldbs.bill_lading_id = ldsi.reservation_id + SELECT + IFNULL( sum( ldbl.packet_number ), 0 ) + FROM + logpm_distrilbution_bill_package ldbl + WHERE + ldbl.bill_lading_id = ldsi.reservation_id + AND ldbl.packet_bar_status IN ( 1, 3 ) + ) + ( + SELECT + IFNULL( sum( ldrzp.quantity ), 0 ) + FROM + logpm_distribution_reservation_zero_package AS ldrzp + WHERE + ldrzp.reservation_id = ldsi.reservation_id + AND ldrzp.type = 3 + AND ldrzp.zero_package_status IN ( 1, 3 ) ) planNum, - ( - select COUNT(id) - from logpm_distribution_stock - where bill_lading_id = ldbs.bill_lading_id - ) stockupNum,lds.stockup_status stockupStatus ,lds.type_service typeService, - ( - SELECT sum(lddd.quantity) - from logpm_distribution_delivery_details lddd - where lddd.bill_lading_id = ldsi.reservation_id - ) inventoryNub, - GROUP_CONCAT(DISTINCT ldsa.mall_name) mallName - from logpm_distribution_stockup lds - LEFT JOIN logpm_distribution_stockup_info ldsi on lds.id = ldsi.stockup_id - LEFT JOIN logpm_distrilbution_bill_stock ldbs on ldsi.reservation_id = ldbs.bill_lading_id - LEFT JOIN logpm_distribution_stock_article ldsa on ldsa.id = ldbs.stock_article_id - LEFT JOIN logpm_distribution_parcel_list ldpl on ldsa.id = ldpl.stock_article_id + ( SELECT COUNT( id ) FROM logpm_distribution_stock WHERE bill_lading_id = ldbs.bill_lading_id ) stockupNum, + lds.stockup_status stockupStatus, + lds.type_service typeService, + ( SELECT IFNULL( sum( lddd.quantity ), 0 ) FROM logpm_distribution_delivery_details lddd WHERE lddd.bill_lading_id = ldsi.reservation_id ) inventoryNub, + GROUP_CONCAT( DISTINCT ldsa.mall_name ) mallName + FROM + logpm_distribution_stockup lds + LEFT JOIN logpm_distribution_stockup_info ldsi ON lds.id = ldsi.stockup_id + LEFT JOIN logpm_distrilbution_bill_stock ldbs ON ldsi.reservation_id = ldbs.bill_lading_id + LEFT JOIN logpm_distribution_stock_article ldsa ON ldsa.id = ldbs.stock_article_id + LEFT JOIN logpm_distribution_parcel_list ldpl ON ldsa.id = ldpl.stock_article_id lds.id = #{param.stockupId} 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 01f28cdc0..653dc6d7f 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 @@ -2423,19 +2423,34 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl abnormalEntities = distributionLoadscanAbnormalService.list(Wrappers.query().lambda() .eq(DistributionLoadscanAbnormalEntity::getPackageCode, distrilbutionloadingscanDTO.getBarcode()) - .eq(DistributionLoadscanAbnormalEntity::getAuditingStatus, 1) +// .eq(DistributionLoadscanAbnormalEntity::getAuditingStatus, 1) //修改 状态 ); if (!abnormalEntities.isEmpty()) { - boolean flag = abnormalEntities.stream().allMatch(a -> deliveryListEntity.getId().equals(a.getDeliveryListId()) ); + //判断此包件的异常是否是当前扫描车次和客户 + //首先判断存在异常是否不属于当前车次和客户 + boolean flag = abnormalEntities.stream().allMatch(a -> !deliveryListEntity.getId().equals(a.getDeliveryListId()) && !distrilbutionloadingscanDTO.getReservationId().equals(a.getReservationId())); if (flag){ - return Resp.scanFail("包件已存在异常", "包件已存在异常"); + //该异常属于其他车次 + String collect = abnormalEntities.stream().map(DistributionLoadscanAbnormalEntity::getTrainNumber).collect(Collectors.joining(",")); + log.info("包件已在其他车次存在异常 >>>>当前车次:{},其他车次:{}",deliveryListEntity.getTrainNumber(),collect); + return Resp.scanFail("包件已在其他车次存在异常", "包件已在其他车次存在异常"); } - String collect = abnormalEntities.stream().map(DistributionLoadscanAbnormalEntity::getTrainNumber).collect(Collectors.joining(",")); - log.info("包件已在其他车次存在异常 >>>>当前车次:{},其他车次:{}",deliveryListEntity.getTrainNumber(),collect); - return Resp.scanFail("包件已在其他车次存在异常", "包件已在其他车次存在异常"); + //判断具体的装车信息 + + + +// boolean flag = abnormalEntities.stream().filter(f->f.getAuditingStatus() == 1).allMatch(a -> deliveryListEntity.getId().equals(a.getDeliveryListId()) && distrilbutionloadingscanDTO.getReservationId().equals(a.getReservationId())); +// if (flag){ +// //存在异常 进行异常签收还是异常装车区分 +// return Resp.scanFail("包件已存在异常", "包件已存在异常"); +// } +// String collect = abnormalEntities.stream().map(DistributionLoadscanAbnormalEntity::getTrainNumber).collect(Collectors.joining(",")); +// log.info("包件已在其他车次存在异常 >>>>当前车次:{},其他车次:{}",deliveryListEntity.getTrainNumber(),collect); +// return Resp.scanFail("包件已在其他车次存在异常", "包件已在其他车次存在异常"); } if (Func.isNotEmpty(list)) { //满足条件此码必定为库存品 @@ -3874,7 +3889,6 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl>用户名称:{}",user.getName()); } diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/comfac/service/impl/AsyncDataServiceImpl.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/comfac/service/impl/AsyncDataServiceImpl.java index 2f17982a0..75ec8e9f7 100644 --- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/comfac/service/impl/AsyncDataServiceImpl.java +++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/comfac/service/impl/AsyncDataServiceImpl.java @@ -623,7 +623,7 @@ public class AsyncDataServiceImpl implements IAsyncDataService { Long startWarehouseId = null; String startWarehouseName = null; String tenantId = null; - R r = factoryDataBaseClient.getWarehouseByBrandAndSiteName(BrandEnums.MTMM.getValue(), BrandEnums.MTMM.getValue()); + R r = factoryDataBaseClient.getWarehouseByBrandAndSiteName(BrandEnums.MTMM.getValue(), mtFactoryOrderMain.getSiteName()); if (cn.hutool.core.util.ObjectUtil.equal(HttpConstants.HTTP.HTTP_RESOURCE_CODE.SUCCESS_CODE, r.getCode())) { FactoryWarehouseBindVO data = r.getData(); if (cn.hutool.core.util.ObjectUtil.isNotNull(data)) { @@ -646,7 +646,7 @@ public class AsyncDataServiceImpl implements IAsyncDataService { } advanceEntity.setOrderType(""); advanceEntity.setBrand(BrandEnums.MTMM.getValue()); - advanceEntity.setSiteName(""); + advanceEntity.setSiteName(mtFactoryOrderMain.getSiteName()); advanceEntity.setArea(""); advanceEntity.setTotalNum(Integer.parseInt(mtFactoryOrder.getQuantity())); advanceEntity.setPackName(""); @@ -1506,7 +1506,7 @@ public class AsyncDataServiceImpl implements IAsyncDataService { private Integer addAdvanceEntity(MtFactoryOrderMain mtFactoryOrderMain, MtFactoryOrder mtFactoryOrder) { AdvanceEntity advanceEntity = new AdvanceEntity(); advanceEntity.setOrderSelfNum(StringUtil.isBlank(mtFactoryOrder.getOrderCode()) ? "" : mtFactoryOrder.getOrderCode()); //订单自编号 - advanceEntity.setSiteName(""); // 基地 TODO 需要映射 + advanceEntity.setSiteName(mtFactoryOrderMain.getSiteName()); // 基地 advanceEntity.setArea(""); // 区域 advanceEntity.setOrderTypeName(""); //订单类型名称 可以为空 advanceEntity.setOrderClassName("工厂"); //订单类型 可以为空 @@ -1517,7 +1517,6 @@ public class AsyncDataServiceImpl implements IAsyncDataService { advanceEntity.setMctsTruckNo(mtFactoryOrderMain.getSendCarNumber());// 车牌//字段没有了 advanceEntity.setFirstPackName(""); //一级品类 advanceEntity.setFirstPackCode(""); //一级品类 - advanceEntity.setDealerName(mtFactoryOrder.getDealerName()); //商场名称 advanceEntity.setDealerCode(StringUtil.isBlank(mtFactoryOrder.getDealerCode()) ? "" : mtFactoryOrder.getDealerCode()); //商场编码 @@ -1559,7 +1558,14 @@ public class AsyncDataServiceImpl implements IAsyncDataService { advanceEntity.setDeleteTime(0); // 删除时间 advanceEntity.setWaybillNo("");//运单号 可以为空 // Integer id = PanFactoryEnum.getId(panFactoryOrder.getPlantId()); - advanceEntity.setWarehouseId(141); //导入人仓库id TODO 需要提供映射 + // 推老系统中对应的仓库id 梦天重庆仓 151 梦天潜江仓 141 + if (Objects.equals("HYXINQI", mtFactoryOrderMain.getSiteCode())) { + // 重庆 + advanceEntity.setWarehouseId(151); //导入人仓库id + } else { + // 潜江 + advanceEntity.setWarehouseId(141); //导入人仓库id + } advanceEntity.setWaybillStatus(Integer.parseInt("1"));//开单状态：1=未开单，2=已开单 advanceEntity.setOldId(0);// advanceEntity.setFreeze(Integer.parseInt("1"));//冻结状态：1=正常，2=冻结 diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/dto/MtFactoryOrderMainDTO.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/dto/MtFactoryOrderMainDTO.java index 6d69c9483..29f47fae8 100644 --- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/dto/MtFactoryOrderMainDTO.java +++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/dto/MtFactoryOrderMainDTO.java @@ -12,6 +12,14 @@ import java.io.Serializable; @Data public class MtFactoryOrderMainDTO implements Serializable { + @JsonProperty("供应基地编号") + @ApiModelProperty(value = "供应基地编号") + private String siteCode; + + @JsonProperty("供应基地") + @ApiModelProperty(value = "供应基地") + private String siteName; + @JsonProperty("发货单编号") @ApiModelProperty(value = "发货单编号") private String invoiceOrderCode;