1.考核-新增导入考核积分

2.干线-修复 bug

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionParcelListClient.java

@@ -140,4 +140,7 @@ public interface IDistributionParcelListClient {
 
 	@GetMapping(API_PREFIX+"/findByWaybillNumber")
 	List<DistributionParcelListEntity> findByWaybillNumber(@RequestParam String waybillNumber);
+
+	@GetMapping(API_PREFIX+"/findEntityListByOrderCodeAndStatus")
+	List<DistributionParcelListEntity> findEntityListByOrderCodeAndStatus(@RequestParam String orderCode, @RequestParam Long warehouseId, @RequestParam String packageStatus);
 }

blade-service-api/logpm-supervise-api/pom.xml

@@ -13,5 +13,12 @@
     <artifactId>logpm-supervise-api</artifactId>
     <version>3.2.0.RELEASE</version>
 
+    <dependencies>
+        <dependency>
+            <groupId>org.springblade</groupId>
+            <artifactId>blade-starter-excel</artifactId>
+        </dependency>
+    </dependencies>
+
 
 </project>

blade-service-api/logpm-supervise-api/src/main/java/com/logpm/supervise/dto/ImportClassifyDTO.java

@@ -0,0 +1,29 @@
+package com.logpm.supervise.dto;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class ImportClassifyDTO implements Serializable {
+
+	@ExcelProperty(value = "指标分类")
+	private String parentClassifyName;
+
+	@ExcelProperty(value = "指标分类描述")
+	private String parentClassifyDesc;
+
+	@ExcelProperty(value = "指标分类备注")
+	private String parentClassifyRemark;
+
+	@ExcelProperty(value = "指标名称")
+	private String classifyName;
+
+	@ExcelProperty(value = "指标描述")
+	private String classifyDesc;
+
+	@ExcelProperty(value = "积分值")
+	private String points;
+
+}

blade-service-api/logpm-supervise-api/src/main/java/com/logpm/supervise/vo/ClassifyVO.java

@@ -36,6 +36,7 @@ public class ClassifyVO extends ClassifyEntity {
 	private static final long serialVersionUID = 1L;
 
 	private String parentClassifyName;
+	private String createDeptName;
 
 	private List<PointsEntity> pointsEntities = new ArrayList<>();
 

blade-service-api/logpm-supervise-api/src/main/java/com/logpm/supervise/vo/IndicatorsVO.java

@@ -15,6 +15,8 @@ public class IndicatorsVO extends IndicatorsEntity {
 
 	private String classifyName;
 
+	private String createDeptName;
+
 	private Long parentClassifyId;
 
 	private String createdUserName;

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

@@ -8,6 +8,7 @@ import lombok.Data;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 @Data
@@ -87,4 +88,26 @@ public class LoadCarsDTO implements Serializable {
 
 	private String signOrderIds;
 
+	private String openTimeStartStr;
+	private String openTimeEndStr;
+
+	private Date openTimeStart;
+	private Date openTimeEnd;
+
+
+	private String enterTimeStartStr;
+	private String enterTimeEndStr;
+
+	private Date enterTimeStart;
+	private Date enterTimeEnd;
+
+	private String destination;
+
+	private String destinationWarehouseName;
+	private String productName;
+	private String shipper;
+	private String consignee;
+	private String customerTrain;
+	private String remark;
+
 }

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

@@ -34,5 +34,6 @@ public class CarsLoadAllOrderVO implements Serializable {
 	private BigDecimal freight;//运费
 	private String productName;//品类
 	private String type;//类型
+	private Date warehouseEntryTimeEnd;//入库时间
 
 }

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionParcelListClient.java

@@ -294,4 +294,9 @@ public class DistributionParcelListClient implements IDistributionParcelListClie
 	public List<DistributionParcelListEntity> findByWaybillNumber(String waybillNumber) {
 		return distributionParcelListService.findByWaybillNumber(waybillNumber);
 	}
+
+	@Override
+	public List<DistributionParcelListEntity> findEntityListByOrderCodeAndStatus(String orderCode, Long warehouseId, String packageStatus) {
+		return distributionParcelListService.findEntityListByOrderCodeAndStatus(orderCode,warehouseId,packageStatus);
+	}
 }

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionParcelListService.java

@@ -193,4 +193,7 @@ public interface IDistributionParcelListService extends BaseService<Distribution
 	 * @return
 	 */
 	R searchNode(String packageCode);
+
+    List<DistributionParcelListEntity> findEntityListByOrderCodeAndStatus(String orderCode, Long warehouseId, String packageStatus);
+
 }

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionParcelListServiceImpl.java

@@ -34,7 +34,6 @@ import com.logpm.distribution.dto.app.StockupDTO;
 import com.logpm.distribution.entity.*;
 import com.logpm.distribution.excel.DistributionParcelListExcel;
 import com.logpm.distribution.mapper.DistributionParcelListMapper;
-import com.logpm.distribution.mapper.DistributionParcelNumberMapper;
 import com.logpm.distribution.mapper.DistributionStockArticleMapper;
 import com.logpm.distribution.service.*;
 import com.logpm.distribution.vo.*;
@@ -1020,4 +1019,15 @@ public class DistributionParcelListServiceImpl extends BaseServiceImpl<Distribut
 		return R.data(listNodeVOS);
 	}
 
+	@Override
+	public List<DistributionParcelListEntity> findEntityListByOrderCodeAndStatus(String orderCode, Long warehouseId, String packageStatus) {
+		QueryWrapper<DistributionParcelListEntity> queryWrapper = new QueryWrapper<>();
+		queryWrapper.eq("order_code",orderCode)
+			.eq("warehouse_id",warehouseId)
+			.eq("order_package_status",packageStatus)
+			.eq("is_transfer",1)
+			.eq("is_deleted",0);
+		return baseMapper.selectList(queryWrapper);
+	}
+
 }

blade-service/logpm-supervise/src/main/java/com/logpm/supervise/controller/ClassifyController.java

@@ -35,6 +35,7 @@ import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 import springfox.documentation.annotations.ApiIgnore;
 
 import javax.validation.Valid;
@@ -247,6 +248,24 @@ public class ClassifyController extends BladeController {
 		}
 	}
 
+	@PostMapping("/importClassify")
+	@ApiOperationSupport(order = 5)
+	@ApiOperation(value = "导入考核指标", notes = "传入indicatorsDTO")
+	public R importClassify(@RequestParam(value = "file") MultipartFile file) {
+		String method = "##############selectPointList: ";
+		log.info(method+"导入考核指标");
+
+		try{
+			return classifyService.importClassify(file);
+		}catch (CustomerException e){
+			log.error(e.message,e);
+			return R.fail(e.code,e.message);
+		}catch (Exception e){
+			log.error(method+"系统异常",e);
+			return R.fail(500,"系统异常");
+		}
+	}
+
 
 
 }

blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/IClassifyService.java

@@ -25,7 +25,9 @@ import com.logpm.supervise.vo.IndicatorsVO;
 import com.logpm.supervise.vo.api.ClassifyApiVO;
 import org.springblade.core.mp.base.BaseService;
 import org.springblade.core.tool.api.R;
+import org.springframework.web.multipart.MultipartFile;
 
+import java.io.IOException;
 import java.util.List;
 import java.util.Map;
 
@@ -100,4 +102,6 @@ public interface IClassifyService extends BaseService<ClassifyEntity> {
 	 */
 	R deptList();
 
+    R importClassify(MultipartFile file) throws IOException;
+
 }

blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/impl/ClassifyServiceImpl.java

@@ -16,11 +16,13 @@
  */
 package com.logpm.supervise.service.impl;
 
+import com.alibaba.excel.EasyExcel;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.logpm.supervise.dto.ClassifyDTO;
+import com.logpm.supervise.dto.ImportClassifyDTO;
 import com.logpm.supervise.dto.IndicatorsDTO;
 import com.logpm.supervise.entity.ClassifyEntity;
 import com.logpm.supervise.entity.IndicatorsAnnexEntity;
@@ -42,6 +44,7 @@ import com.logpm.supervise.wrapper.IndicatorsWrapper;
 import com.logpm.supervise.wrapper.PointsWrapper;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springblade.common.exception.CustomerException;
 import org.springblade.common.utils.CommonUtil;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springblade.core.secure.BladeUser;
@@ -58,7 +61,10 @@ import org.springblade.system.feign.ISysClient;
 import org.springblade.system.feign.IUserClient;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.multipart.MultipartFile;
 
+import java.io.IOException;
+import java.io.InputStream;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -106,8 +112,12 @@ public class ClassifyServiceImpl extends BaseServiceImpl<ClassifyMapper, Classif
 		IPage<ClassifyVO> pages = baseMapper.pageList(page, classifyDTO);
 		List<ClassifyVO> records = pages.getRecords();
 
-		if (!"1".equals(isPid)) {
-			for (ClassifyVO record : records) {
+
+		for (ClassifyVO record : records) {
+			Long deptId = record.getCreateDept();
+			String deptName = deptClient.findNameById(deptId);
+			record.setCreateDeptName(deptName);
+			if (!"1".equals(isPid)) {
 				Long classifyId = record.getId();
 				Long pId1 = record.getPId();
 				ClassifyEntity classifyEntity = getById(pId1);
@@ -410,6 +420,75 @@ public class ClassifyServiceImpl extends BaseServiceImpl<ClassifyMapper, Classif
 		return R.data(userDeptNode);
 	}
 
+	@Transactional(rollbackFor = Exception.class)
+	@Override
+	public R importClassify(MultipartFile file) throws IOException {
+		if(Objects.isNull(file)){
+			log.warn("##################importClassify: 文件不存在");
+			return R.fail(405,"文件不存在");
+		}
+		InputStream inputStream = file.getInputStream();
+
+		List<ImportClassifyDTO> importClassifyDTOS = EasyExcel.read(inputStream).head(ImportClassifyDTO.class).sheet(0).headRowNumber(1).doReadSync();
+
+		for (ImportClassifyDTO importClassifyDTO : importClassifyDTOS) {
+			String parentClassifyName = importClassifyDTO.getParentClassifyName();
+			String parentClassifyDesc = importClassifyDTO.getParentClassifyDesc();
+			String parentClassifyRemark = importClassifyDTO.getParentClassifyRemark();
+			//判断指标分类是否已经存在
+			QueryWrapper<ClassifyEntity> queryWrapper = new QueryWrapper<>();
+			queryWrapper.eq("name",parentClassifyName)
+				.eq("p_id",0)
+				.eq("is_deleted",0);
+			ClassifyEntity parnetClassifyEntity = baseMapper.selectOne(queryWrapper);
+			if(Objects.isNull(parnetClassifyEntity)){
+				parnetClassifyEntity = new ClassifyEntity();
+				parnetClassifyEntity.setName(parentClassifyName);
+				parnetClassifyEntity.setDescription(parentClassifyDesc);
+				parnetClassifyEntity.setRemark(parentClassifyRemark);
+				parnetClassifyEntity.setPId(0L);
+			}else{
+				parnetClassifyEntity.setDescription(parentClassifyDesc);
+				parnetClassifyEntity.setRemark(parentClassifyRemark);
+			}
+			boolean pb = saveOrUpdate(parnetClassifyEntity);
+			if(!pb){
+				log.warn("#############importClassify: 保存指标分类失败");
+				throw new CustomerException(405,"保存指标分类失败");
+			}
+			Long parentClassifyId = parnetClassifyEntity.getId();
+
+			String classifyName = importClassifyDTO.getClassifyName();
+			String classifyDesc = importClassifyDTO.getClassifyDesc();
+
+			ClassifyEntity classifyEntity = new ClassifyEntity();
+			classifyEntity.setName(classifyName);
+			classifyEntity.setDescription(classifyDesc);
+			classifyEntity.setPId(parentClassifyId);
+			boolean b = save(classifyEntity);
+			if(!b){
+				log.warn("#############importClassify: 保存指标失败");
+				throw new CustomerException(405,"保存指标失败");
+			}
+			Long classifyId = classifyEntity.getId();
+
+			String points = importClassifyDTO.getPoints();
+			points = points.replaceAll("，",",");
+			String[] pointArray = points.split(",");
+
+			List<PointsEntity> ls = new ArrayList<>();
+			for (String point : pointArray) {
+				PointsEntity pointsEntity = new PointsEntity();
+				pointsEntity.setClassifyId(classifyId);
+				pointsEntity.setPoint(Integer.parseInt(point));
+				ls.add(pointsEntity);
+			}
+			pointsService.saveBatch(ls);
+		}
+
+		return R.success("导入成功");
+	}
+
 	private List<ClassifyApiVO> getClassifyList(Long pid) {
 		return baseMapper.selectAllClassifyList(pid);
 	}

blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/impl/IndicatorsServiceImpl.java

@@ -14,6 +14,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springblade.common.utils.CommonUtil;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springblade.core.tool.api.R;
+import org.springblade.system.feign.IDeptClient;
 import org.springframework.stereotype.Service;
 
 import java.util.Date;
@@ -27,6 +28,8 @@ public class IndicatorsServiceImpl extends BaseServiceImpl<IndicatorsMapper, Ind
 
 	private final IIndicatorsAnnexService iIndicatorsAnnexService;
 
+	private final IDeptClient deptClient;
+
 	@Override
 	public R findIndicatorsList(IndicatorsDTO indicatorsDTO) {
 
@@ -44,6 +47,14 @@ public class IndicatorsServiceImpl extends BaseServiceImpl<IndicatorsMapper, Ind
 
 		IPage<IndicatorsVO> pages = baseMapper.pageList(page,indicatorsDTO);
 
+		List<IndicatorsVO> records = pages.getRecords();
+
+		for (IndicatorsVO record : records) {
+			Long deptId = record.getCreateDept();
+			String deptName = deptClient.findNameById(deptId);
+			record.setCreateDeptName(deptName);
+		}
+		pages.setRecords(records);
 
 		return R.data(pages);
 	}

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

@@ -7,7 +7,6 @@ import com.logpm.basicdata.feign.IBasicdataWarehouseClient;
 import com.logpm.trunkline.dto.BillladingDTO;
 import com.logpm.trunkline.service.ITrunklineBillladingService;
 import com.logpm.trunkline.vo.TrunklineBillladingDetailListVO;
-import com.logpm.trunkline.vo.TrunklineBillladingDetailVO;
 import com.logpm.trunkline.vo.TrunklineBillladingVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -78,9 +77,11 @@ public class BillladingApiController {
 			}
 			billladingDTO.setWarehouseId(myCurrentWarehouse.getId());
 
-			IPage<TrunklineBillladingDetailVO> pages = billladingService.billladingList(billladingDTO);
+//			IPage<TrunklineBillladingDetailVO> pages = billladingService.billladingList(billladingDTO);
+//			return R.data(pages);
+
+			return billladingService.billladingList(billladingDTO);
 
-			return R.data(pages);
 		}catch (CustomerException e){
 			log.error(e.message,e);
 			return R.fail(e.code,e.message);

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

@@ -391,7 +391,7 @@ public class CarsLoadApiController {
 				return R.fail(405,"包件码不能为空");
 			}
 
-			return carsLoadService.loadingScan(loadId,myCurrentWarehouse.getId(),orderPackageCode,loadCarsDTO.getTrayCode());
+			return carsLoadService.loadingScan(loadId,myCurrentWarehouse.getId(),orderPackageCode,loadCarsDTO.getTrayCode(),"正常装车");
 		}catch (CustomerException e){
 			log.error(e.message,e);
 			return R.fail(e.code,e.message);

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

@@ -50,10 +50,11 @@ public class BillladingController {
 			//当前登录人选择的仓库
 			BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse();
 			if(!Objects.isNull(myCurrentWarehouse)){
-//				log.warn(method+"仓库信息为空 myCurrentWarehouse={}",myCurrentWarehouse);
-//				return R.fail(403,"仓库信息为空");
-				billladingDTO.setWarehouseId(myCurrentWarehouse.getId());
+				log.warn(method+"仓库信息为空 myCurrentWarehouse={}",myCurrentWarehouse);
+				return R.fail(403,"仓库信息为空");
 			}
+			billladingDTO.setWarehouseId(myCurrentWarehouse.getId());
+
 			IPage<TrunklineBillladingVO> pages = trunklineBillladingService.pageList(billladingDTO);
 
 			return R.data(pages);

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

@@ -13,7 +13,6 @@ import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springblade.common.exception.CustomerException;
-import org.springblade.core.redis.lock.RedisLock;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.StringUtil;
 import org.springframework.web.bind.annotation.*;
@@ -1905,4 +1904,37 @@ public class CarsLoadController {
 		}
 	}
 
+	@ResponseBody
+	@PostMapping("/manualLoading")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "手动装车", notes = "传入loadCarsDTO")
+	public R manualLoading(@RequestBody LoadCarsDTO loadCarsDTO) {
+		String method = "############manualLoading: ";
+		log.info(method + "请求参数{}", loadCarsDTO);
+		Long loadId = loadCarsDTO.getLoadId();
+
+		try{
+
+			//当前登录人选择的仓库
+			BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse();
+			if(Objects.isNull(myCurrentWarehouse)){
+				log.warn(method+"仓库信息为空 myCurrentWarehouse={}",myCurrentWarehouse);
+				return R.fail(405,"仓库信息为空");
+			}
+			loadCarsDTO.setWarehouseId(myCurrentWarehouse.getId());
+			if(Objects.isNull(loadId)){
+				log.warn(method+"配载id为空 loadId={}",loadId);
+				return R.fail(405,"配载id为空");
+			}
+
+			return carsLoadService.manualLoading(loadCarsDTO,"PC手动一键装车");
+		}catch (CustomerException e){
+			log.error(e.message,e);
+			return R.fail(e.code,e.message);
+		}catch (Exception e){
+			log.error(method+"系统异常",e);
+			return R.fail(500,"系统异常");
+		}
+	}
+
 }

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

@@ -24,34 +24,34 @@
             and lta.has_package = #{param.hasPackage}
         </if>
         <if test="param.orderCode != null and param.orderCode != ''">
-            and lta.order_code like concat('%',${param.orderCode},'%')
+            and lta.order_code like concat('%',#{param.orderCode},'%')
         </if>
         <if test="param.dealerName != null and param.dealerName != ''">
-            and lta.dealer_name like concat('%',${param.dealerName},'%')
+            and lta.dealer_name like concat('%',#{param.dealerName},'%')
         </if>
         <if test="param.storeName != null and param.storeName != ''">
-            and lta.store_name like concat('%',${param.storeName},'%')
+            and lta.store_name like concat('%',#{param.storeName},'%')
         </if>
         <if test="param.siteName != null and param.siteName != ''">
-            and lta.site_name like concat('%',${param.siteName},'%')
+            and lta.site_name like concat('%',#{param.siteName},'%')
         </if>
         <if test="param.trainNumber != null and param.trainNumber != ''">
-            and lta.train_number like concat('%',${param.trainNumber},'%')
+            and lta.train_number like concat('%',#{param.trainNumber},'%')
         </if>
         <if test="param.serviceNum != null and param.serviceNum != ''">
-            and lta.service_num like concat('%',${param.serviceNum},'%')
+            and lta.service_num like concat('%',#{param.serviceNum},'%')
         </if>
         <if test="param.brand != null and param.brand != ''">
-            and lta.brand like concat('%',${param.brand},'%')
+            and lta.brand like concat('%',#{param.brand},'%')
         </if>
         <if test="param.customerName != null and param.customerName != ''">
-            and lta.customer_name like concat('%',${param.customerName},'%')
+            and lta.customer_name like concat('%',#{param.customerName},'%')
         </if>
         <if test="param.customerPhone != null and param.customerPhone != ''">
-            and lta.customer_phone like concat('%',${param.customerPhone},'%')
+            and lta.customer_phone like concat('%',#{param.customerPhone},'%')
         </if>
         <if test="param.customerAddress != null and param.customerAddress != ''">
-            and lta.customer_address like concat('%',${param.customerAddress},'%')
+            and lta.customer_address like concat('%',#{param.customerAddress},'%')
         </if>
     </select>
 

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

@@ -13,6 +13,7 @@ import org.apache.ibatis.annotations.Param;
 
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 
 @Mapper
 public interface TrunklineBillladingMapper extends BaseMapper<TrunklineBillladingEntity> {
@@ -26,4 +27,6 @@ public interface TrunklineBillladingMapper extends BaseMapper<TrunklineBillladin
     IPage<TrunklineBillladingDetailVO> billladingList(IPage<Object> page, @Param("warehouseId") Long warehouseId, @Param("startByDateStr") Date startByDateStr, @Param("endByDateStr") Date endByDateStr);
 
 	IPage<TrunklineBillladingDetailListVO> findAdvanceDetailList(IPage<Object> page, @Param("orderCode") String orderCode);
+
+	Map<String, Integer> billladingNum(@Param("warehouseId") Long warehouseId, @Param("startByDateStr") Date startByDateStr, @Param("endByDateStr") Date endByDateStr);
 }

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

@@ -109,9 +109,10 @@
         select ldsa.service_number serviceNum,
                ldsa.order_code orderCode,
                ldsa.total_number totalNum,
-               ldsa.incoming_num scanNum
+               IFNULL(ldsa.incoming_num,0) scanNum
         from logpm_distribution_stock_article ldsa
-        where ldsa.warehouse_entry_time >= #{startByDateStr}
+        where ldsa.is_zero != 1
+        and ldsa.warehouse_entry_time >= #{startByDateStr}
         and ldsa.warehouse_entry_time <= #{endByDateStr}
         and warehouse_id = #{warehouseId}
     </select>
@@ -123,4 +124,15 @@
         where order_code = #{orderCode}
     </select>
 
+    <select id="billladingNum" resultType="java.util.Map">
+        select sum(ldsa.total_number) totalNum,
+               sum(IFNULL(ldsa.incoming_num,0)) scanNum
+        from logpm_distribution_stock_article ldsa
+        where ldsa.is_zero != 1
+        and ldsa.warehouse_entry_time &gt;= #{startByDateStr}
+        and ldsa.warehouse_entry_time &lt;= #{endByDateStr}
+        and warehouse_id = #{warehouseId}
+    </select>
+
+
 </mapper>

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

@@ -13,4 +13,5 @@ public interface TrunklineBillladingPackageMapper extends BaseMapper<TrunklineBi
 
     IPage<TrunklineBillladingPackageVO> findBillladingPackageDetail(IPage<Object> page, @Param("param") BillladingDTO billladingDTO);
 
+    TrunklineBillladingPackageEntity findBillladingPackage(@Param("packageCode") String packageCode);
 }

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

@@ -57,4 +57,11 @@
 
     </select>
 
+    <select id="findBillladingPackage" resultType="com.logpm.trunkline.entity.TrunklineBillladingPackageEntity">
+        select *
+        from logpm_trunkline_billlading_package
+        where order_package_code = #{packageCode}
+    </select>
+
+
 </mapper>

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

@@ -22,6 +22,7 @@
                ltcl.create_user_name createUserName,
                ltcl.create_time createTime,
                ltcl.now_warehouse_id nowWarehouseId,
+               ltcl.count_transport_cost countTransportCost,
                sum(ltcll.now_transport_cost) nowTransportCost,
                sum(ltcll.oil_cost) oilCost,
                sum(ltcll.back_transport_cost) backTransportCost,
@@ -56,7 +57,8 @@
                  ltcl.end_warehouse_names,
                  ltcl.arrive_time,
                  ltcl.start_time,
-                 ltcl.now_warehouse_id
+                 ltcl.now_warehouse_id,
+                 ltcl.count_transport_cost
     </select>
 
 
@@ -119,6 +121,7 @@
     <select id="findAllOrderList" resultType="com.logpm.trunkline.vo.CarsLoadAllOrderVO">
         select t.order_code orderCode,
         t.waybill_number waybillNo,
+        t.entry_time_end warehouseEntryTimeEnd,
         lww.create_time createTime,
         lww.destination destination,
         lww.destination_warehouse_name destinationWarehouseName,
@@ -138,7 +141,8 @@
         from (select ldpl.order_code,
         ldpl.waybill_number,
         ldsa.is_zero,
-        IF(ldsa.is_zero = 1,ldsa.hand_quantity,count(ldpl.id)) stock_num
+        IF(ldsa.is_zero = 1,ldsa.hand_quantity,count(ldpl.id)) stock_num,
+        max(ldpl.warehouse_entry_time_end) entry_time_end
         from logpm_distribution_stock_article ldsa
         left join logpm_distribution_parcel_list ldpl on ldsa.order_code = ldpl.order_code
         where ldpl.is_deleted = 0
@@ -184,6 +188,40 @@
         group by ltwo.waybill_no,
         ltwo.order_code) m on m.order_code = t.order_code and m.waybill_no = t.waybill_number
         where IFNULL( t.stock_num, 0 )-IFNULL( l.planNum,0) > 0
+        <if test="param.openTimeStart != null">
+            and lww.create_time &gt;= #{param.openTimeStart}
+        </if>
+        <if test="param.openTimeEnd != null">
+            and lww.create_time &lt;= #{param.openTimeEnd}
+        </if>
+        <if test="param.enterTimeStart != null">
+            and t.entry_time_end &gt;= #{param.enterTimeStart}
+        </if>
+        <if test="param.enterTimeEnd != null">
+            and t.entry_time_end &lt;= #{param.enterTimeEnd}
+        </if>
+        <if test="param.destination != null and param.destination != ''">
+            and lww.destination like concat('%',#{param.destination},'%')
+        </if>
+        <if test="param.destinationWarehouseName != null and param.destinationWarehouseName != ''">
+            and lww.destination_warehouse_name like concat('%',#{param.destinationWarehouseName},'%')
+        </if>
+        <if test="param.productName != null and param.productName != ''">
+            and lww.goods_name like concat('%',#{param.productName},'%')
+        </if>
+        <if test="param.shipper != null and param.shipper != ''">
+            and lww.shipper like concat('%',#{param.shipper},'%')
+        </if>
+        <if test="param.consignee != null and param.consignee != ''">
+            and lww.consignee like concat('%',#{param.consignee},'%')
+        </if>
+        <if test="param.customerTrain != null and param.customerTrain != ''">
+            and lww.customer_train like concat('%',#{param.customerTrain},'%')
+        </if>
+        <if test="param.remark != null and param.remark != ''">
+            and lww.remark like concat('%',#{param.remark},'%')
+        </if>
+
     </select>
 
     <select id="findUseOrderList" resultType="com.logpm.trunkline.vo.CarsLoadAllOrderVO">

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

@@ -13,7 +13,7 @@ import java.util.List;
 
 public interface ITrunklineAdvanceService extends BaseService<TrunklineAdvanceEntity> {
 
-	void saveOrderAndPackage(TrunklineAdvanceDetailEntity advanceDetailEntity, Long warehouseId);
+	boolean saveOrderAndPackage(TrunklineAdvanceDetailEntity advanceDetailEntity, Long warehouseId);
 
     IPage<TrunklineAdvanceVO> advancePageList(IPage<Object> page, AdvanceDTO advanceDTO);
 

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

@@ -12,4 +12,6 @@ public interface ITrunklineBillladingPackageServicie extends BaseService<Trunkli
 
 	IPage<TrunklineBillladingPackageVO> findBillladingPackageDetail(IPage<Object> page, BillladingDTO billladingDTO);
 
+    TrunklineBillladingPackageEntity findBillladingPackage(String packageCode);
+
 }

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

@@ -5,7 +5,6 @@ import com.logpm.trunkline.dto.BillladingDTO;
 import com.logpm.trunkline.dto.BillladingWaybillDTO;
 import com.logpm.trunkline.entity.TrunklineBillladingEntity;
 import com.logpm.trunkline.vo.TrunklineBillladingDetailListVO;
-import com.logpm.trunkline.vo.TrunklineBillladingDetailVO;
 import com.logpm.trunkline.vo.TrunklineBillladingVO;
 import org.springblade.core.mp.base.BaseService;
 import org.springblade.core.tool.api.R;
@@ -42,7 +41,7 @@ public interface ITrunklineBillladingService extends BaseService<TrunklineBillla
 
 	R findCarrierByName(String carrierName);
 
-	IPage<TrunklineBillladingDetailVO> billladingList(BillladingDTO billladingDTO);
+	R billladingList(BillladingDTO billladingDTO);
 
 	IPage<TrunklineBillladingDetailListVO> findAdvanceDetailList(BillladingDTO billladingDTO);
 }

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

@@ -72,7 +72,7 @@ public interface ITrunklineCarsLoadService extends BaseService<TrunklineCarsLoad
 
 	R loadingDetail(LoadCarsDTO loadCarsDTO);
 
-	R loadingScan(Long loadId,Long warehouseId,String orderPackageCode,String trayCode);
+	R loadingScan(Long loadId,Long warehouseId,String orderPackageCode,String trayCode,String remark);
 
 	R loadingZero(Long loadId, Long warehouseId, String waybillNo,String orderCode, String trayCode, Integer enterNum,String remark);
 
@@ -165,4 +165,6 @@ public interface ITrunklineCarsLoadService extends BaseService<TrunklineCarsLoad
 	R batchSign(LoadCarsDTO loadCarsDTO);
 
 	R updateBelongToWarehouseBySignOrderId(LoadCarsDTO loadCarsDTO);
+
+	R manualLoading(LoadCarsDTO loadCarsDTO, String remark);
 }

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.logpm.trunkline.bean.Resp;
 import com.logpm.trunkline.dto.InComingDTO;
 import com.logpm.trunkline.entity.TrunklineAdvanceDetailEntity;
+import com.logpm.trunkline.entity.TrunklineBillladingPackageEntity;
 import com.logpm.trunkline.service.IInComingService;
 import com.logpm.trunkline.service.ITrunklineAdvanceDetailService;
 import com.logpm.trunkline.service.ITrunklineAdvanceService;
@@ -62,22 +63,29 @@ public class InComingServiceImpl implements IInComingService {
 			advanceDetailService.updatePackageStatusById("1",advanceDetailId);
 
 			//2.判断包件和订单是否已经存入在库订单
-			advanceService.saveOrderAndPackage(advanceDetailEntity,warehouseId);
+			boolean b = advanceService.saveOrderAndPackage(advanceDetailEntity, warehouseId);
 
-			//3.根据是否有提货单id绑定提货单
-			if(!Objects.isNull(billladingId)){
-				billladingPackageServicie.saveEntity(packageCode,billladingId,warehouseId,incomingType);
-			}
+			if(b){
+				//3.根据是否有提货单id绑定提货单
+				if(!Objects.isNull(billladingId)){
+					//先判断该包件是否已经有提货记录了
+					TrunklineBillladingPackageEntity billladingPackageEntity = billladingPackageServicie.findBillladingPackage(packageCode);
+					if(Objects.isNull(billladingPackageEntity)){
+						billladingPackageServicie.saveEntity(packageCode,billladingId,warehouseId,incomingType);
+					}
+				}
 
-			//4.如果有托盘码
-			if(StringUtil.isNotBlank(trayCode) && StringUtil.isNotBlank(trayType)){
-				Map<String,Object> map = new HashMap<>();
-				map.put("trayType",trayType);
-				map.put("trayCode",trayCode);
-				map.put("warehouseId",warehouseId);
-				map.put("orderPackageCode",packageCode);
-				warehouseTrayTypeClient.orderScanOrderPackageCode(map);
+				//4.如果有托盘码
+				if(StringUtil.isNotBlank(trayCode) && StringUtil.isNotBlank(trayType)){
+					Map<String,Object> map = new HashMap<>();
+					map.put("trayType",trayType);
+					map.put("trayCode",trayCode);
+					map.put("warehouseId",warehouseId);
+					map.put("orderPackageCode",packageCode);
+					warehouseTrayTypeClient.orderScanOrderPackageCode(map);
+				}
 			}
+
 		}
 		return R.success("入库成功");
 	}

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

@@ -384,7 +384,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 			warehouseWaybillDetailClient.addList(details);
 		}else{
 			log.info("#################openWaybill: 运单保存失败");
-			return R.fail(405,"运单保存失败");
+			throw new CustomerException(405,"运单保存失败");
 		}
 
 		//绑定订单和运单的关系
@@ -393,7 +393,11 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 		Set<String> orderCodes = new TreeSet<>();
 		for (TrunklineAdvanceEntity advanceEntity:advanceEntityList){
 			Long advanceId = advanceEntity.getId();
-
+			String waybillStatus = advanceEntity.getWaybillStatus();
+			if("1".equals(waybillStatus)){
+				log.error("###############openWaybill: 已存在已开单的暂存单");
+				throw new CustomerException(405,"已存在已开单的暂存单");
+			}
 			TrunklineWaybillOrderEntity waybillOrderEntity = new TrunklineWaybillOrderEntity();
 			waybillOrderEntity.setWarehouseId(warehouseId);
 			waybillOrderEntity.setWarehouseName(basicdataWarehouseEntity.getName());

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

@@ -52,7 +52,7 @@ public class TrunklineAdvanceServiceImpl extends BaseServiceImpl<TrunklineAdvanc
 
 
 	@Override
-	public void saveOrderAndPackage(TrunklineAdvanceDetailEntity advanceDetailEntity, Long warehouseId) {
+	public boolean saveOrderAndPackage(TrunklineAdvanceDetailEntity advanceDetailEntity, Long warehouseId) {
 		String orderPackageCode = advanceDetailEntity.getOrderPackageCode();
 		String orderCode = advanceDetailEntity.getOrderCode();
 		Long advanceId = advanceDetailEntity.getAdvanceId();
@@ -68,7 +68,7 @@ public class TrunklineAdvanceServiceImpl extends BaseServiceImpl<TrunklineAdvanc
 		DistributionParcelListEntity parcelListEntity = parcelListClient.findByPacketBarCodeAndWarehouseId(orderPackageCode, warehouseId);
 		if(!Objects.isNull(parcelListEntity)){
 			log.warn("############saveOrderAndPackage: 包件信息已存在 orderPackageCode={} warehouseId={}",orderPackageCode,warehouseId);
-			throw new CustomerException(405,"包件信息已存在");
+			return true;
 		}
 
 		TrunklineAdvanceEntity advanceEntity = getById(advanceId);
@@ -263,6 +263,7 @@ public class TrunklineAdvanceServiceImpl extends BaseServiceImpl<TrunklineAdvanc
 //			stockArticleClient.saveOrUpdate(stockArticleEntity);
 		}
 		log.info("#############saveOrderAndPackage: 订单包件信息保存完成 OrderPackageCode={}",advanceDetailEntity.getOrderPackageCode());
+		return true;
 	}
 
 	@Override

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

@@ -171,4 +171,9 @@ public class TrunklineBillladingPackageServiceImpl extends BaseServiceImpl<Trunk
 		return baseMapper.findBillladingPackageDetail(page,billladingDTO);
 	}
 
+	@Override
+	public TrunklineBillladingPackageEntity findBillladingPackage(String packageCode) {
+		return baseMapper.findBillladingPackage(packageCode);
+	}
+
 }

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

@@ -26,10 +26,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
-import java.util.Comparator;
-import java.util.Date;
-import java.util.List;
-import java.util.Objects;
+import java.util.*;
 import java.util.stream.Collectors;
 
 @Slf4j
@@ -523,7 +520,7 @@ public class TrunklineBillladingServiceImpl extends BaseServiceImpl<TrunklineBil
 	}
 
 	@Override
-	public IPage<TrunklineBillladingDetailVO> billladingList(BillladingDTO billladingDTO) {
+	public R billladingList(BillladingDTO billladingDTO) {
 		Integer pageNum = billladingDTO.getPageNum();
 		Integer pageSize = billladingDTO.getPageSize();
 		String startDateStr = billladingDTO.getStartDateStr();
@@ -534,9 +531,16 @@ public class TrunklineBillladingServiceImpl extends BaseServiceImpl<TrunklineBil
 		page.setCurrent(pageNum);
 		page.setSize(pageSize);
 
+		Map<String,Integer> map = baseMapper.billladingNum(warehouseId,CommonUtil.getStartByDateStr(startDateStr),CommonUtil.getEndByDateStr(endDateStr));
 		IPage<TrunklineBillladingDetailVO> ls =  baseMapper.billladingList(page,warehouseId,CommonUtil.getStartByDateStr(startDateStr),CommonUtil.getEndByDateStr(endDateStr));
 
-		return ls;
+		Map<String,Object> m = new HashMap<>();
+		if(!Objects.isNull(map)){
+			m.put("totalNum",map.get("totalNum"));
+			m.put("scanNum",map.get("scanNum"));
+		}
+		m.put("page",ls);
+		return R.data(m);
 	}
 
 	@Override

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

@@ -4,7 +4,6 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.logpm.basicdata.entity.BasicdataDriverArteryEntity;
 import com.logpm.basicdata.entity.BasicdataTrayEntity;
 import com.logpm.basicdata.entity.BasicdataWarehouseEntity;
 import com.logpm.basicdata.feign.IBasicdataCodeClient;
@@ -1144,6 +1143,16 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 //				loadCarsDTO.setOrderCodes(orderCodes);
 //			}
 //		}
+		String openTimeStartStr = loadCarsDTO.getOpenTimeStartStr();
+		String openTimeEndStr = loadCarsDTO.getOpenTimeEndStr();
+		loadCarsDTO.setOpenTimeStart(CommonUtil.getStartByDateStr(openTimeStartStr));
+		loadCarsDTO.setOpenTimeEnd(CommonUtil.getEndByDateStr(openTimeEndStr));
+
+		String enterTimeStartStr = loadCarsDTO.getEnterTimeStartStr();
+		String enterTimeEndStr = loadCarsDTO.getEnterTimeEndStr();
+		loadCarsDTO.setEnterTimeStart(CommonUtil.getStartByDateStr(enterTimeStartStr));
+		loadCarsDTO.setEnterTimeEnd(CommonUtil.getStartByDateStr(enterTimeEndStr));
+
 		IPage<CarsLoadAllOrderVO> pageList = baseMapper.findAllOrderList(page,loadCarsDTO);
 		return R.data(pageList);
 	}
@@ -1622,7 +1631,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 	}
 
 	@Override
-	public R loadingScan(Long loadId,Long warehouseId,String orderPackageCode,String trayCode) {
+	public R loadingScan(Long loadId,Long warehouseId,String orderPackageCode,String trayCode,String remark) {
 		log.info("#################loadingScan: 装车扫描");
 
 		TrunklineCarsLoadEntity carsLoadEntity = baseMapper.selectById(loadId);
@@ -1667,7 +1676,6 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 		String trayName = null;
 		Long fromWarehouseId = null;
 		Long loadScanId = null;
-		String remark = null;
 
 
 		//判断包条码是不是在库
@@ -2375,6 +2383,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 		Integer enterNum = loadCarsDTO.getEnterNum();
 		Long warehouseId = loadCarsDTO.getWarehouseId();
 
+		String orders = null;
 		if(0 == isZero){
 			unloadPackage(loadId,orderPackageCode,warehouseId,1,"卸分一体 卸车");
 			Map<String,Object> map = new HashMap<>();
@@ -2387,6 +2396,9 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 				log.warn("##########findNextNodeList: 打托失败 trayCode={} orderPackageCode={}",trayCode,orderPackageCode);
 				return R.fail(405,"打托失败");
 			}
+			DistributionParcelListEntity parcelListEntity = distributionParcelListClient.findByPacketBarCodeAndWarehouseId(orderPackageCode, warehouseId);
+			orders = parcelListEntity.getOrderCode();
+
 		}else{
 
 			unloadZero(loadId,waybillNo,enterNum,warehouseId,1,null,orderCode,"卸分一体 卸车");
@@ -2402,9 +2414,13 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 				log.warn("##########findNextNodeList: 打托失败 trayCode={} orderCode={}",trayCode,orderCode);
 				return R.fail(405,"打托失败");
 			}
+			orders = orderCode;
+
 		}
 
-		return R.success("打托成功");
+		Map<String,Object> map = new HashMap<>();
+		map.put("orders",orders);
+		return R.data(map);
 	}
 
 	@Override
@@ -3218,6 +3234,63 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 		return R.success("更新成功");
 	}
 
+	@Override
+	public R manualLoading(LoadCarsDTO loadCarsDTO, String remark) {
+		Long loadId = loadCarsDTO.getLoadId();
+		Long warehouseId = loadCarsDTO.getWarehouseId();
+		TrunklineCarsLoadEntity carsLoadEntity = baseMapper.selectById(loadId);
+		if(Objects.isNull(carsLoadEntity)){
+			log.warn("##############manualLoading: 配载计划不存在 loadId={}",loadId);
+			return R.fail(405,"配载计划不存在");
+		}
+
+		BasicdataWarehouseEntity warehouseEntity = basicdataWarehouseClient.getEntityWarehouseId(warehouseId);
+		if(Objects.isNull(warehouseEntity)){
+			log.warn("##############manualLoading: 仓库信息不存在 warehouseId={}",warehouseId);
+			return R.fail(405,"仓库信息不存在");
+		}
+
+		Long nowWarehouseId = carsLoadEntity.getNowWarehouseId();
+		if(!nowWarehouseId.equals(warehouseId)){
+			log.warn("##############manualLoading: 车辆不在当前仓 warehouseId={}",warehouseId);
+			return R.fail(405,"车辆不在当前仓");
+		}
+
+		//查询有哪些在当前仓做计划的订单
+		List<TrunklineCarsOrderEntity> carsOrderEntityList = trunklineCarsOrderService.findListByLoadIdAndNodeId(loadId, warehouseId);
+		for (TrunklineCarsOrderEntity carsOrderEntity : carsOrderEntityList) {
+			Integer type = carsOrderEntity.getType();
+			if(type.equals(1)){
+				//订制品订单
+				String orderCode = carsOrderEntity.getOrderCode();
+				Integer planNum = carsOrderEntity.getPlanNum();
+				List<DistributionParcelListEntity> entityListByOrderCode = distributionParcelListClient.findEntityListByOrderCodeAndStatus(orderCode, warehouseId,"20");
+				int size = entityListByOrderCode.size();
+				if(planNum.equals(size)){
+					for (DistributionParcelListEntity parcelListEntity : entityListByOrderCode) {
+						String orderPackageCode = parcelListEntity.getOrderPackageCode();
+						//查询包件是否已经装车
+						TrunklineCarsLoadScanEntity carsLoadScanEntity = trunklineCarsLoadScanService.findEntityByLoadIdAndOrderPackageCode(loadId, orderPackageCode);
+						if(Objects.isNull(carsLoadScanEntity)){
+							loadingScan(loadId,warehouseId,orderPackageCode,null,"手动一键装车");
+						}
+					}
+				}
+			}else if(type.equals(2)){
+				//零担订单
+				String orderCode = carsOrderEntity.getOrderCode();
+				String waybillNo = carsOrderEntity.getWaybillNo();
+				Integer planNum = carsOrderEntity.getPlanNum();
+				Integer realNum = carsOrderEntity.getRealNum();
+				if(realNum.equals(0)){
+					loadingZero(loadId,warehouseId,waybillNo,orderCode,null,planNum,"手动一键装车");
+				}
+			}
+		}
+
+		return R.success("装车完成");
+	}
+
 	@Override
 	public R loadingTrayInfo(LoadCarsDTO loadCarsDTO) {
 		log.info("##############loadingTrayInfo: 查询托盘的货物信息");
@@ -3295,7 +3368,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 		Integer zeroNum = 0;
 		for (LoadingPackageDTO loadingPackageDTO : packageList) {
 			String orderPackageCode = loadingPackageDTO.getOrderPackageCode();
-			loadingScan(loadId,warehouseId,orderPackageCode,trayCode);
+			loadingScan(loadId,warehouseId,orderPackageCode,trayCode,"托盘正常装车");
 			pacakagNum = pacakagNum + 1;
 		}