From d66d71219f0f052d238aad70321ad0b6724de14a Mon Sep 17 00:00:00 2001 From: "0.0" <1092404103.qq.com> Date: Mon, 9 Oct 2023 10:39:56 +0800 Subject: [PATCH 01/11] =?UTF-8?q?1.=E5=8F=AF=E8=A7=86=E5=8C=96=E9=87=8D?= =?UTF-8?q?=E6=96=B0=E8=AE=A1=E7=AE=97=E6=95=B0=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/WarehouseGoodsAllocationMapper.java | 2 ++ .../mapper/WarehouseGoodsAllocationMapper.xml | 12 ++++++++++-- .../impl/WarehouseGoodsAllocationServiceImpl.java | 4 +++- 3 files changed, 15 insertions(+), 3 deletions(-) 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/service/impl/WarehouseGoodsAllocationServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseGoodsAllocationServiceImpl.java index 2fd12ccf7..891cb8d5c 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseGoodsAllocationServiceImpl.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseGoodsAllocationServiceImpl.java @@ -398,7 +398,9 @@ public class WarehouseGoodsAllocationServiceImpl extends BaseServiceImpl Date: Mon, 9 Oct 2023 13:32:06 +0800 Subject: [PATCH 02/11] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E6=AC=A7=E6=B4=BE?= =?UTF-8?q?=E7=9A=84=E6=95=B0=E6=8D=AE=E6=9F=A5=E8=AF=A2=20=E6=B2=A1?= =?UTF-8?q?=E6=9C=89=E5=A2=9E=E5=8A=A0=E5=88=B0=E4=BB=93=E5=BA=93=20?= =?UTF-8?q?=E5=92=8C=E5=BF=97=E9=82=A6=E6=95=B0=E6=8D=AE=E6=8E=A8=E9=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/AsyncDataServiceImpl.java | 22 +++++++++---------- .../service/impl/OuPaiFactoryServiceImpl.java | 2 +- .../factory/receiver/UnloadCarComHandler.java | 4 ++-- .../controller/ZbFactoryDataController.java | 10 ++++----- .../impl/WarehouseWaybillServiceImpl.java | 9 +++----- 5 files changed, 21 insertions(+), 26 deletions(-) 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..b0247882e 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=否 @@ -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/oupai/service/impl/OuPaiFactoryServiceImpl.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/service/impl/OuPaiFactoryServiceImpl.java index a62e56a99..d401552c0 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,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/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/service/impl/WarehouseWaybillServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWaybillServiceImpl.java index 4b38338d5..30685ad9b 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWaybillServiceImpl.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWaybillServiceImpl.java @@ -184,11 +184,9 @@ public class WarehouseWaybillServiceImpl extends BaseServiceImpl queryWrapper = new QueryWrapper<>(); queryWrapper.eq("waybill_no", waybillNo); - WarehouseWaybillEntity warehouseWaybillEntity = warehouseWaybillMapper.selectOne(queryWrapper); - return warehouseWaybillEntity; + return warehouseWaybillMapper.selectOne(queryWrapper); } @Override From c6e74c14c83592104ef8a54465718ed192794c42 Mon Sep 17 00:00:00 2001 From: zhenghaoyu Date: Mon, 9 Oct 2023 13:37:46 +0800 Subject: [PATCH 03/11] =?UTF-8?q?1.=E6=AC=A7=E6=B4=BE=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E6=89=93=E5=8D=B0=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../factory/oupai/receiver/OpReceivingDataHandler.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) 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); } } From 9bb899c1e20b4df9defe023c017ea4802c4dd016 Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" <123456> Date: Mon, 9 Oct 2023 14:07:43 +0800 Subject: [PATCH 04/11] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E5=BF=97=E9=82=A6?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=95=B0=E6=8D=AE=E5=AF=B9=E5=BA=94=E7=9A=84?= =?UTF-8?q?key?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../factory/comfac/service/impl/AsyncDataServiceImpl.java | 2 +- .../com/logpm/factory/config/InterceptorAdapterConfig.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) 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 b0247882e..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 @@ -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); 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/**"); } } From d3065107c79227426e2de33e817e2c5bf2f2da1b Mon Sep 17 00:00:00 2001 From: "0.0" <1092404103.qq.com> Date: Mon, 9 Oct 2023 16:08:50 +0800 Subject: [PATCH 05/11] =?UTF-8?q?1.=E7=89=A9=E6=96=99=E9=87=8D=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/logpm/basic/entity/BasicMaterialEntity.java | 4 ++-- .../logpm/basic/controller/BasicMaterialController.java | 2 +- .../java/com/logpm/basic/excel/BasicMaterialExcel.java | 6 +++--- .../basic/service/impl/BasicMaterialServiceImpl.java | 2 +- .../service/impl/BasicdataGoodsAreaServiceImpl.java | 2 +- .../service/impl/WarehouseUpdownGoodsLogServiceImpl.java | 9 ++++++++- 6 files changed, 16 insertions(+), 9 deletions(-) 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/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 02275225d..cda183080 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-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownGoodsLogServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownGoodsLogServiceImpl.java index 59ca95347..c0a32bcb0 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownGoodsLogServiceImpl.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownGoodsLogServiceImpl.java @@ -28,7 +28,10 @@ import com.logpm.warehouse.mapper.WarehouseUpdownGoodsLogMapper; import com.logpm.warehouse.service.IWarehouseUpdownGoodsLogService; import com.logpm.warehouse.vo.WarehouseUpdownGoodsLogVO; import lombok.AllArgsConstructor; +import lombok.extern.log4j.Log4j2; import org.springblade.core.mp.base.BaseServiceImpl; +import org.springblade.core.tool.api.R; +import org.springblade.system.entity.User; import org.springblade.system.feign.IUserSearchClient; import org.springframework.stereotype.Service; @@ -43,6 +46,7 @@ import java.util.stream.Collectors; */ @Service @AllArgsConstructor +@Log4j2 public class WarehouseUpdownGoodsLogServiceImpl extends BaseServiceImpl implements IWarehouseUpdownGoodsLogService { private final IBasicdataWarehouseClient basicdataWarehouseClient; @@ -58,7 +62,10 @@ public class WarehouseUpdownGoodsLogServiceImpl extends BaseServiceImpl> listR = userSearchClient.listByName(warehouseUpdownGoodsLog.getCreateUserName()); + log.info("listR>>>>{}",listR); + } List warehouseUpdownGoodsLogVOS = baseMapper.selectWarehouseUpdownGoodsLogPage(page, warehouseUpdownGoodsLog); return page.setRecords(warehouseUpdownGoodsLogVOS); } From b0b116c768a0692a616aebb2bc7d53bf765a1130 Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" <123456> Date: Mon, 9 Oct 2023 16:51:02 +0800 Subject: [PATCH 06/11] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E6=AC=A7=E6=B4=BE?= =?UTF-8?q?=E7=9A=84=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../factory/oupai/service/impl/OuPaiFactoryServiceImpl.java | 2 +- .../factory/pan/service/impl/PanFactoryDataServiceImpl.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 d401552c0..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=FromWarehouse($select=Name,Code)&$expand=CurrentWarehouse($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..bd5e9ff6a 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 @@ -619,7 +619,7 @@ public class PanFactoryDataServiceImpl implements IPanFactoryDataService { String sku = ""; BasicMaterialEntity basicMaterialEntity = basicMaterialClient.getMaterialOwn(entity.getMaterialCode(), entity.getMaterialName(), sku); if (ObjectUtils.isNotNull(basicMaterialEntity)) { - entity.setMaterialId(basicdataWarehouseEntity.getId()); + entity.setMaterialId(basicMaterialEntity.getId()); entity.setMaterialCode(basicMaterialEntity.getProductCode()); entity.setMaterialUnit(basicMaterialEntity.getLogpmUnit()); } From f73aae4db5b294ac7f3521cbc5a455ec36298fa9 Mon Sep 17 00:00:00 2001 From: zhenghaoyu Date: Mon, 9 Oct 2023 17:05:48 +0800 Subject: [PATCH 07/11] =?UTF-8?q?1.=E9=9B=B6=E6=8B=85=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=BF=90=E5=8D=95=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/logpm/warehouse/vo/TrayTypeDataListVO.java | 1 + .../com/logpm/warehouse/mapper/WarehouseTrayGoodsMapper.xml | 2 ++ .../com/logpm/warehouse/mapper/WarehouseTrayTypeMapper.xml | 3 ++- 3 files changed, 5 insertions(+), 1 deletion(-) 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-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 @@