Merge branch 'dev' into pre-production

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

@@ -24,6 +24,9 @@ public class WarehouseTrayGoodsLogServiceImpl extends BaseServiceImpl<WarehouseT
 	@Override
 	public void saveLogPackage(DistributionParcelListEntity parcelListEntity, WarehouseTrayTypeEntity trayTypeEntity, String bindingType, String remark, String palletizingType) {
 		WarehouseTrayGoodsLogEntity trayGoodsLogEntity = new WarehouseTrayGoodsLogEntity();
+		trayGoodsLogEntity.setCreateUser(1714696768639311873L);
+		trayGoodsLogEntity.setUpdateUser(1714696768639311873L);
+		trayGoodsLogEntity.setCreateDept(1649331096241836033L);
 		trayGoodsLogEntity.setTrayId(trayTypeEntity.getTrayId());
 		trayGoodsLogEntity.setTrayTypeId(trayTypeEntity.getId());
 		trayGoodsLogEntity.setAssociationId(parcelListEntity.getId());

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

@@ -45,6 +45,10 @@ public class WarehouseTrayGoodsServiceImpl extends BaseServiceImpl<WarehouseTray
 	public void saveEntityPackage(DistributionParcelListEntity parcelListEntity, WarehouseTrayTypeEntity trayTypeEntity, String isException,String bindingType,String remark,String palletizingType) {
 		Date date = new Date();
 		WarehouseTrayGoodsEntity trayGoodsEntity = new WarehouseTrayGoodsEntity();
+		trayGoodsEntity.setCreateUser(1714696768639311873L);
+		trayGoodsEntity.setUpdateUser(1714696768639311873L);
+		trayGoodsEntity.setCreateDept(1649331096241836033L);
+		trayGoodsEntity.setTenantId(TenantNum.HUITONGCODE);
 		trayGoodsEntity.setTrayId(trayTypeEntity.getTrayId());
 		trayGoodsEntity.setTrayTypeId(trayTypeEntity.getId());
 		trayGoodsEntity.setTrayCode(trayTypeEntity.getTrayCode());
@@ -56,7 +60,6 @@ public class WarehouseTrayGoodsServiceImpl extends BaseServiceImpl<WarehouseTray
 		trayGoodsEntity.setNum(parcelListEntity.getQuantity());
 		trayGoodsEntity.setIsFleeing(isException);
 		trayGoodsEntity.setWarehouseId(trayTypeEntity.getWarehouseId());
-		trayGoodsEntity.setTenantId(TenantNum.HUITONGCODE);
 		save(trayGoodsEntity);
 		//存入日志
 		warehouseTrayGoodsLogService.saveLogPackage(parcelListEntity,trayTypeEntity,bindingType,remark,palletizingType);

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

@@ -563,7 +563,8 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl<WarehouseTrayT
 
 		//判断该包件是否已存在与其他托盘上
 		QueryWrapper<WarehouseTrayGoodsEntity> qw = new QueryWrapper<>();
-		qw.eq("association_value",orderPackageCode);
+		qw.eq("association_value",orderPackageCode)
+			.eq("tenant_id","627683");
 		WarehouseTrayGoodsEntity trayGoodsEntity = warehouseTrayGoodsService.getOne(qw);
 		if(!Objects.isNull(trayGoodsEntity)){
 
@@ -578,7 +579,8 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl<WarehouseTrayT
 		}
 
 		QueryWrapper<WarehouseUpdownGoodsEntity> updownGoodsEntityQueryWrapper = new QueryWrapper<>();
-		updownGoodsEntityQueryWrapper.eq("association_value",orderPackageCode);
+		updownGoodsEntityQueryWrapper.eq("association_value",orderPackageCode)
+			.eq("tenant_id","627683");
 		WarehouseUpdownGoodsEntity updownGoodsEntity = warehouseUpdownGoodsService.getOne(updownGoodsEntityQueryWrapper);
 		if(!Objects.isNull(updownGoodsEntity)){
 			String positionCode = updownGoodsEntity.getPositionCode();
@@ -629,6 +631,7 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl<WarehouseTrayT
 		//查询打托方式信息
 		QueryWrapper<WarehouseTrayTypeEntity> queryWrapper = new QueryWrapper<>();
 		queryWrapper.eq("tray_code",trayCode)
+			.eq("tenant_id","627683")
 			.eq("is_deleted",0);
 		WarehouseTrayTypeEntity trayTypeEntity = baseMapper.selectOne(queryWrapper);
 		if(Objects.isNull(trayTypeEntity)){
@@ -915,6 +918,9 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl<WarehouseTrayT
 
 		WarehouseTrayTypeEntity trayTypeEntity = new WarehouseTrayTypeEntity();
 		trayTypeEntity.setTenantId(TenantNum.HUITONGCODE);
+		trayTypeEntity.setCreateUser(1714696768639311873L);
+		trayTypeEntity.setUpdateUser(1714696768639311873L);
+		trayTypeEntity.setCreateDept(1649331096241836033L);
 		trayTypeEntity.setTrayId(trayId);
 		trayTypeEntity.setTrayCode(trayCode);
 		trayTypeEntity.setType(PalletProductTypeConstant.OTHER);