Merge remote-tracking branch 'origin/dev' into pre-production

blade-biz-common/src/main/java/org/springblade/common/constant/factorydata/FactoryDataConstants.java

@@ -83,6 +83,7 @@ public abstract class FactoryDataConstants {
 			/**
 			 * 曼好家工厂订单
 			 */
+			String MWH_NODE_DATA_PUSH = "factory.data.queue.mwh.nodeDataPush" + DEVAUTH;
 			String MWH_FACTORY_ORDER = "factory.data.queue.mwh.factoryOrder" + DEVAUTH;
 			/**
 			 * 金牌工厂订单
@@ -134,6 +135,7 @@ public abstract class FactoryDataConstants {
 			/**
 			 * 曼好家工厂订单
 			 */
+			String MWH_NODE_DATA_PUSH = "mwh.nodeDataPush" + DEVAUTH;
 			String MWH_FACTORY_ORDER = "mwh.factoryOrder" + DEVAUTH;
 			/**
 			 * 金牌工厂订单

blade-service-api/logpm-factory-data-api/src/main/java/com/logpm/factorydata/util/FactoryDataUtil.java

@@ -27,6 +27,12 @@ public class FactoryDataUtil {
 		factorys.put(BrandEnums.OLO.getValue(), FactoryDataConstants.Mq.RoutingKeys.OLO_NODE_DATA_PUSH);
 		factorys.put(BrandEnums.SFY.getValue(), FactoryDataConstants.Mq.RoutingKeys.SFY_NODE_DATA_PUSH);
 		factorys.put(BrandEnums.MTMM.getValue(), FactoryDataConstants.Mq.RoutingKeys.MENGTIAN_NODE_DATA_PUSH);
+		factorys.put(BrandEnums.MHJ.getValue(), FactoryDataConstants.Mq.RoutingKeys.MWH_NODE_DATA_PUSH);
+		// 皮阿诺
+		// 欧派
+		factorys.put(BrandEnums.OP.getValue(), FactoryDataConstants.Mq.RoutingKeys.OPPEIN_NODE_DATA_PUSH);
+		// 金牌
+		factorys.put(BrandEnums.JP.getValue(), FactoryDataConstants.Mq.RoutingKeys.JP_NODE_DATA_PUSH);
 	}
 
 

blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/LoadCarsDTO.java

@@ -71,6 +71,8 @@ public class LoadCarsDTO implements Serializable {
 
 	private String trayCode;
 	private String trayName;
+	private String unloadTrayName;
+	private String unloadTrayCode;
 	private String trayType;
 	private Integer isZero;
 	private String scanCode;

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

@@ -130,6 +130,9 @@ public class TrunklineCarsLoadEntity extends TenantEntity {
 	/** 卸车件数 */
 	@ApiModelProperty(name = "卸车件数",notes = "")
 	private Integer unloadNumber ;
+	/** 卸车件数 */
+	@ApiModelProperty(name = "在车件数",notes = "")
+	private Integer stockNumber ;
 	/** 异常件数 */
 	@ApiModelProperty(name = "异常件数",notes = "")
 	private Integer abnormalNum ;

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

@@ -15,6 +15,8 @@ public class UnloadPackageVO implements Serializable {
 	private Integer unloadNum;
 	private String trayName;
 	private String trayCode;
+	private String unloadTrayName;
+	private String unloadTrayCode;
 	private String scanStatus;
 	private String unloadNodeName;
 	private String orderCode;

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

@@ -133,7 +133,7 @@ public class BasicdataWarehouseServiceImpl extends BaseServiceImpl<BasicdataWare
 	@Override
 	public List<BasicdataWarehouseEntity> getWarehouseList() {
 		List<BasicdataWarehouseEntity> myWatchWarehouse = getMyWatchWarehouse();
-		if (myWatchWarehouse.size() > 0) {
+		if (!myWatchWarehouse.isEmpty()) {
 			return myWatchWarehouse;
 		}
 		List<BasicdataWarehouseEntity> basicdataGoodsShelfVOList = warehouseMapper.getWarehouseList();

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/controller/CarsLoadController.java

@@ -88,17 +88,21 @@ public class CarsLoadController {
 
 			//当前登录人选择的仓库
 			BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse();
-			List<Long> warehouseIds = new ArrayList<>();
-			if(!Objects.isNull(myCurrentWarehouse)){
-				Long warehouseId = myCurrentWarehouse.getId();
-				warehouseIds.add(warehouseId);
-			}else{
-				List<BasicdataWarehouseEntity> myWatchWarehouse = warehouseClient.getMyWatchWarehouse();
-				myWatchWarehouse.forEach(warehouseEntity -> {
-					warehouseIds.add(warehouseEntity.getId());
-				});
+			if(Objects.isNull(myCurrentWarehouse)){
+				log.warn(method+"仓库信息为空 myCurrentWarehouse={}",myCurrentWarehouse);
+				return R.fail(400,"多仓权限无法操作，请选择仓库");
 			}
-			loadCarsDTO.setWarehouseIds(warehouseIds);
+//			List<Long> warehouseIds = new ArrayList<>();
+//			if(!Objects.isNull(myCurrentWarehouse)){
+//				Long warehouseId = myCurrentWarehouse.getId();
+//				warehouseIds.add(warehouseId);
+//			}else{
+//				List<BasicdataWarehouseEntity> myWatchWarehouse = warehouseClient.getMyWatchWarehouse();
+//				myWatchWarehouse.forEach(warehouseEntity -> {
+//					warehouseIds.add(warehouseEntity.getId());
+//				});
+//			}
+			loadCarsDTO.setWarehouseId(myCurrentWarehouse.getId());
 
 			IPage<TrunklineCarsLoadVO> pages = carsLoadService.arriveCarsPageList(loadCarsDTO);
 			return R.data(pages);

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

@@ -8,6 +8,7 @@
                ltcl.cars_line_name carsLineName,
                ltcl.plan_loading_number planLoadingNumber,
                ltcl.real_loading_number realLoadingNumber,
+               ltcl.stock_number stockCarsNum,
                ltcl.unload_number unloadNumber,
                ltcl.loading_type loadingType,
                ltcl.full_load_rate fullLoadRate,
@@ -107,6 +108,7 @@
         ltcl.cars_no carsNo,
         ltcl.plan_loading_number planLoadingNumber,
         ltcl.real_loading_number realLoadingNumber,
+        ltcl.stock_number stockCarsNum,
         ltcl.unload_number unloadNumber,
         ltcl.full_load_rate fullLoadRate,
         ltcl.is_customer isCustomer,
@@ -141,18 +143,9 @@
         where ltcl.is_deleted = 0
         and ltcl.load_status != '100'
         and ltcl.load_type != '4'
-        <if test="param.warehouseIds != null and param.warehouseIds.size() > 0" >
-            and ltcl.start_warehouse_id in
-            <foreach collection="param.warehouseIds" item="item" open="(" separator="," close=")">
-                #{item}
-            </foreach>
-        </if>
         <if test="param.warehouseId != null" >
             and ltcl.end_warehouse_ids like concat('%',#{param.warehouseId},'%')
         </if>
-        <if test="param.endWarehouseId != null" >
-            and Locate(#{param.endWarehouseId},ltcl.end_warehouse_ids) > 0
-        </if>
         <if test="param.warehouseName != null and param.warehouseName != ''">
             and (Locate(#{param.warehouseName},ltcl.start_warehouse_name) > 0 or Locate(#{param.warehouseName},ltcl.end_warehouse_names) > 0)
         </if>

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

@@ -185,4 +185,6 @@ public interface TrunklineCarsLoadScanMapper extends BaseMapper<TrunklineCarsLoa
 	List<Long> findAllIdListByLoadIdAndScanStatus(@Param("loadId") Long loadId, @Param("scanStatus") String scanStatus);
 
     CustmoerUnloadNumVO findCarsLoadCustomeNumByLoadIdAndUnloadWarehouseId(@Param("loadId") Long loadId, @Param("warehouseId") Long warehouseId);
+
+	Integer findStockNumByLoadId(@Param("loadId") Long loadId);
 }

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

@@ -115,6 +115,12 @@
         <if test="param.trayCode != null and param.trayCode != ''">
             and Locate(#{param.trayCode},cls.tray_code) > 0
         </if>
+        <if test="param.unloadTrayName != null and param.unloadTrayName != ''">
+            and Locate(#{param.unloadTrayName},cls.unload_tray_name) > 0
+        </if>
+        <if test="param.unloadTrayCode != null and param.unloadTrayCode != ''">
+            and Locate(#{param.unloadTrayCode},cls.unload_tray_code) > 0
+        </if>
         <if test="param.unloadNodeName != null and param.unloadNodeName != ''">
             and Locate(#{param.unloadNodeName},cls.unload_node_name) > 0
         </if>
@@ -940,6 +946,8 @@
                unload_num unloadNum,
                tray_code trayCode,
                tray_name trayName,
+                unload_tray_code unloadTrayCode,
+                unload_tray_name unloadTrayName,
                scan_status scanStatus,
                unload_node_name unloadNodeName,
                order_code orderCode,
@@ -993,5 +1001,12 @@
          and sign_order_id is not null
     </select>
 
+    <select id="findStockNumByLoadId" resultType="int">
+        select IFNULL(sum(num),0)
+        from logpm_trunkline_cars_load_scan
+        where load_id = #{loadId}
+          and scan_status = '1'
+    </select>
+
 
 </mapper>

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

@@ -181,4 +181,6 @@ public interface ITrunklineCarsLoadScanService extends BaseService<TrunklineCars
 	List<Long> findAllIdListByLoadIdAndScanStatus(Long loadId, String scanStatus);
 
 	CustmoerUnloadNumVO findCarsLoadCustomeNumByLoadIdAndUnloadWarehouseId(Long loadId, Long warehouseId);
+
+	Integer findStockNumByLoadId(Long loadId);
 }

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

@@ -262,55 +262,57 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 
 		//收货单位-----根据三方商场找到对应的clientId
 		Long clientId = basicdataTripartiteMallClient.getClientIdByNameAndBrandAndCode(dealerName,StringUtil.isBlank(dealerCode)?"":dealerCode, brand);
-		BasicdataClientVO basicdataClientEntity = basicdataClientClient.findEntityVoById(clientId);
-		if (!Objects.isNull(basicdataClientEntity)) {
-			openOrderVO.setConsigneeClientId(clientId);
-			openOrderVO.setConsignee(basicdataClientEntity.getClientName());
-			openOrderVO.setConsigneeName(basicdataClientEntity.getLinkman());
-			openOrderVO.setConsigneeMobile(basicdataClientEntity.getPhone());
-			openOrderVO.setConsigneeAddress(basicdataClientEntity.getDetailedly());
+		if(!Objects.isNull(clientId)){
+			BasicdataClientVO basicdataClientEntity = basicdataClientClient.findEntityVoById(clientId);
+			if (!Objects.isNull(basicdataClientEntity)) {
+				openOrderVO.setConsigneeClientId(clientId);
+				openOrderVO.setConsignee(basicdataClientEntity.getClientName());
+				openOrderVO.setConsigneeName(basicdataClientEntity.getLinkman());
+				openOrderVO.setConsigneeMobile(basicdataClientEntity.getPhone());
+				openOrderVO.setConsigneeAddress(basicdataClientEntity.getDetailedly());
 
 
-			List<String> destinationArray = new ArrayList<>();
-			String badeRegionAreaId = basicdataClientEntity.getBladeRegionAreaId();
-			String bladeRegionProvinceId = basicdataClientEntity.getBladeRegionProvinceId();
-			String bladeRegionCityId = basicdataClientEntity.getBladeRegionCityId();
-			destinationArray.add(bladeRegionProvinceId);
-			destinationArray.add(bladeRegionCityId);
-			String name = regionFeign.getName(bladeRegionCityId);
-			String areaId = bladeRegionCityId;
-			if (!StringUtil.isBlank(badeRegionAreaId)) {
-				destinationArray.add(badeRegionAreaId);
-				name = regionFeign.getName(badeRegionAreaId);
-				areaId = badeRegionAreaId;
-			}
+				List<String> destinationArray = new ArrayList<>();
+				String badeRegionAreaId = basicdataClientEntity.getBladeRegionAreaId();
+				String bladeRegionProvinceId = basicdataClientEntity.getBladeRegionProvinceId();
+				String bladeRegionCityId = basicdataClientEntity.getBladeRegionCityId();
+				destinationArray.add(bladeRegionProvinceId);
+				destinationArray.add(bladeRegionCityId);
+				String name = regionFeign.getName(bladeRegionCityId);
+				String areaId = bladeRegionCityId;
+				if (!StringUtil.isBlank(badeRegionAreaId)) {
+					destinationArray.add(badeRegionAreaId);
+					name = regionFeign.getName(badeRegionAreaId);
+					areaId = badeRegionAreaId;
+				}
 
 
-			openOrderVO.setDefaultDeliveryWay("2");
-			String typeService = "1";
-			BasicdataStoreBusinessEntity storeBusinessEntity = basicdataStoreBusinessClient.findByClientIdAndTypeService(clientId, 3);
-			if(!Objects.isNull(storeBusinessEntity)){
-				typeService = storeBusinessEntity.getMold();
-			}
-			if ("1".equals(typeService)){
 				openOrderVO.setDefaultDeliveryWay("2");
-			}else if("2".equals(typeService)){
-				openOrderVO.setDefaultDeliveryWay("3");
-			}else if("3".equals(typeService)){
-				openOrderVO.setDefaultDeliveryWay("1");
-			}
+				String typeService = "1";
+				BasicdataStoreBusinessEntity storeBusinessEntity = basicdataStoreBusinessClient.findByClientIdAndTypeService(clientId, 3);
+				if(!Objects.isNull(storeBusinessEntity)){
+					typeService = storeBusinessEntity.getMold();
+				}
+				if ("1".equals(typeService)){
+					openOrderVO.setDefaultDeliveryWay("2");
+				}else if("2".equals(typeService)){
+					openOrderVO.setDefaultDeliveryWay("3");
+				}else if("3".equals(typeService)){
+					openOrderVO.setDefaultDeliveryWay("1");
+				}
 
-			openOrderVO.setDestination(name);
-			openOrderVO.setDestinationCode(areaId);
-			openOrderVO.setDestinationArray(destinationArray);
+				openOrderVO.setDestination(name);
+				openOrderVO.setDestinationCode(areaId);
+				openOrderVO.setDestinationArray(destinationArray);
 
-			openOrderVO.setDefaultPayWay(basicdataClientEntity.getDefaultPaymentMethods());
+				openOrderVO.setDefaultPayWay(basicdataClientEntity.getDefaultPaymentMethods());
 
-			//查询目的仓数据
-			BasicdataStorageServicesEntity basicdataStorageServicesEntity = basicdataStorageServicesClient.findEntityBySendWarehouseIdAndClientId(warehouseId, clientId);
-			if (!Objects.isNull(basicdataStorageServicesEntity)) {
-				openOrderVO.setDestinationWarehouseId(basicdataStorageServicesEntity.getServeWarehouseId());
-				openOrderVO.setDestinationWarehouseName(basicdataStorageServicesEntity.getServeWarehouseName());
+				//查询目的仓数据
+				BasicdataStorageServicesEntity basicdataStorageServicesEntity = basicdataStorageServicesClient.findEntityBySendWarehouseIdAndClientId(warehouseId, clientId);
+				if (!Objects.isNull(basicdataStorageServicesEntity)) {
+					openOrderVO.setDestinationWarehouseId(basicdataStorageServicesEntity.getServeWarehouseId());
+					openOrderVO.setDestinationWarehouseName(basicdataStorageServicesEntity.getServeWarehouseName());
+				}
 			}
 		}
 

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

@@ -216,7 +216,7 @@ public class TrunklineAdvanceDetailServiceImpl extends BaseServiceImpl<Trunkline
 			String filename = QRCodeUtil.createCodeToFile(vo.getQrCode());
 			map.put("img", QRCodeUtil.getEmpAutograph(filename));
 			// 订单号 生成二维码
-			String fileTypeName = QRCodeUtil.createCodeToFile(vo.getQrCode());
+			String fileTypeName = QRCodeUtil.createCodeToFile(vo.getOrderCode());
 			map.put("imgType", QRCodeUtil.getEmpAutograph(fileTypeName));
 			data.add(map);
 			String tempData = TemplateUtil.popTemplate(template.getTemplateName(), map, orderPackgeCodeDataVO.getTemplateHtml());

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

@@ -464,4 +464,9 @@ public class TrunklineCarsLoadScanServiceImpl extends BaseServiceImpl<TrunklineC
 		return baseMapper.findCarsLoadCustomeNumByLoadIdAndUnloadWarehouseId(loadId,warehouseId);
 	}
 
+	@Override
+	public Integer findStockNumByLoadId(Long loadId) {
+		return baseMapper.findStockNumByLoadId(loadId);
+	}
+
 }

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

@@ -480,7 +480,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 				// 发车
 				if (ObjectUtil.equal(type, 1)) {
 					if (ObjectUtil.isEmpty(node)) {
-						if (ObjectUtil.equal(warehouseId, brand.getStartWarehouseId())) {
+						if (ObjectUtil.equal(warehouseId, Long.parseLong(brand.getStartWarehouseId()))) {
 							node = WorkNodeEnums.INITIAL_WAREHOUSE_DEPART;
 						} else {
 							node = WorkNodeEnums.TRANSFER_WAREHOUSE_DEPART;
@@ -1481,6 +1481,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 		carsLoadEntity.setPlanLoadingNumber(0);
 		carsLoadEntity.setRealLoadingNumber(0);
 		carsLoadEntity.setUnloadNumber(0);
+		carsLoadEntity.setStockNumber(0);
 		carsLoadEntity.setAbnormalNum(0);
 		carsLoadEntity.setNowWarehouseId(warehouseId);
 		carsLoadEntity.setIsSettlement("1");
@@ -1579,15 +1580,17 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 			trunklineCarsLoadLineService.updatePlanLoadingNumberByLoadLineId(planNum, loadLineId);
 		}
 		carsLoadEntity.setPlanLoadingNumber(loadPlanNum);
-		updateById(carsLoadEntity);
+//		updateById(carsLoadEntity);
 
 		//装车 卸车数量
 		Integer realLoadingNum = trunklineCarsLoadScanService.findNumByLoadId(loadId);//配载计划实际装车数量
 		Integer realUnloadingNum = trunklineCarsLoadScanService.findUnloadNumByLoadId(loadId);//配载计划实际卸车数量
+		Integer stockCarNum = trunklineCarsLoadScanService.findStockNumByLoadId(loadId);//配载计划在车件数
 		Integer abnormalNum = trunklineCarsLoadScanService.findAbnormalNumByLoadId(loadId);//配载计划装车异常数量
 //		Integer unloadAbnormalNum = trunklineCarsUnloadLogService.findAbnormalNumByLoadId(loadId);//配载计划卸车异常数量
 		carsLoadEntity.setRealLoadingNumber(realLoadingNum);
 		carsLoadEntity.setUnloadNumber(realUnloadingNum);
+		carsLoadEntity.setStockNumber(stockCarNum);
 		carsLoadEntity.setAbnormalNum(abnormalNum);
 		updateById(carsLoadEntity);
 
@@ -4154,7 +4157,8 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 			String value = DictBizCache.getValue(DictBizConstant.CARS_LOAD_STATUS, loadStatus);
 			Integer realLoadingNumber = trunklineCarsLoadVO.getRealLoadingNumber();
 			Integer unloadNumber = trunklineCarsLoadVO.getUnloadNumber();
-			trunklineCarsLoadVO.setRealLoadingNumber(realLoadingNumber - unloadNumber);
+			Integer stockCarsNum = trunklineCarsLoadVO.getStockNumber();
+			trunklineCarsLoadVO.setRealLoadingNumber(stockCarsNum);
 			trunklineCarsLoadVO.setLoadStatus(value);
 		}
 		pageList.setRecords(records);
@@ -7895,7 +7899,10 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 
 		JSONObject abnormalRecord = abnormalRecordClient.findListByCarsNoAndUpWarehouseId(carsNo, warehouseId);
 
-		map.put("three", "当前待处理异常 " + abnormalRecord.getInteger("dealwithNum") + " 条、已处理异常 " + abnormalRecord.getInteger("noDealwithNum") + " 条");
+		if(abnormalRecord != null){
+			map.put("three", "当前待处理异常 " + abnormalRecord.getInteger("dealwithNum") + " 条、已处理异常 " + abnormalRecord.getInteger("noDealwithNum") + " 条");
+		}
+
 
 		return R.data(map);
 	}
@@ -8124,11 +8131,11 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 
 		String loadStatus = trunklineCarsLoadVO.getLoadStatus();
 		trunklineCarsLoadVO.setLoadStatus(DictBizCache.getValue(DictBizConstant.CARS_LOAD_STATUS, loadStatus));
-		int i = realLoadingNumber - unloadNumber;
-		if(i < 0) {
-			i = 0;
-		}
-		trunklineCarsLoadVO.setStockCarsNum(i);
+//		int i = realLoadingNumber - unloadNumber;
+//		if(i < 0) {
+//			i = 0;
+//		}
+		trunklineCarsLoadVO.setStockCarsNum(carsLoadEntity.getStockNumber());
 		trunklineCarsLoadVO.setLoadScanOrderList(loadScanOrderList);
 		trunklineCarsLoadVO.setZeroList(zeroList);
 		trunklineCarsLoadVO.setExceptionList(exceptionList);
@@ -8486,7 +8493,8 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 
 			Integer realLoadingNumber = trunklineCarsLoadVO.getRealLoadingNumber();
 			Integer unloadNumber = trunklineCarsLoadVO.getUnloadNumber();
-			trunklineCarsLoadVO.setRealLoadingNumber(realLoadingNumber - unloadNumber);
+			Integer stockCarNumber = trunklineCarsLoadVO.getStockNumber();
+			trunklineCarsLoadVO.setRealLoadingNumber(stockCarNumber);
 			trunklineCarsLoadVO.setTotalLoadingNum(realLoadingNumber);
 		}
 		pageList.setRecords(records);
@@ -8920,8 +8928,10 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 					trunklineCarsLoadScanEntity.setLoadingUserName(AuthUtil.getNickName());
 					trunklineCarsLoadScanEntity.setUnloadUserName(AuthUtil.getNickName());
 					trunklineCarsLoadScanEntity.setUnloadTime(new Date());
-					trunklineCarsLoadScanEntity.setUnloadTrayCode(unloadTrayCode);
-					trunklineCarsLoadScanEntity.setUnloadTrayName(unloadTrayName);
+					if(isData==1){
+						trunklineCarsLoadScanEntity.setUnloadTrayCode(unloadTrayCode);
+						trunklineCarsLoadScanEntity.setUnloadTrayName(unloadTrayName);
+					}
 					trunklineCarsLoadScanService.save(trunklineCarsLoadScanEntity);
 					loadScanId = trunklineCarsLoadScanEntity.getId();
 
@@ -9085,6 +9095,9 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 		} else {
 			String scanStatus = carsLoadScanEntity.getScanStatus();
 			if(!"1".equals(scanStatus)){
+				carsLoadScanEntity.setUnloadTrayCode(unloadTrayCode);
+				carsLoadScanEntity.setUnloadTrayName(unloadTrayName);
+				trunklineCarsLoadScanService.updateById(carsLoadScanEntity);
 				log.warn("##############unloadPackage: 包件已卸车 orderPackageCode={}", orderPackageCode);
 				return R.fail(405, "包件已卸车");
 			}
@@ -10623,8 +10636,10 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 		BeanUtil.copy(carsLoadEntity, trunklineCarsLoadVO);
 		Integer realLoadingNumber = trunklineCarsLoadVO.getRealLoadingNumber();
 		Integer unloadNumber = trunklineCarsLoadVO.getUnloadNumber();
+		int stockCarNumber = realLoadingNumber - unloadNumber;
+
 		trunklineCarsLoadVO.setUnloadNumber(loadLineEntity.getUnloadNumber());
-		trunklineCarsLoadVO.setRealLoadingNumber(realLoadingNumber - unloadNumber);
+		trunklineCarsLoadVO.setRealLoadingNumber(stockCarNumber<0?0:stockCarNumber);
 		trunklineCarsLoadVO.setUnloadScanOrderList(unloadScanOrderList);
 		trunklineCarsLoadVO.setUnloadZeroList(zeroList);
 		trunklineCarsLoadVO.setExceptionList(exceptionList);