diff --git a/blade-service-api/logpm-basic-api/src/main/java/com/logpm/basic/entity/BasicMaterialEntity.java b/blade-service-api/logpm-basic-api/src/main/java/com/logpm/basic/entity/BasicMaterialEntity.java index 970375b3f..2fd2ec166 100644 --- a/blade-service-api/logpm-basic-api/src/main/java/com/logpm/basic/entity/BasicMaterialEntity.java +++ b/blade-service-api/logpm-basic-api/src/main/java/com/logpm/basic/entity/BasicMaterialEntity.java @@ -116,9 +116,9 @@ public class BasicMaterialEntity extends TenantEntity { @ApiModelProperty(value = "体积") private String volume; /** - * 总量 + * 重量 */ - @ApiModelProperty(value = "总量") + @ApiModelProperty(value = "重量") private String weight; /** * 备注 diff --git a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/TrayTypeDataListVO.java b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/TrayTypeDataListVO.java index b09addf4d..7d87669ac 100644 --- a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/TrayTypeDataListVO.java +++ b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/TrayTypeDataListVO.java @@ -11,6 +11,7 @@ public class TrayTypeDataListVO implements Serializable { private Long trayGoodsId;//id private Long dataId;//id + private String waybillNo;//运单号 private String dataCode;//编码 private String dataName;//名称 private String sku;//sku diff --git a/blade-service/logpm-basic/src/main/java/com/logpm/basic/controller/BasicMaterialController.java b/blade-service/logpm-basic/src/main/java/com/logpm/basic/controller/BasicMaterialController.java index 42ea59835..ccc81b333 100644 --- a/blade-service/logpm-basic/src/main/java/com/logpm/basic/controller/BasicMaterialController.java +++ b/blade-service/logpm-basic/src/main/java/com/logpm/basic/controller/BasicMaterialController.java @@ -190,7 +190,7 @@ public class BasicMaterialController extends BladeController { basicMaterialExcel.setVolume("1.489792"); basicMaterialExcel.setLogpmUnit("1"); basicMaterialExcel.setPackageNum("3"); - basicMaterialExcel.setWeight(BigDecimal.valueOf(0)); + basicMaterialExcel.setWeight("2.33"); list.add(basicMaterialExcel); ExcelUtil.export(response, "物料基础信息数据模板" + DateUtil.time(), "物料基础信息数据模板表", list, BasicMaterialExcel.class); } diff --git a/blade-service/logpm-basic/src/main/java/com/logpm/basic/excel/BasicMaterialExcel.java b/blade-service/logpm-basic/src/main/java/com/logpm/basic/excel/BasicMaterialExcel.java index 08d6f0199..4fb0a1745 100644 --- a/blade-service/logpm-basic/src/main/java/com/logpm/basic/excel/BasicMaterialExcel.java +++ b/blade-service/logpm-basic/src/main/java/com/logpm/basic/excel/BasicMaterialExcel.java @@ -154,11 +154,11 @@ public class BasicMaterialExcel implements Serializable { @ExcelProperty("体积") private String volume; /** - * 总量 + * 重量 */ @ColumnWidth(20) - @ExcelProperty("总量") - private BigDecimal weight; + @ExcelProperty("重量") + private String weight; /** * 备注 */ diff --git a/blade-service/logpm-basic/src/main/java/com/logpm/basic/service/impl/BasicMaterialServiceImpl.java b/blade-service/logpm-basic/src/main/java/com/logpm/basic/service/impl/BasicMaterialServiceImpl.java index 97d6d92ec..cd4c9407a 100644 --- a/blade-service/logpm-basic/src/main/java/com/logpm/basic/service/impl/BasicMaterialServiceImpl.java +++ b/blade-service/logpm-basic/src/main/java/com/logpm/basic/service/impl/BasicMaterialServiceImpl.java @@ -73,7 +73,7 @@ public class BasicMaterialServiceImpl extends BaseServiceImpl data) { - log.info("传入参数>>>>>>>>>>>>>>>>,>>>>>>>>{}",data); + log.info("传入参数>>>>>>>>>>>>>>>>>>>>>>>{}",data); ArrayList arrayList = new ArrayList<>(); for (BasicMaterialExcel datum : data) { //去重 diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataGoodsAreaServiceImpl.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataGoodsAreaServiceImpl.java index 168260807..c1078f39e 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataGoodsAreaServiceImpl.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataGoodsAreaServiceImpl.java @@ -315,7 +315,7 @@ public class BasicdataGoodsAreaServiceImpl extends BaseServiceImpl basicdataGoodsAreaEntities = basicdataGoodsAreaMapper.selectList(new QueryWrapper().lambda() .eq(BasicdataGoodsAreaEntity::getIsDeleted,0) - .in(BasicdataGoodsAreaEntity::getWarehouseId,collect) + .in(collect.size()>0,BasicdataGoodsAreaEntity::getWarehouseId,collect) ); return basicdataGoodsAreaEntities; } 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 d025e18f6..3fd1302ed 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 @@ -852,19 +852,19 @@ public class AsyncDataServiceImpl implements IAsyncDataService { } /** - * 获取订单对象 加入了缓存 - * - * @param orderSelfNum + * 获取订单缓存对象 + * @param receiptId 收货任务ID + * @param orderSelfNum 订单自编号 + * @param departCode 发车单号 * @return */ private AdvanceEntity findAdvanceEntityUseCacheByOrderSelfNumAndReceiptId(Long receiptId,String orderSelfNum,String departCode) { String key = AdvanceEntity.class.getName() + ":"+receiptId + orderSelfNum + ":" + departCode; - AdvanceEntity advanceEntity = bladeRedis.get(key); -// if (ObjectUtils.isNull(advanceEntity)) { + // if (ObjectUtils.isNull(advanceEntity)) { //// advanceEntity = iAdvanceClient.getEntityByMctsTruck(orderSelfNum,departCode); //// bladeRedis.setEx(key, advanceEntity, 12 * 60 * 60L); // } - return advanceEntity; + return bladeRedis.get(key); } private AdvanceEntity saveAdvanceInfor(ZbOrderPackageEntity serviceNumEntity, List zbOrderPackageEntityList) { @@ -874,7 +874,7 @@ public class AsyncDataServiceImpl implements IAsyncDataService { // 查询订单对应的发货单 ZbReceiptEntity zbReceiptEntity = findZbReceiptEntityUseCacheById(serviceNumEntity.getReceiptId()); - AdvanceEntity advanceEntity = findAdvanceEntityUseCacheByOrderSelfNumAndReceiptId(serviceNumEntity.getReceiptId(),serviceNumEntity.getRelationOrderCode(),zbReceiptEntity.getDepartCode()); + AdvanceEntity advanceEntity = findAdvanceEntityUseCacheByOrderSelfNumAndReceiptId(serviceNumEntity.getReceiptId(),serviceNumEntity.getPlatformOrderCode(),zbReceiptEntity.getDepartCode()); if (ObjectUtils.isNotNull(advanceEntity)) { return advanceEntity; } @@ -883,13 +883,13 @@ public class AsyncDataServiceImpl implements IAsyncDataService { //添加订单信息 advanceEntity = new AdvanceEntity(); - advanceEntity.setOrderSelfNum(StringUtil.isBlank(serviceNumEntity.getRelationOrderCode()) ? "" : serviceNumEntity.getRelationOrderCode()); //订单自编号 + advanceEntity.setOrderSelfNum(StringUtil.isBlank(serviceNumEntity.getPlatformOrderCode()) ? "" : serviceNumEntity.getPlatformOrderCode()); //订单自编号 advanceEntity.setSiteName(""); // 基地 advanceEntity.setArea(""); // 区域 advanceEntity.setOrderTypeName(zbReceiptEntity.getOrderType()); //订单类型名称 可以为空 advanceEntity.setOrderClassName("工厂"); //订单类型 可以为空 advanceEntity.setType(FactoryConstant.ZHIBANG); - int num = mathTotalOrderPackageNum(serviceNumEntity.getRelationOrderCode(), zbOrderPackageEntityList); + int num = mathTotalOrderPackageNum(serviceNumEntity.getPlatformOrderCode(), zbOrderPackageEntityList); advanceEntity.setTotal(num); //订单总数据 advanceEntity.setMctsTruck(StringUtil.isBlank(zbReceiptEntity.getDepartCode()) ? "" : zbReceiptEntity.getDepartCode()); //车次 advanceEntity.setMctsTruckNo(zbReceiptEntity.getCarNumber()); @@ -909,7 +909,7 @@ public class AsyncDataServiceImpl implements IAsyncDataService { advanceEntity.setStoreNo(StringUtil.isBlank(serviceNumEntity.getCustomerCode()) ? "" : serviceNumEntity.getCustomerCode()); //门店编码 advanceEntity.setStoreName(serviceNumEntity.getCustomerName()); //门店名称 advanceEntity.setSerialKey(""); //序列号 - advanceEntity.setServiceNum(StringUtil.isBlank(serviceNumEntity.getPlatformOrderCode()) ? "" : serviceNumEntity.getPlatformOrderCode()); //服务号 + advanceEntity.setServiceNum(StringUtil.isBlank(serviceNumEntity.getRelationOrderCode()) ? "" : serviceNumEntity.getRelationOrderCode()); //服务号 advanceEntity.setMatingCode("");//齐套模式 可以为空 advanceEntity.setContractNum("");//合同号 可以为空 advanceEntity.setLeaveBehind(serviceNumEntity.getLegacyFlag());//遗留：Y=是，N=否 @@ -933,7 +933,7 @@ public class AsyncDataServiceImpl implements IAsyncDataService { Integer advanceId = iAdvanceClient.addAdvanceClient(advanceEntity); advanceEntity.setId(advanceId); - String key = AdvanceEntity.class.getName() + ":"+serviceNumEntity.getReceiptId() + serviceNumEntity.getRelationOrderCode() + ":" + zbReceiptEntity.getDepartCode(); + String key = AdvanceEntity.class.getName() + ":"+serviceNumEntity.getReceiptId() + serviceNumEntity.getPlatformOrderCode() + ":" + zbReceiptEntity.getDepartCode(); // 加入缓存 1小时的缓存 bladeRedis.setEx(key, advanceEntity, 60*60L); @@ -952,7 +952,7 @@ public class AsyncDataServiceImpl implements IAsyncDataService { private int mathTotalOrderPackageNum(String orderNum, List zbOrderPackageEntityList) { int totalPackageNum = 0; for (ZbOrderPackageEntity entity : zbOrderPackageEntityList) { - if (entity.getRelationOrderCode().equals(orderNum)) { + if (entity.getPlatformOrderCode().equals(orderNum)) { totalPackageNum++; } } diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/comfac/service/impl/FactoryAuthServiceImpl.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/comfac/service/impl/FactoryAuthServiceImpl.java index 9829324ef..5cefd57fc 100644 --- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/comfac/service/impl/FactoryAuthServiceImpl.java +++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/comfac/service/impl/FactoryAuthServiceImpl.java @@ -56,7 +56,7 @@ public class FactoryAuthServiceImpl implements IFactoryAuthService { //查询是否有当前账户的token数据 QueryWrapper queryTokenWrapper = new QueryWrapper<>(); - queryWrapper.eq("corpid",corpId); + queryTokenWrapper.eq("corpid",corpId); FactoryToken factoryToken = factoryTokenService.getOne(queryTokenWrapper); if(Objects.isNull(factoryToken)){ factoryToken = new FactoryToken(); diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/config/InterceptorAdapterConfig.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/config/InterceptorAdapterConfig.java index 52487f82e..c775cf98a 100644 --- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/config/InterceptorAdapterConfig.java +++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/config/InterceptorAdapterConfig.java @@ -26,7 +26,7 @@ public class InterceptorAdapterConfig implements WebMvcConfigurer { excludePathPatterns("/factory/oupai/**"). excludePathPatterns("/factory/zb/**") .excludePathPatterns("/factory/common/**"); - InterceptorRegistration registryZbFactory = interceptorRegistry.addInterceptor(new ZbFactoryAccountsInterceptor(zbFactoryProperties)); - registryZbFactory.addPathPatterns("/factory/zb/**"); +// InterceptorRegistration registryZbFactory = interceptorRegistry.addInterceptor(new ZbFactoryAccountsInterceptor(zbFactoryProperties)); +// registryZbFactory.addPathPatterns("/factory/zb/**"); } } diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/receiver/OpReceivingDataHandler.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/receiver/OpReceivingDataHandler.java index 75ccbe9ed..196b2057a 100644 --- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/receiver/OpReceivingDataHandler.java +++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/receiver/OpReceivingDataHandler.java @@ -5,13 +5,13 @@ import com.logpm.factory.pan.service.IPanFactoryDataService; import com.rabbitmq.client.Channel; import lombok.extern.slf4j.Slf4j; import org.springblade.common.constant.RabbitConstant; +import org.springblade.common.exception.CustomerException; import org.springframework.amqp.core.Message; import org.springframework.amqp.rabbit.annotation.RabbitHandler; import org.springframework.amqp.rabbit.annotation.RabbitListener; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import java.io.IOException; import java.util.Map; @@ -40,9 +40,11 @@ public class OpReceivingDataHandler { try { panFactoryDataService.handleDataToPlatform(orderPackageCode, receivingTime); - } catch (Exception e) { + } catch (CustomerException e) { log.error("##################opReceivingDataHandler: 处理欧派收货数据到新系统,orderPackageCode:{},receivingTime:{},msg:{}", - orderPackageCode,receivingTime,e.getMessage()); + orderPackageCode,receivingTime,e.message); + } catch (Exception e) { + log.error("##################opReceivingDataHandler: 处理欧派收货数据到新系统",e); } } diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/service/impl/OuPaiFactoryServiceImpl.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/service/impl/OuPaiFactoryServiceImpl.java index a62e56a99..245563461 100644 --- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/service/impl/OuPaiFactoryServiceImpl.java +++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/service/impl/OuPaiFactoryServiceImpl.java @@ -147,7 +147,7 @@ public class OuPaiFactoryServiceImpl implements IOuPaiFactoryService { if (Objects.isNull(packageEntity)) { log.warn("############oid 查询数据失败: {}", key); // 查询欧派系统的的数据 - String url = ouPaiProperties.getUri() + "tims_odata_api/api/odata/Package(" + key + ")?select=Code,PackageStatus,FirstClassCode,FirstClassName,SecondClassCode,SecondClassName,ThirdClassCode,ThirdClassName,BuyIn,CosourcingCode,CosourcingUnit,Length,Width,Height,Weight,IsInventory,SendTime,ReceivingTime,CreateTime,ShipTime,CarNumber,DeliveryMethod&$expand=ReceivingOrders($select=Code,Type,Status,Plate,PackagesCount,ReceivePackageCount,PlateNum,CarNumber,CarrierCode,SendTime,ArrivalTime,ReceiveTime,CreateTime,ReturnNumber;$expand=EndWarehouse($select=Name,Code))&$expand=Order($select=SelfCode,Code)"; + String url = ouPaiProperties.getUri() + "tims_odata_api/api/odata/Package(" + key + ")?select=Code,PackageStatus,FirstClassCode,FirstClassName,SecondClassCode,SecondClassName,ThirdClassCode,ThirdClassName,PackageDetailNames,BuyIn,CosourcingCode,CosourcingUnit,Length,Width,Height,Weight,IsInventory,SendTime,ReceivingTime,CreateTime,ShipTime,CarNumber,DeliveryMethod&$expand=ReceivingOrders($select=Code,Type,Status,Plate,PackagesCount,ReceivePackageCount,PlateNum,CarNumber,CarrierCode,SendTime,ArrivalTime,ReceiveTime,CreateTime,ReturnNumber;$expand=EndWarehouse($select=Name,Code)&$expand=FromWarehouse($select=Name,Code)&$expand=CurrentWarehouse($select=Name,Code))&$expand=Order($select=SelfCode,Code)"; OpOrderStatusLogEntity opOrderStatusLogEntity = sendRequestData(url, event); JSONObject jsonObject = JSONObject.parseObject(opOrderStatusLogEntity.getResponseBody()); diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/pan/service/impl/PanFactoryDataServiceImpl.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/pan/service/impl/PanFactoryDataServiceImpl.java index 40c24dc95..4e2348f23 100644 --- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/pan/service/impl/PanFactoryDataServiceImpl.java +++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/pan/service/impl/PanFactoryDataServiceImpl.java @@ -37,7 +37,6 @@ import com.logpm.factory.snm.entity.PanPackageInfo; import com.logpm.factory.snm.entity.PanPackageList; import com.logpm.oldproject.entity.AdvanceDetailEntity; import com.logpm.oldproject.entity.AdvanceEntity; -import com.logpm.oldproject.entity.OrderDetailEntity; import com.logpm.oldproject.entity.WayBillEntity; import com.logpm.oldproject.feign.*; import com.logpm.oldproject.vo.DistributionParcelListEntityVO; @@ -462,13 +461,12 @@ public class PanFactoryDataServiceImpl implements IPanFactoryDataService { distributionStockArticleEntity.setGenre(1); distributionStockArticleEntity.setAdvanceId(advanceId); //--------------2023-07-06 新增字段处理 - //查询包条码对应的运单信息 - OrderDetailEntity orderDetailEntity = orderDetailClient.findByUnitNo(unitNo); - + //查询包条码对应的运单信息 + waybillNoNum = supplyData.get("logiBillNo"); //存入运单信息 - saveWaybillEntity(orderDetailEntity.getWaybillNo()); - waybillNoNum = orderDetailEntity.getWaybillNo(); + saveWaybillEntity(waybillNoNum ); + // 增加订单 经销商信息 和门店信息 buildDealerAndStore(distributionStockArticleEntity, advanceEntity); @@ -575,59 +573,63 @@ public class PanFactoryDataServiceImpl implements IPanFactoryDataService { DistributionParcelListEntityVO vo = advanceDetailClient.getByUnitNo(unitNo); // WarehouseWaybillEntity warehouseWaybill = warehouseWaybillClient.findByWaybillNo(waybillNo); - DistributionParcelListEntity entity = new DistributionParcelListEntity(); - BeanUtil.copyProperties(vo, entity); - entity.setOrderPackageCode(vo.getPacketBarCode()); - entity.setConditions(1); - entity.setWarehouse(distributionStockArticleEntity.getWarehouse()); - entity.setWarehouseId(distributionStockArticleEntity.getWarehouseId()); - entity.setStockArticleId(distributionStockArticleEntity.getId()); - entity.setOrderPackageStatus(OrderPackageStatusConstant.yiruku.getValue()); - entity.setOrderPackageFreezeStatus(OrderPackageFreezeStatusConstant.weidongjie.getValue()); - entity.setOrderPackageReservationStatus(OrderPackageReservationStatusConstant.daiyuyue.getValue()); - entity.setOrderPackageGroundingStatus(OrderPackageGroundingStatusConstant.daishangjia.getValue()); - entity.setOrderPackageStockupStatus(OrderPackageStockupStatusConstant.daibeihuo.getValue()); - entity.setOrderCode(distributionStockArticleEntity.getOrderCode()); - entity.setServiceNumber(distributionStockArticleEntity.getServiceNumber()); - entity.setWaybillNumber(waybillNo); + if(Objects.isNull(vo)){ + logger.warn("##############saveOrderPackage: 未在老系统查询到包件数据 unitNo={}",unitNo); + }else{ + DistributionParcelListEntity entity = new DistributionParcelListEntity(); + BeanUtil.copyProperties(vo, entity); + entity.setOrderPackageCode(vo.getPacketBarCode()); + entity.setConditions(1); + entity.setWarehouse(distributionStockArticleEntity.getWarehouse()); + entity.setWarehouseId(distributionStockArticleEntity.getWarehouseId()); + entity.setStockArticleId(distributionStockArticleEntity.getId()); + entity.setOrderPackageStatus(OrderPackageStatusConstant.yiruku.getValue()); + entity.setOrderPackageFreezeStatus(OrderPackageFreezeStatusConstant.weidongjie.getValue()); + entity.setOrderPackageReservationStatus(OrderPackageReservationStatusConstant.daiyuyue.getValue()); + entity.setOrderPackageGroundingStatus(OrderPackageGroundingStatusConstant.daishangjia.getValue()); + entity.setOrderPackageStockupStatus(OrderPackageStockupStatusConstant.daibeihuo.getValue()); + entity.setOrderCode(distributionStockArticleEntity.getOrderCode()); + entity.setServiceNumber(distributionStockArticleEntity.getServiceNumber()); + entity.setWaybillNumber(waybillNo); // if(ObjectUtil.isNotEmpty(warehouseWaybill)){ // entity.setWarehouseId(warehouseWaybill.getId()); // } - // 增加 进销商 名称 编码 发站仓 + // 增加 进销商 名称 编码 发站仓 - entity.setSendWarehouseName(distributionStockArticleEntity.getSendWarehouseName()); - entity.setSendWarehouseId(distributionStockArticleEntity.getSendWarehouseId()); + entity.setSendWarehouseName(distributionStockArticleEntity.getSendWarehouseName()); + entity.setSendWarehouseId(distributionStockArticleEntity.getSendWarehouseId()); - //收货仓库 - entity.setAcceptWarehouseName(distributionStockArticleEntity.getAcceptWarehouseName()); - entity.setAcceptWarehouseId(distributionStockArticleEntity.getAcceptWarehouseId()); + //收货仓库 + entity.setAcceptWarehouseName(distributionStockArticleEntity.getAcceptWarehouseName()); + entity.setAcceptWarehouseId(distributionStockArticleEntity.getAcceptWarehouseId()); - //进销售 - entity.setDealerCode(distributionStockArticleEntity.getDealerCode()); - entity.setDealerName(distributionStockArticleEntity.getDealerName()); - entity.setWarehouseEntryTimeEnd(CommonUtil.StringToDate(operationTime)); + //进销售 + entity.setDealerCode(distributionStockArticleEntity.getDealerCode()); + entity.setDealerName(distributionStockArticleEntity.getDealerName()); + entity.setWarehouseEntryTimeEnd(CommonUtil.StringToDate(operationTime)); - // 绑定部门--仓库 - if (!Objects.isNull(basicdataWarehouseEntity)) { - entity.setCreateDept(basicdataWarehouseEntity.getDepartment()); - } - entity.setCreateUser(1123598821738675201L); - entity.setTenantId(TenantNum.HUITONGCODE); - if (StringUtil.isNoneBlank(entity.getMaterialName()) && StringUtil.isNoneBlank(entity.getMaterialCode())) { - // 查询物料信息 - String sku = ""; - BasicMaterialEntity basicMaterialEntity = basicMaterialClient.getMaterialOwn(entity.getMaterialCode(), entity.getMaterialName(), sku); - if (ObjectUtils.isNotNull(basicMaterialEntity)) { - entity.setMaterialId(basicdataWarehouseEntity.getId()); - entity.setMaterialCode(basicMaterialEntity.getProductCode()); - entity.setMaterialUnit(basicMaterialEntity.getLogpmUnit()); + // 绑定部门--仓库 + if (!Objects.isNull(basicdataWarehouseEntity)) { + entity.setCreateDept(basicdataWarehouseEntity.getDepartment()); + } + entity.setCreateUser(1123598821738675201L); + entity.setTenantId(TenantNum.HUITONGCODE); + if (StringUtil.isNoneBlank(entity.getMaterialName()) && StringUtil.isNoneBlank(entity.getMaterialCode())) { + // 查询物料信息 + String sku = ""; + BasicMaterialEntity basicMaterialEntity = basicMaterialClient.getMaterialOwn(entity.getMaterialCode(), entity.getMaterialName(), sku); + if (ObjectUtils.isNotNull(basicMaterialEntity)) { + entity.setMaterialId(basicMaterialEntity.getId()); + entity.setMaterialCode(basicMaterialEntity.getProductCode()); + entity.setMaterialUnit(basicMaterialEntity.getLogpmUnit()); + } + } + boolean b = distributionParcelListClient.add(entity); + if (!b) { + logger.warn("#################handleDataToPlatform: 保存包件信息失败 orderCode={}", entity.getOrderCode()); + throw new CustomerException(405, "保存包件信息失败"); } - } - boolean b = distributionParcelListClient.add(entity); - if (!b) { - logger.warn("#################handleDataToPlatform: 保存包件信息失败 orderCode={}", entity.getOrderCode()); - throw new CustomerException(405, "保存包件信息失败"); } } diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/receiver/UnloadCarComHandler.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/receiver/UnloadCarComHandler.java index ae87b6573..4a85e02ec 100644 --- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/receiver/UnloadCarComHandler.java +++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/receiver/UnloadCarComHandler.java @@ -112,8 +112,8 @@ public class UnloadCarComHandler { /** * 根基匹配到的发货单编号 推送梦天 * - * @param carNum - * @param completeDate + * @param carNum 车次号 + * @param completeDate 完成时间 * @throws ParseException * @throws NoSuchAlgorithmException * @throws JsonProcessingException diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/zb/controller/ZbFactoryDataController.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/zb/controller/ZbFactoryDataController.java index b2026adf1..3b9213260 100644 --- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/zb/controller/ZbFactoryDataController.java +++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/zb/controller/ZbFactoryDataController.java @@ -30,6 +30,7 @@ import java.io.File; import java.io.FileInputStream; import java.io.InputStream; import java.io.OutputStream; +import java.nio.file.Files; import java.util.Objects; /** @@ -94,10 +95,6 @@ public class ZbFactoryDataController { zbFactoryLogService.save(zbFactoryLogEntity); - - - - // orderStatusLogService.save(orderStatusLog); // //判断数据是否已存入 @@ -149,8 +146,9 @@ public class ZbFactoryDataController { , MediaType.MULTIPART_FORM_DATA_VALUE , true , file.getName()); - try (InputStream input = new FileInputStream(file); - OutputStream os = item.getOutputStream()) { + try ( + InputStream input = Files.newInputStream(file.toPath()); + OutputStream os = item.getOutputStream()) { // 流转移 IOUtils.copy(input, os); } catch (Exception e) { diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseGoodsAllocationMapper.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseGoodsAllocationMapper.java index 25cc11905..8115963b9 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseGoodsAllocationMapper.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseGoodsAllocationMapper.java @@ -167,4 +167,6 @@ public interface WarehouseGoodsAllocationMapper extends BaseMapper selectIsStocking(@Param("allocationId") Long allocationId); + + Integer selectOrderNum(@Param("id") Long id); } diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseGoodsAllocationMapper.xml b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseGoodsAllocationMapper.xml index db4a407ef..3897c842b 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseGoodsAllocationMapper.xml +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseGoodsAllocationMapper.xml @@ -19,8 +19,7 @@ FROM logpm_warehouse_goods_allocation ${ew.customSqlSegment} + diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseTrayGoodsMapper.xml b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseTrayGoodsMapper.xml index c2cae2b7b..0d4bb0911 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseTrayGoodsMapper.xml +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseTrayGoodsMapper.xml @@ -50,6 +50,7 @@ select ldsa.order_code orderCode, + ldsa.waybill_number waybillNo, lwtg.tray_code trayCode, 2 goodsType, lwtg.num shelfNum, diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseTrayTypeMapper.xml b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseTrayTypeMapper.xml index db51cc139..3d457720e 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseTrayTypeMapper.xml +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseTrayTypeMapper.xml @@ -60,7 +60,8 @@