1.干线bug修复

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

@@ -11,6 +11,7 @@ import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springblade.common.exception.CustomerException;
+import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
 import org.springframework.web.bind.annotation.*;
 
@@ -89,7 +90,7 @@ public class IncomingController {
 				log.warn(method+"处理订单数据为空");
 				return R.fail(405,"处理订单数据为空");
 			}
-
+			inComingDTO.setNickName(AuthUtil.getNickName());
 
 			return inComingService.incomingBatchOrder(inComingDTO,null);
 		}catch (CustomerException e){

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

@@ -2852,6 +2852,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 			carsLoadScanEntity.setLoadingAbnormal(isAbnormal);
 			carsLoadScanEntity.setUnloadAbnormal(0);
 			carsLoadScanEntity.setUnloadCheck(0);
+			carsLoadScanEntity.setUnloadNum(0);
 			carsLoadScanEntity.setType(2);
 			carsLoadScanEntity.setIsData(isData);
 			carsLoadScanEntity.setTrayId(trayId);