1.工厂-订单推送逻辑更新

2.干线-查询装车清单功能实现
3.仓库-更新推送数据创建时无租户id等数据的bug

blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/entity/TrunklineCarsLoadLineEntity.java

@@ -72,6 +72,9 @@ public class TrunklineCarsLoadLineEntity extends TenantEntity {
 	/** 卸车确认人名称 */
 	@ApiModelProperty(name = "卸车确认人名称",notes = "")
 	private String unloadUserName ;
+	/** 卸车确认时间 */
+	@ApiModelProperty(name = "卸车确认时间",notes = "")
+	private Date unloadDate ;
 	/** 是否终止 */
 	@ApiModelProperty(name = "是否终止 0正常 1终止",notes = "")
 	private String isTermination ;

blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/LoadingListGoodsVO.java

@@ -0,0 +1,13 @@
+package com.logpm.trunkline.vo;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class LoadingListGoodsVO implements Serializable {
+
+	private String goodsName;
+	private Integer num;
+
+}

blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/LoadingListMainVO.java

@@ -0,0 +1,30 @@
+package com.logpm.trunkline.vo;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+@Data
+public class LoadingListMainVO implements Serializable {
+
+
+	private String orderCode;
+	private String waybillNo;
+	private Integer type;
+	private Date createTime;
+	private String departureWarehouseName;
+	private String destinationWarehouseName;
+	private String shipper;
+	private String consignee;
+	private String consigneeName;
+	private String consigneeMobile;
+	private Integer unloadNum;
+	private Integer planNum;
+	private Integer smallTotal;
+
+	private List<LoadingListGoodsVO> goodsList = new ArrayList<>();
+
+}

blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/TrunklineCarsLoadLoadingListVO.java

@@ -0,0 +1,21 @@
+package com.logpm.trunkline.vo;
+
+import com.logpm.trunkline.entity.TrunklineCarsLoadEntity;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+@Data
+public class TrunklineCarsLoadLoadingListVO extends TrunklineCarsLoadEntity {
+
+	private String stopoverStation;
+
+	private Date unloadDate;
+
+	private String unloadUserName;
+
+	private List<LoadingListMainVO> mainList = new ArrayList();
+
+}

blade-service/logpm-factory/src/main/java/com/logpm/factory/pan/service/impl/PanFactoryDataServiceImpl.java

@@ -454,7 +454,7 @@ public class PanFactoryDataServiceImpl implements IPanFactoryDataService {
 				log.info("############basicdataWarehouseEntity {}", basicdataWarehouseEntity);
                 distributionStockArticleEntity.setCreateDept(basicdataWarehouseEntity.getDepartment());
 
-                WayBillEntity wayBillEntity = wayBillClient.getByWayBillByOrderCode(orderSelfNum);
+                WayBillEntity wayBillEntity = wayBillClient.getByWaybillNo(waybillNoNum);
 
 
 				if(Objects.isNull(wayBillEntity)){
@@ -515,8 +515,8 @@ public class PanFactoryDataServiceImpl implements IPanFactoryDataService {
 				distributionStockArticleEntity.setAdvanceId(advanceId);
 				//--------------2023-07-06 新增字段处理
 
-				//查询包条码对应的运单信息
-				waybillNoNum = supplyData.get("logiBillNo");
+//				//查询包条码对应的运单信息
+//				waybillNoNum = supplyData.get("logiBillNo");
 				//存入运单信息
 				saveWaybillEntity(waybillNoNum );
 
@@ -794,6 +794,10 @@ public class PanFactoryDataServiceImpl implements IPanFactoryDataService {
 			String agent = wayBillEntity.getAgent();
 
 			warehouseWaybill = new WarehouseWaybillEntity();
+			warehouseWaybill.setTenantId(TenantNum.HUITONGCODE);
+			warehouseWaybill.setCreateUser(1714696768639311873L);
+			warehouseWaybill.setUpdateUser(1714696768639311873L);
+			warehouseWaybill.setCreateDept(1649331096241836033L);
 			warehouseWaybill.setWaybillNo(waybillNo);
 			warehouseWaybill.setDestinationWarehouseName(warehouseName);
 			warehouseWaybill.setDestinationWarehouseId(Objects.isNull(endhouse) ? null : endhouse.getId());

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadScanMapper.java

@@ -77,4 +77,13 @@ public interface TrunklineCarsLoadScanMapper extends BaseMapper<TrunklineCarsLoa
 	Integer findPlanUnloadNumByLoadIdAndFinalNodeId(@Param("loadId") Long loadId, @Param("warehouseId") Long warehouseId);
 
 	List<TrunklineCarsLoadScanEntity> findNotUnloadZeroList(@Param("loadId") Long loadId, @Param("warehouseId") Long warehouseId);
+
+    List<LoadingListMainVO> findLoadingListDataMain(@Param("loadId") Long loadId, @Param("warehouseId") Long warehouseId);
+
+	List<LoadingListGoodsVO> findLoadingListGoods(@Param("loadId") Long loadId, @Param("warehouseId") Long warehouseId, @Param("orderCode") String orderCode, @Param("waybillNo") String waybillNo);
+
+
+	List<LoadingListMainVO> findUnloadListDataMain(@Param("loadId") Long loadId, @Param("warehouseId") Long warehouseId);
+
+	List<LoadingListGoodsVO> findUnloadGoods(@Param("loadId") Long loadId, @Param("warehouseId") Long warehouseId, @Param("orderCode") String orderCode, @Param("waybillNo") String waybillNo);
 }

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadScanMapper.xml

@@ -310,4 +310,94 @@
         and final_node_id = #{warehouseId}
     </select>
 
+    <select id="findLoadingListDataMain" resultType="com.logpm.trunkline.vo.LoadingListMainVO">
+        select ltcls.order_code orderCode,
+               ltcls.waybill_no waybillNo,
+               ltcls.type type,
+               lww.create_time createTime,
+               lww.departure_warehouse_name departureWarehouseName,
+               lww.destination_warehouse_name destinationWarehouseName,
+               lww.shipper shipper,
+               lww.consignee consignee,
+               lww.consignee_name consigneeName,
+               lww.consignee_mobile consigneeMobile,
+               0 unloadNum,
+               ltco.plan_num planNum,
+               sum(ltcls.num) smallTotal
+        from logpm_trunkline_cars_load_scan ltcls
+                 left join logpm_trunkline_cars_order ltco on ltco.order_code = ltcls.order_code and ltco.waybill_no = ltcls.waybill_no and ltco.load_id = ltcls.load_id and ltco.node_id = ltcls.warehouse_id
+                 left join logpm_distribution_stock_article ldsa on ldsa.order_code = ltcls.order_code and ldsa.warehouse_id = ltcls.from_warehouse_id
+                 left join logpm_warehouse_waybill lww on ltcls.waybill_no = lww.waybill_no
+        where ltcls.load_id = #{loadId}
+          and ltcls.warehouse_id = #{warehouseId}
+        group by ltcls.order_code,
+                 ltcls.waybill_no,
+                 ltcls.type,
+                 lww.create_time,
+                 lww.departure_warehouse_name,
+                 lww.destination_warehouse_name,
+                 lww.shipper,
+                 lww.consignee,
+                 lww.consignee_name,
+                 lww.consignee_mobile,
+                 ltco.plan_num
+    </select>
+
+    <select id="findLoadingListGoods" resultType="com.logpm.trunkline.vo.LoadingListGoodsVO">
+        select ldpl.firsts goodsName,
+               count(ltcls.id) num
+        from logpm_trunkline_cars_load_scan ltcls
+        left join logpm_distribution_parcel_list ldpl on ldpl.order_package_code = ltcls.scan_code and ldpl.warehouse_id = ltcls.from_warehouse_id
+        where ltcls.load_id = #{loadId}
+          and ltcls.warehouse_id = #{warehouseId}
+          and ltcls.order_code = #{ordeCode}
+          and ltcls.waybill_no = #{waybillNo}
+        group by ldpl.firsts
+    </select>
+
+    <select id="findUnloadGoods" resultType="com.logpm.trunkline.vo.LoadingListGoodsVO">
+        select ldpl.firsts goodsName,
+               count(ltcls.id) num
+        from logpm_trunkline_cars_load_scan ltcls
+                 left join logpm_distribution_parcel_list ldpl on ldpl.order_package_code = ltcls.scan_code and ldpl.warehouse_id = ltcls.from_warehouse_id
+        where ltcls.load_id = #{loadId}
+          and (ltcls.final_node_id = #{warehouseId} or ltcls.unload_node_id = #{warehouseId})
+          and ltcls.order_code = #{ordeCode}
+          and ltcls.waybill_no = #{waybillNo}
+        group by ldpl.firsts
+    </select>
+
+    <select id="findUnloadListDataMain" resultType="com.logpm.trunkline.vo.LoadingListMainVO">
+        select ltcls.order_code orderCode,
+               ltcls.waybill_no waybillNo,
+               ltcls.type type,
+               lww.create_time createTime,
+               lww.departure_warehouse_name departureWarehouseName,
+               lww.destination_warehouse_name destinationWarehouseName,
+               lww.shipper shipper,
+               lww.consignee consignee,
+               lww.consignee_name consigneeName,
+               lww.consignee_mobile consigneeMobile,
+               ltco.unload_num unloadNum,
+               0 planNum,
+               sum(ltcls.num) smallTotal
+        from logpm_trunkline_cars_load_scan ltcls
+                 left join logpm_trunkline_cars_order ltco on ltco.order_code = ltcls.order_code and ltco.waybill_no = ltcls.waybill_no and ltco.load_id = ltcls.load_id and ltco.node_id = ltcls.warehouse_id
+                 left join logpm_distribution_stock_article ldsa on ldsa.order_code = ltcls.order_code and ldsa.warehouse_id = ltcls.from_warehouse_id
+                 left join logpm_warehouse_waybill lww on ltcls.waybill_no = lww.waybill_no
+        where ltcls.load_id = #{loadId}
+          and (ltcls.final_node_id = #{warehouseId} or ltcls.unload_node_id = #{warehouseId})
+        group by ltcls.order_code,
+                 ltcls.waybill_no,
+                 ltcls.type,
+                 lww.create_time,
+                 lww.departure_warehouse_name,
+                 lww.destination_warehouse_name,
+                 lww.shipper,
+                 lww.consignee,
+                 lww.consignee_name,
+                 lww.consignee_mobile,
+                 ltco.unload_num
+    </select>
+
 </mapper>

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineCarsLoadScanService.java

@@ -74,4 +74,11 @@ public interface ITrunklineCarsLoadScanService extends BaseService<TrunklineCars
 
 	List<TrunklineCarsLoadScanEntity> findNotUnloadZeroList(Long loadId, Long warehouseId);
 
+    List<LoadingListMainVO> findLoadingListDataMain(Long loadId, Long warehouseId);
+
+	List<LoadingListGoodsVO> findLoadingListGoods(Long loadId, Long warehouseId, String orderCode, String waybillNo);
+
+	List<LoadingListMainVO> findUnloadListDataMain(Long loadId, Long warehouseId);
+
+	List<LoadingListGoodsVO> findUnloadGoods(Long loadId, Long warehouseId, String orderCode, String waybillNo);
 }

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadScanServiceImpl.java

@@ -177,4 +177,24 @@ public class TrunklineCarsLoadScanServiceImpl extends BaseServiceImpl<TrunklineC
 		return baseMapper.findNotUnloadZeroList(loadId,warehouseId);
 	}
 
+	@Override
+	public List<LoadingListMainVO> findLoadingListDataMain(Long loadId, Long warehouseId) {
+		return baseMapper.findLoadingListDataMain(loadId,warehouseId);
+	}
+
+	@Override
+	public List<LoadingListGoodsVO> findLoadingListGoods(Long loadId, Long warehouseId, String orderCode, String waybillNo) {
+		return baseMapper.findLoadingListGoods(loadId,warehouseId,orderCode,waybillNo);
+	}
+
+	@Override
+	public List<LoadingListMainVO> findUnloadListDataMain(Long loadId, Long warehouseId) {
+		return baseMapper.findUnloadListDataMain(loadId,warehouseId);
+	}
+
+	@Override
+	public List<LoadingListGoodsVO> findUnloadGoods(Long loadId, Long warehouseId, String orderCode, String waybillNo) {
+		return baseMapper.findUnloadGoods(loadId,warehouseId,orderCode,waybillNo);
+	}
+
 }

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java

@@ -3349,13 +3349,74 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 	@Override
 	public R findLoadingListData(LoadCarsDTO loadCarsDTO) {
 		Long loadId = loadCarsDTO.getLoadId();
+		Long warehouseId = loadCarsDTO.getWarehouseId();
 
 		TrunklineCarsLoadEntity carsLoadEntity = getById(loadId);
+		if(Objects.isNull(carsLoadEntity)){
+			log.warn("############findLoadingListData: 配载计划信息不存在 loadId={}",loadId);
+			return R.fail(405,"配载计划信息不存在");
+		}
 
+		TrunklineCarsLoadLoadingListVO trunklineCarsLoadLoadingListVO = new TrunklineCarsLoadLoadingListVO();
+		BeanUtil.copy(carsLoadEntity,trunklineCarsLoadLoadingListVO);
+		Long startWarehouseId = carsLoadEntity.getStartWarehouseId();
+		String endWarehouseIds = carsLoadEntity.getEndWarehouseIds();
+		if(!startWarehouseId.equals(warehouseId) && !endWarehouseIds.contains(warehouseId+"")){
+			//起始仓装载清单
+			TrunklineCarsLoadLineEntity carsLoadLineEntity = trunklineCarsLoadLineService.findEntityByLoadIdAndNodeId(loadId, warehouseId);
+			if(Objects.isNull(carsLoadLineEntity)){
+				log.warn("############findLoadingListData: 配载计划节点信息不存在 loadId={} warehouseId={}",loadId,warehouseId);
+				return R.fail(405,"配载计划节点信息不存在");
+			}
 
+			String endWarehouseNames = carsLoadEntity.getEndWarehouseNames();
+			String stopoverStation = endWarehouseNames.substring(0, endWarehouseNames.lastIndexOf(","));
+			trunklineCarsLoadLoadingListVO.setStopoverStation(stopoverStation);
+			trunklineCarsLoadLoadingListVO.setUnloadDate(carsLoadLineEntity.getUnloadDate());
+			trunklineCarsLoadLoadingListVO.setUnloadUserName(carsLoadLineEntity.getUnloadUserName());
+
+			List<LoadingListMainVO> loadingMainList = trunklineCarsLoadScanService.findLoadingListDataMain(loadId,warehouseId);
+			for (LoadingListMainVO loadingListMainVO : loadingMainList) {
+				Integer type = loadingListMainVO.getType();
+				if(type.equals(1)){
+					String orderCode = loadingListMainVO.getOrderCode();
+					String waybillNo = loadingListMainVO.getWaybillNo();
+					List<LoadingListGoodsVO> goodsList = trunklineCarsLoadScanService.findLoadingListGoods(loadId,warehouseId,orderCode,waybillNo);
+					loadingListMainVO.setGoodsList(goodsList);
+				}else if(type.equals(2)){
+					List<LoadingListGoodsVO> goodsList = new ArrayList<>();
+					LoadingListGoodsVO loadingListGoodsVO = new LoadingListGoodsVO();
+					loadingListGoodsVO.setGoodsName("零担");
+					loadingListGoodsVO.setNum(loadingListMainVO.getSmallTotal());
+					goodsList.add(loadingListGoodsVO);
+					loadingListMainVO.setGoodsList(goodsList);
+				}
+			}
 
-
-		return null;
+			List<LoadingListMainVO> unloadMainList = trunklineCarsLoadScanService.findUnloadListDataMain(loadId,warehouseId);
+			for (LoadingListMainVO unloadMainVO : unloadMainList) {
+				Integer type = unloadMainVO.getType();
+				if (type.equals(1)) {
+					String orderCode = unloadMainVO.getOrderCode();
+					String waybillNo = unloadMainVO.getWaybillNo();
+					List<LoadingListGoodsVO> goodsList = trunklineCarsLoadScanService.findUnloadGoods(loadId, warehouseId, orderCode, waybillNo);
+					unloadMainVO.setGoodsList(goodsList);
+				} else if (type.equals(2)) {
+					List<LoadingListGoodsVO> goodsList = new ArrayList<>();
+					LoadingListGoodsVO loadingListGoodsVO = new LoadingListGoodsVO();
+					loadingListGoodsVO.setGoodsName("零担");
+					loadingListGoodsVO.setNum(unloadMainVO.getSmallTotal());
+					goodsList.add(loadingListGoodsVO);
+					unloadMainVO.setGoodsList(goodsList);
+				}
+			}
+			loadingMainList.addAll(unloadMainList);
+			trunklineCarsLoadLoadingListVO.setMainList(loadingMainList);
+			return R.data(trunklineCarsLoadLoadingListVO);
+		}else{
+			log.warn("#############findLoadingListData: 仓库信息不正确");
+			return R.fail(405,"仓库信息不正确");
+		}
 	}
 
 	@Override

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayGoodsLogServiceImpl.java

@@ -44,6 +44,10 @@ public class WarehouseTrayGoodsLogServiceImpl extends BaseServiceImpl<WarehouseT
 	@Override
 	public void saveLogZero(DistributionStockArticleEntity stockArticleEntity, WarehouseTrayTypeEntity trayTypeEntity, Integer num, String bindingType, String remark, String palletizingType) {
 		WarehouseTrayGoodsLogEntity trayGoodsLogEntity = new WarehouseTrayGoodsLogEntity();
+		trayGoodsLogEntity.setCreateUser(1714696768639311873L);
+		trayGoodsLogEntity.setUpdateUser(1714696768639311873L);
+		trayGoodsLogEntity.setCreateDept(1649331096241836033L);
+		trayGoodsLogEntity.setTenantId(TenantNum.HUITONGCODE);
 		trayGoodsLogEntity.setTrayId(trayTypeEntity.getTrayId());
 		trayGoodsLogEntity.setTrayTypeId(trayTypeEntity.getId());
 		trayGoodsLogEntity.setAssociationId(stockArticleEntity.getId());
@@ -60,6 +64,10 @@ public class WarehouseTrayGoodsLogServiceImpl extends BaseServiceImpl<WarehouseT
 	@Override
 	public void saveLogStock(Long materialId,Long marketId, WarehouseTrayTypeEntity trayTypeEntity,String incomingBatch,String materialCode,Integer num, String bindingType, String remark, String palletizingType) {
 		WarehouseTrayGoodsLogEntity trayGoodsLogEntity = new WarehouseTrayGoodsLogEntity();
+		trayGoodsLogEntity.setCreateUser(1714696768639311873L);
+		trayGoodsLogEntity.setUpdateUser(1714696768639311873L);
+		trayGoodsLogEntity.setCreateDept(1649331096241836033L);
+		trayGoodsLogEntity.setTenantId(TenantNum.HUITONGCODE);
 		trayGoodsLogEntity.setTrayId(trayTypeEntity.getTrayId());
 		trayGoodsLogEntity.setTrayTypeId(trayTypeEntity.getId());
 		trayGoodsLogEntity.setAssociationId(materialId);

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayGoodsServiceImpl.java

@@ -117,6 +117,10 @@ public class WarehouseTrayGoodsServiceImpl extends BaseServiceImpl<WarehouseTray
 			updateById(oldTrayGoodsEntity);
 		}else{
 			WarehouseTrayGoodsEntity trayGoodsEntity = new WarehouseTrayGoodsEntity();
+			trayGoodsEntity.setCreateUser(1714696768639311873L);
+			trayGoodsEntity.setUpdateUser(1714696768639311873L);
+			trayGoodsEntity.setCreateDept(1649331096241836033L);
+			trayGoodsEntity.setTenantId(TenantNum.HUITONGCODE);
 			trayGoodsEntity.setTrayId(trayTypeEntity.getTrayId());
 			trayGoodsEntity.setTrayCode(trayTypeEntity.getTrayCode());
 			trayGoodsEntity.setTrayTypeId(trayTypeId);
@@ -182,6 +186,10 @@ public class WarehouseTrayGoodsServiceImpl extends BaseServiceImpl<WarehouseTray
 	@Override
 	public void saveEntityStock(Long materialId,Long marketId,WarehouseTrayTypeEntity trayTypeEntity,String  incomingBatch,String materialCode,Integer num, String isException) {
 		WarehouseTrayGoodsEntity trayGoodsEntity = new WarehouseTrayGoodsEntity();
+		trayGoodsEntity.setCreateUser(1714696768639311873L);
+		trayGoodsEntity.setUpdateUser(1714696768639311873L);
+		trayGoodsEntity.setCreateDept(1649331096241836033L);
+		trayGoodsEntity.setTenantId(TenantNum.HUITONGCODE);
 		trayGoodsEntity.setTrayId(trayTypeEntity.getTrayId());
 		trayGoodsEntity.setTrayCode(trayTypeEntity.getTrayCode());
 		trayGoodsEntity.setTrayTypeId(trayTypeEntity.getId());

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayTypeServiceImpl.java

@@ -1551,6 +1551,10 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl<WarehouseTrayT
 //		}
 
 		WarehouseTrayTypeEntity trayTypeEntity = new WarehouseTrayTypeEntity();
+		trayTypeEntity.setCreateUser(1714696768639311873L);
+		trayTypeEntity.setUpdateUser(1714696768639311873L);
+		trayTypeEntity.setCreateDept(1649331096241836033L);
+		trayTypeEntity.setTenantId(TenantNum.HUITONGCODE);
 		trayTypeEntity.setTrayId(trayId);
 		trayTypeEntity.setTrayCode(trayCode);
 		trayTypeEntity.setType(PalletProductTypeConstant.OTHER);
@@ -4247,6 +4251,10 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl<WarehouseTrayT
 
 
 		WarehouseTrayTypeEntity trayTypeEntity = new WarehouseTrayTypeEntity();
+		trayTypeEntity.setCreateUser(1714696768639311873L);
+		trayTypeEntity.setUpdateUser(1714696768639311873L);
+		trayTypeEntity.setCreateDept(1649331096241836033L);
+		trayTypeEntity.setTenantId(TenantNum.HUITONGCODE);
 		trayTypeEntity.setTrayId(trayId);
 		trayTypeEntity.setTrayCode(trayCode);
 		trayTypeEntity.setType(PalletProductTypeConstant.STOCKDATA);

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownGoodsLogServiceImpl.java

@@ -31,6 +31,7 @@ import com.logpm.warehouse.service.IWarehouseUpdownGoodsLogService;
 import com.logpm.warehouse.vo.WarehouseUpdownGoodsLogVO;
 import lombok.AllArgsConstructor;
 import lombok.extern.log4j.Log4j2;
+import org.springblade.common.constant.TenantNum;
 import org.springblade.core.log.exception.ServiceException;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springblade.core.secure.utils.AuthUtil;
@@ -79,6 +80,10 @@ public class WarehouseUpdownGoodsLogServiceImpl extends BaseServiceImpl<Warehous
 	@Override
 	public void saveAllocationAndPackage(WarehouseUpdownTypeEntity updownTypeEntity, DistributionParcelListEntity parcelListEntity, String bindingType,Integer isAlltrays,String remark) {
 		WarehouseUpdownGoodsLogEntity warehouseUpdownGoodsLogEntity = new WarehouseUpdownGoodsLogEntity();
+		warehouseUpdownGoodsLogEntity.setCreateUser(1714696768639311873L);
+		warehouseUpdownGoodsLogEntity.setUpdateUser(1714696768639311873L);
+		warehouseUpdownGoodsLogEntity.setCreateDept(1649331096241836033L);
+		warehouseUpdownGoodsLogEntity.setTenantId(TenantNum.HUITONGCODE);
 		warehouseUpdownGoodsLogEntity.setUpdownTypeId(updownTypeEntity.getId());
 		warehouseUpdownGoodsLogEntity.setAreaId(updownTypeEntity.getAreaId());
 		warehouseUpdownGoodsLogEntity.setAreaTitle(updownTypeEntity.getAreaTitle());

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownGoodsServiceImpl.java

@@ -29,6 +29,7 @@ import com.logpm.warehouse.service.IWarehouseUpdownGoodsService;
 import com.logpm.warehouse.vo.*;
 import lombok.AllArgsConstructor;
 import lombok.extern.log4j.Log4j2;
+import org.springblade.common.constant.TenantNum;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springblade.core.tool.utils.Func;
 import org.springframework.stereotype.Service;
@@ -101,6 +102,10 @@ public class WarehouseUpdownGoodsServiceImpl extends BaseServiceImpl<WarehouseUp
 	@Override
 	public void bindingAllocationAndPackage(WarehouseUpdownTypeEntity updownTypeEntity, DistributionParcelListEntity parcelListEntity, String bindingType,Integer isAlltrays,String remark) {
 		WarehouseUpdownGoodsEntity updownGoodsEntity = new WarehouseUpdownGoodsEntity();
+		updownGoodsEntity.setCreateUser(1714696768639311873L);
+		updownGoodsEntity.setUpdateUser(1714696768639311873L);
+		updownGoodsEntity.setCreateDept(1649331096241836033L);
+		updownGoodsEntity.setTenantId(TenantNum.HUITONGCODE);
 		updownGoodsEntity.setUpdownTypeId(updownTypeEntity.getId());
 		updownGoodsEntity.setAreaId(updownTypeEntity.getAreaId());
 		updownGoodsEntity.setAreaTitle(updownTypeEntity.getAreaTitle());

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownTypeServiceImpl.java

@@ -19,6 +19,7 @@ import com.logpm.warehouse.service.*;
 import com.logpm.warehouse.vo.*;
 import lombok.AllArgsConstructor;
 import lombok.extern.log4j.Log4j2;
+import org.springblade.common.constant.TenantNum;
 import org.springblade.common.exception.CustomerException;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springblade.core.tool.api.R;
@@ -2411,6 +2412,10 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl<WarehouseUpd
 					stringBuffer.append("{").append(materialCode).append("},");
 					continue;
 				}
+				updownGoodsEntity.setCreateUser(1714696768639311873L);
+				updownGoodsEntity.setUpdateUser(1714696768639311873L);
+				updownGoodsEntity.setCreateDept(1649331096241836033L);
+				updownGoodsEntity.setTenantId(TenantNum.HUITONGCODE);
 				updownGoodsEntity = new WarehouseUpdownGoodsEntity();
 				updownGoodsEntity.setUpdownTypeId(updownTypeEntity.getId());
 				updownGoodsEntity.setAreaId(updownTypeEntity.getAreaId());
@@ -2517,6 +2522,10 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl<WarehouseUpd
 			}else{
 				DistributionStockArticleEntity stockArticleEntity = distributionStockArticleClient.findStockArticleByOrderCodeAndWarehouseId(orderCode,warehouseId);
 				updownGoodsEntity = new WarehouseUpdownGoodsEntity();
+				updownGoodsEntity.setCreateUser(1714696768639311873L);
+				updownGoodsEntity.setUpdateUser(1714696768639311873L);
+				updownGoodsEntity.setCreateDept(1649331096241836033L);
+				updownGoodsEntity.setTenantId(TenantNum.HUITONGCODE);
 				updownGoodsEntity.setUpdownTypeId(updownTypeEntity.getId());
 				updownGoodsEntity.setAreaId(updownTypeEntity.getAreaId());
 				updownGoodsEntity.setAreaTitle(updownTypeEntity.getAreaTitle());
@@ -2574,6 +2583,10 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl<WarehouseUpd
 
 		//绑定托盘与库位关系
 		WarehouseTaryAllocationEntity taryAllocationEntity = new WarehouseTaryAllocationEntity();
+		taryAllocationEntity.setCreateUser(1714696768639311873L);
+		taryAllocationEntity.setUpdateUser(1714696768639311873L);
+		taryAllocationEntity.setCreateDept(1649331096241836033L);
+		taryAllocationEntity.setTenantId(TenantNum.HUITONGCODE);
 		taryAllocationEntity.setTrayId(trayId);
 		taryAllocationEntity.setAllocationId(allocationId);
 		taryAllocationEntity.setBindStatus("0");
@@ -2594,6 +2607,10 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl<WarehouseUpd
 		List<WarehouseUpdownGoodsEntity> updownGoodsList = new ArrayList<>();
 		for (WarehouseTrayGoodsEntity trayGoodsEntity:trayGoodsList){
 			WarehouseUpdownGoodsEntity updownGoodsEntity = new WarehouseUpdownGoodsEntity();
+			updownGoodsEntity.setCreateUser(1714696768639311873L);
+			updownGoodsEntity.setUpdateUser(1714696768639311873L);
+			updownGoodsEntity.setCreateDept(1649331096241836033L);
+			updownGoodsEntity.setTenantId(TenantNum.HUITONGCODE);
 			updownGoodsEntity.setUpdownTypeId(updownTypeEntity.getId());
 			updownGoodsEntity.setAreaId(updownTypeEntity.getAreaId());
 			updownGoodsEntity.setAreaTitle(updownTypeEntity.getAreaTitle());
@@ -2626,6 +2643,10 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl<WarehouseUpd
 			WarehouseUpdownGoodsLogEntity updownGoodsLogEntity = new WarehouseUpdownGoodsLogEntity();
 			BeanUtil.copy(updownGoodsEntity,updownGoodsLogEntity);
 			updownGoodsLogEntity.setId(null);
+			updownGoodsLogEntity.setCreateUser(1714696768639311873L);
+			updownGoodsLogEntity.setUpdateUser(1714696768639311873L);
+			updownGoodsLogEntity.setCreateDept(1649331096241836033L);
+			updownGoodsLogEntity.setTenantId(TenantNum.HUITONGCODE);
 			updownGoodsLogEntity.setBindingType(bindingType);
 			updownGoodsLogEntity.setIsAlltrays(isAlltrays);
 			updownGoodsLogEntity.setRemark(remark);
@@ -2760,6 +2781,10 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl<WarehouseUpd
 
 
 		WarehouseUpdownTypeEntity updownTypeEntity = new WarehouseUpdownTypeEntity();
+		updownTypeEntity.setCreateUser(1714696768639311873L);
+		updownTypeEntity.setUpdateUser(1714696768639311873L);
+		updownTypeEntity.setCreateDept(1649331096241836033L);
+		updownTypeEntity.setTenantId(TenantNum.HUITONGCODE);
 		updownTypeEntity.setUpdownType(updownType);
 		updownTypeEntity.setAreaId(goodsAreaId);
 		updownTypeEntity.setAreaTitle(headline);