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 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-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 eea8d4154..5a97a00f3 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..eb346be5b 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 @@ -462,13 +462,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); @@ -619,7 +618,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()); } 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 @@