Merge branch 'pre-production'

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

@@ -33,6 +33,8 @@ import lombok.extern.slf4j.Slf4j;
 import org.springblade.common.constant.DictBizConstant;
 import org.springblade.core.log.exception.ServiceException;
 import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springblade.core.secure.BladeUser;
+import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.utils.BeanUtil;
 import org.springblade.system.cache.DictBizCache;
 import org.springblade.system.entity.DictBiz;
@@ -333,7 +335,9 @@ public class BasicdataClientServiceImpl extends BaseServiceImpl<BasicdataClientM
 				//查询是不是重复
 				List<BasicdataClientEntity> basicdataClientEntities = baseMapper.selectList(Wrappers.<BasicdataClientEntity>query().lambda().eq(BasicdataClientEntity::getClientCode, i.getClientCode()));
 				if(basicdataClientEntities.isEmpty()){
+					BladeUser user = AuthUtil.getUser();
 					basicdataClient.setPid(0L);
+					basicdataClient.setCreateUser(user.getUserId());
 					basicdataClient.setCargoControl(false);
 					basicdataClient.setStatus(0);
 					basicdataClient.setIsDeleted(0);

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

@@ -458,7 +458,6 @@
         from logpm_trunkline_cars_load_scan
         where load_id = #{loadId}
         and scan_status != '1'
-        and
         and is_data = 1
         order by create_time asc
     </select>

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

@@ -11,7 +11,7 @@ import java.util.List;
 public interface TrunklineCostShareRecordMapper extends BaseMapper<TrunklineCostShareRecordEntity> {
 
 
-    TrunklineCostShareRecordEntity findPackageDataByLoadIdAndCode(@Param("scanCode") String scanCode, @Param("loadId") Long loadId);
+    TrunklineCostShareRecordEntity findPackageDataByLoadIdAndCode(@Param("scanCode") String scanCode, @Param("loadId") Long loadId,@Param("tenantId") String tenantId);
 
 	Integer findTotalUnloadNumByLoad(@Param("loadId") Long loadId);
 

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

@@ -7,6 +7,7 @@
         from logpm_trunkline_cost_share_record
         where load_id = #{loadId}
         and product_code = #{scanCode}
+        and tenant_id = #{tenantId}
         and product_type = 1
     </select>
 

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

@@ -7,7 +7,7 @@ public interface ICarsLoadAsyncService {
 
 	void saveLog(TrunklineCarsLoadEntity carsLoadEntity, TrunklineCarsLoadLineEntity carsLoadLineEntity, int cardLoadType,String nickName,Long userId);
 
-	void saveCostShareRecord(Long loadId,TrunklineCarsLoadEntity carsLoadEntity);
+	void saveCostShareRecord(Long loadId, TrunklineCarsLoadEntity carsLoadEntity, Long userId, String tenantId, String deptId);
 
 	void costShareByLoadId(Long loadId,TrunklineCarsLoadEntity carsLoadEntity);
 

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

@@ -6,7 +6,7 @@ import org.springblade.core.mp.base.BaseService;
 import java.util.List;
 
 public interface ITrunklineCostShareRecordService extends BaseService<TrunklineCostShareRecordEntity> {
-    TrunklineCostShareRecordEntity findPackageDataByLoadIdAndCode(String scanCode, Long loadId);
+    TrunklineCostShareRecordEntity findPackageDataByLoadIdAndCode(String scanCode, Long loadId,String tenantId);
 
 	Integer findTotalUnloadNumByLoad(Long loadId);
 

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

@@ -154,7 +154,13 @@ public class CarsLoadAsyncServiceImpl implements ICarsLoadAsyncService {
 
 	@Async
 	@Override
-	public void saveCostShareRecord(Long loadId,TrunklineCarsLoadEntity carsLoadEntity) {
+	public void saveCostShareRecord(Long loadId, TrunklineCarsLoadEntity carsLoadEntity, Long userId, String tenantId, String deptIds) {
+		Long deptId = null;
+		if(deptIds.contains(",")){
+			String[] split = deptIds.split(",");
+			deptId = Long.parseLong(split[split.length-1]);
+		}
+
 
 		List<TrunklineCarsLoadScanEntity> scanEntities = trunklineCarsLoadScanService.findListByLoadIdOrderByCreateTimeAsc(loadId);
 
@@ -186,11 +192,15 @@ public class CarsLoadAsyncServiceImpl implements ICarsLoadAsyncService {
 
 			TrunklineCostShareRecordEntity trunklineCostShareRecordEntity = null;
 			if(type.equals(1)){
-				trunklineCostShareRecordEntity = trunklineCostShareRecordService.findPackageDataByLoadIdAndCode(scanCode,loadId);
+				trunklineCostShareRecordEntity = trunklineCostShareRecordService.findPackageDataByLoadIdAndCode(scanCode,loadId,tenantId);
 			}
 
 			if(Objects.isNull(trunklineCostShareRecordEntity)){
 				trunklineCostShareRecordEntity = new TrunklineCostShareRecordEntity();
+				trunklineCostShareRecordEntity.setTenantId(tenantId);
+				trunklineCostShareRecordEntity.setCreateUser(userId);
+				trunklineCostShareRecordEntity.setUpdateUser(userId);
+				trunklineCostShareRecordEntity.setCreateDept(deptId);
 				trunklineCostShareRecordEntity.setLoadId(loadId);
 				trunklineCostShareRecordEntity.setCarsNo(carsLoadEntity.getCarsNo());
 				trunklineCostShareRecordEntity.setWaybillId(waybillId);
@@ -289,7 +299,7 @@ public class CarsLoadAsyncServiceImpl implements ICarsLoadAsyncService {
 
 		for (TrunklineCostShareRecordEntity trunklineCostShareRecordEntity : list) {
 			BigDecimal income = trunklineCostShareRecordEntity.getIncome();
-			trunklineCostShareRecordEntity.setCostZhang(countTransportCost.multiply(income.divide(totalIncome)));
+			trunklineCostShareRecordEntity.setCostZhang(countTransportCost.multiply(income.divide(totalIncome,8,RoundingMode.HALF_UP)));
 		}
 
 		trunklineCostShareRecordService.updateBatchById(list);

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

@@ -774,7 +774,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 				try{
 					carsLoadAsyncService.saveLog(carsLoadEntity,currentCarsLoadLineEntity, CarsLoadLogTypeConstant.END_UNLOAD_CARS_LOAD.getValue(),AuthUtil.getNickName(),AuthUtil.getUserId());
 					openOrderAsyncService.saveUnloadStartCarLog(currentCarsLoadLineEntity,AuthUtil.getNickName(),AuthUtil.getUserId());
-					carsLoadAsyncService.saveCostShareRecord(loadId,carsLoadEntity);
+					carsLoadAsyncService.saveCostShareRecord(loadId,carsLoadEntity,AuthUtil.getUserId(),AuthUtil.getTenantId(),AuthUtil.getDeptId());
 				}catch (Exception e){
 					log.warn("#############unloadByLoadId: 存入日志失败");
 				}
@@ -3016,9 +3016,22 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 
 	@Override
 	public R batchUnload(BatchUnloadDTO batchUnloadDTO) {
-
 		Long loadId = batchUnloadDTO.getLoadId();
 		Long warehouseId = batchUnloadDTO.getWarehouseId();
+
+		TrunklineCarsLoadEntity carsLoadEntity = baseMapper.selectById(loadId);
+		if(Objects.isNull(carsLoadEntity)){
+			log.warn("############batchUnload: 配载计划信息不存在 loadId={}",loadId);
+			return R.fail(405,"配载计划信息不存在");
+		}
+
+		Long nowWarehouseId = carsLoadEntity.getNowWarehouseId();
+		if(!warehouseId.equals(nowWarehouseId)){
+			log.warn("############batchUnload: 当前节点还未到车 loadId={} warehouseId={}",loadId,warehouseId);
+			return R.fail(405,"当前节点还未到车");
+		}
+
+
 		List<UnloadPackageDTO> unloadPackageList = batchUnloadDTO.getUnloadPackageList();
 		List<UnloadZeroDTO> unloadZeroList = batchUnloadDTO.getUnloadZeroList();
 
@@ -3920,7 +3933,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 				return R.fail(405,"暂未有权限进行操作");
 			}
 			String loadStatus = carsLoadEntity.getLoadStatus();
-			if(!"0".equals(loadStatus) && !"20".equals(loadStatus)){
+			if(!"0".equals(loadStatus) && !"20".equals(loadStatus) && !"40".equals(loadStatus)){
 				log.warn("##################removeCarsLoadScan: 当前配载计划不属于到车状态 loadStatus={} warehouseId={}",loadStatus,warehouseId);
 				return R.fail(405,"当前配载计划不属于到车状态");
 			}
@@ -3940,27 +3953,27 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 			//删除
 			boolean b = trunklineCarsLoadScanService.deleteEntityByCarsLoadScanId(carsLoadScanId);
 			if(b){
-				updateNumByLoadId(loadId);
-				Integer isAbnormal = carsLoadScanEntity.getLoadingAbnormal();
 				Integer isData = carsLoadScanEntity.getIsData();
-				Integer num = carsLoadScanEntity.getNum();
-				Long trayId = carsLoadScanEntity.getTrayId();
-				String trayCode = carsLoadScanEntity.getTrayCode();
-				String orderCode = carsLoadScanEntity.getOrderCode();
-				String waybillNo = carsLoadScanEntity.getWaybillNo();
-				String scanCode = carsLoadScanEntity.getScanCode();
-				Integer type = carsLoadScanEntity.getType();
-				Long fromWarehouseId = carsLoadScanEntity.getFromWarehouseId();
-
-				DistributionStockArticleEntity stockArticleEntity = distributionStockArticleClient.findStockArticleByOrderCodeAndWarehouseId(orderCode, fromWarehouseId);
-				if(Objects.isNull(stockArticleEntity)){
-					log.warn("##################removeCarsLoadScan: 订单信息不存在 fromWarehouseId={} orderCode={}",fromWarehouseId,orderCode);
-					return R.fail(405,"订单信息不存在");
-				}
-				Long articleId = stockArticleEntity.getId();
-				distributionStockArticleClient.submitHandleNumByOrderId(-num,articleId);
+				if(isData == 1) {
+					updateNumByLoadId(loadId);
+					Integer isAbnormal = carsLoadScanEntity.getLoadingAbnormal();
+					Integer num = carsLoadScanEntity.getNum();
+					Long trayId = carsLoadScanEntity.getTrayId();
+					String trayCode = carsLoadScanEntity.getTrayCode();
+					String orderCode = carsLoadScanEntity.getOrderCode();
+					String waybillNo = carsLoadScanEntity.getWaybillNo();
+					String scanCode = carsLoadScanEntity.getScanCode();
+					Integer type = carsLoadScanEntity.getType();
+					Long fromWarehouseId = carsLoadScanEntity.getFromWarehouseId();
+
+					DistributionStockArticleEntity stockArticleEntity = distributionStockArticleClient.findStockArticleByOrderCodeAndWarehouseId(orderCode, fromWarehouseId);
+					if(Objects.isNull(stockArticleEntity)){
+						log.warn("##################removeCarsLoadScan: 订单信息不存在 fromWarehouseId={} orderCode={}",fromWarehouseId,orderCode);
+						return R.fail(405,"订单信息不存在");
+					}
+					Long articleId = stockArticleEntity.getId();
+					distributionStockArticleClient.submitHandleNumByOrderId(-num,articleId);
 
-				if(isData == 1){
 					if(type == 1){
 						DistributionParcelListEntity parcelListEntity = distributionParcelListClient.findByPacketBarCodeAndWarehouseId(scanCode, fromWarehouseId);
 						if(Objects.isNull(parcelListEntity)){
@@ -3981,6 +3994,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 					}else{
 						trayTypeClient.deleteZeroOrderByTrayCode(orderCode,trayCode,warehouseId);
 					}
+
 				}
 			}
 		}

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

@@ -15,8 +15,8 @@ import java.util.List;
 @AllArgsConstructor
 public class TrunklineCostShareRecordServiceImpl extends BaseServiceImpl<TrunklineCostShareRecordMapper, TrunklineCostShareRecordEntity> implements ITrunklineCostShareRecordService {
 	@Override
-	public TrunklineCostShareRecordEntity findPackageDataByLoadIdAndCode(String scanCode, Long loadId) {
-		return baseMapper.findPackageDataByLoadIdAndCode(scanCode,loadId);
+	public TrunklineCostShareRecordEntity findPackageDataByLoadIdAndCode(String scanCode, Long loadId,String tenantId) {
+		return baseMapper.findPackageDataByLoadIdAndCode(scanCode,loadId,tenantId);
 	}
 
 	@Override