Merge branch 'dev' into pre-production

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;
 	/**
 	 * 备注

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

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);
 	}

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("总量")
+	@ExcelProperty("重量")
-	private BigDecimal weight;
+	private String weight;
 	/**
 	 * 备注
 	 */

blade-service/logpm-basic/src/main/java/com/logpm/basic/service/impl/BasicMaterialServiceImpl.java

@@ -73,7 +73,7 @@ public class BasicMaterialServiceImpl extends BaseServiceImpl<BasicMaterialMappe
 	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public void importMaterial(List<BasicMaterialExcel> data) {
-		log.info("传入参数>>>>>>>>>>>>>>>>,>>>>>>>>{}",data);
+		log.info("传入参数>>>>>>>>>>>>>>>>>>>>>>>{}",data);
 		ArrayList<BasicMaterialEntity> arrayList = new ArrayList<>();
 		for (BasicMaterialExcel datum : data) {
 			//去重

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataGoodsAreaServiceImpl.java

@@ -315,7 +315,7 @@ public class BasicdataGoodsAreaServiceImpl extends BaseServiceImpl<BasicdataGood
 		//查询货架
 		List<BasicdataGoodsAreaEntity> basicdataGoodsAreaEntities = basicdataGoodsAreaMapper.selectList(new QueryWrapper<BasicdataGoodsAreaEntity>().lambda()
 			.eq(BasicdataGoodsAreaEntity::getIsDeleted,0)
-			.in(BasicdataGoodsAreaEntity::getWarehouseId,collect)
+			.in(collect.size()>0,BasicdataGoodsAreaEntity::getWarehouseId,collect)
 		);
 		return basicdataGoodsAreaEntities;
 	}

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());

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());
+				saveWaybillEntity(waybillNoNum );
-				waybillNoNum = orderDetailEntity.getWaybillNo();
+
 				// 增加订单 经销商信息 和门店信息
 				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());
 			}

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseTrayGoodsMapper.xml

@@ -50,6 +50,7 @@
     <select id="getZeroListByTrayTypeId" resultType="com.logpm.warehouse.vo.TrayTypeDataListVO">
         select lwtg.id trayGoodsId,
                ldsa.id dataId,
+               ldsa.waybill_number waybillNo,
                ldsa.order_code dataCode,
                lwtg.num scanNum,
                ldsa.total_number orderTotalNum,
@@ -63,6 +64,7 @@
 
     <select id="getZeroUpListByTrayTypeId" resultType="com.logpm.warehouse.vo.UpShelfDataVO">
         select ldsa.order_code orderCode,
+               ldsa.waybill_number waybillNo,
                lwtg.tray_code trayCode,
                2 goodsType,
                lwtg.num shelfNum,

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseTrayTypeMapper.xml

@@ -60,7 +60,8 @@
 
     <select id="getZeroOrderByWaybillCode" resultType="com.logpm.warehouse.vo.TrayTypeDataListVO">
         select ldsa.id dataId,
-                ldsa.order_code dataCode,
+               ldsa.waybill_number waybillNo,
+               ldsa.order_code dataCode,
                ldsa.hand_quantity orderTotalNum
         from logpm_distribution_stock_article ldsa
         where ldsa.is_deleted = 0

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<WarehouseUpdownGoodsLogMapper, WarehouseUpdownGoodsLogEntity> implements IWarehouseUpdownGoodsLogService {
 
 	private final IBasicdataWarehouseClient basicdataWarehouseClient;
@@ -58,7 +62,10 @@ public class WarehouseUpdownGoodsLogServiceImpl extends BaseServiceImpl<Warehous
 			.collect(Collectors.toList());
 		warehouseUpdownGoodsLog.setWarehouseIdList(collect);
 		//查询操作员
-//		userSearchClient.listByname();
+		if (null != warehouseUpdownGoodsLog.getCreateUserName()){
+			R<List<User>> listR = userSearchClient.listByName(warehouseUpdownGoodsLog.getCreateUserName());
+			log.info("listR>>>>{}",listR);
+		}
 		List<WarehouseUpdownGoodsLogVO> warehouseUpdownGoodsLogVOS = baseMapper.selectWarehouseUpdownGoodsLogPage(page, warehouseUpdownGoodsLog);
 		return page.setRecords(warehouseUpdownGoodsLogVOS);
 	}