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 1/4] =?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 2/4] =?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 3/4] =?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 @@