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

blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/feign/IServiceNumClient.java

@@ -58,4 +58,7 @@ public interface IServiceNumClient {
 
 	@GetMapping(API_PREFIX + "/findByserviceNum")
     ServiceNumEntity findByserviceNum(@RequestParam String sn);
+
+	@PostMapping(API_PREFIX + "/update")
+    void updateServiceNum(@RequestBody ServiceNumEntity serviceNum);
 }

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionDeliveryListController.java

@@ -123,9 +123,19 @@ public class DistributionDeliveryListController extends BladeController {
 	@PostMapping("/loadingscan")
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入distributionDeliveryList")
-	public R<Integer> loadingscan(@Valid @RequestBody DistrilbutionloadingscanDTO distrilbutionloadingscanDTO) {
-		Integer i	= distributionDeliveryListService.loadingscan(distrilbutionloadingscanDTO);
-		return R.data(i);
+	public R loadingscan(@Valid @RequestBody DistrilbutionloadingscanDTO distrilbutionloadingscanDTO) {
+		R msg	= distributionDeliveryListService.loadingscan(distrilbutionloadingscanDTO);
+		return msg;
+	}
+
+	/**
+	 * 配送管理 装车扫描(一件装车)
+	 */
+	@GetMapping("/oneloading")
+	@ApiOperationSupport(order = 2)
+	public R oneloading() {
+		R msg	= distributionDeliveryListService.oneloading();
+		return msg;
 	}
 
 	/**
@@ -134,18 +144,28 @@ public class DistributionDeliveryListController extends BladeController {
 	@PostMapping("/loadingack")
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入distributionDeliveryList")
-	public R<Integer> loadingack(@Valid @RequestBody DistrilbutionloadingscanDTO distrilbutionloadingscanDTO) {
-		Integer i	= distributionDeliveryListService.loadingscan(distrilbutionloadingscanDTO);
-		return R.data(i);
+	public R<String> loadingack(@Valid @RequestBody DistrilbutionloadingscanDTO distrilbutionloadingscanDTO) {
+		R msg	= distributionDeliveryListService.loadingack(distrilbutionloadingscanDTO);
+		return msg;
+	}
+
+	/**
+	 * 配送管理 装车确认(一键确认)
+	 */
+	@GetMapping("/oneack")
+	@ApiOperationSupport(order = 2)
+	public R oneack() {
+		R msg	= distributionDeliveryListService.oneack();
+		return msg;
 	}
 
 	/**
 	 * 配送管理 点击发车
 	 */
-	@GetMapping("/start")
+	@PostMapping("/start")
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入distributionDeliveryList")
-	public R<Integer> start(DistributionDeliveryListDTO distributionDeliveryList) {
+	public R<Integer> start(@Valid @RequestBody DistributionDeliveryListDTO distributionDeliveryList) {
 		Integer i	= distributionDeliveryListService.start(distributionDeliveryList);
 		return R.data(i);
 	}

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistrilbutionloadingackDTO.java

@@ -0,0 +1,31 @@
+package com.logpm.distribution.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
+
+@Data
+public class DistrilbutionloadingackDTO {
+
+
+	/**
+	 * pda信息
+	 */
+	@ApiModelProperty(value = "pda信息")
+	private String pdaInformation;
+
+	/**
+	 * 扫描包条信息
+	 */
+	@ApiModelProperty(value = "扫描包条信息")
+	@NotEmpty(message = "扫描单号不能为空")
+	private String barcode;
+
+
+	/**
+	 * 确认类型
+	 */
+	@ApiModelProperty(value = "确认类型(1-整车确认,2-零星确认)")
+	private Integer ackType;
+}

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistrilbutionloadingscanDTO.java

@@ -10,30 +10,17 @@ import javax.validation.constraints.NotEmpty;
 public class DistrilbutionloadingscanDTO {
 
 
-	/**
-	 * pda信息
-	 */
-	@ApiModelProperty(value = "pda信息")
-	@NotEmpty(message = "pda信息不能为空")
-	private String pdaInformation;
 
 	/**
 	 * 扫描包条信息
 	 */
 	@ApiModelProperty(value = "扫描包条信息")
-	@NotEmpty(message = "扫描单号不能为空")
 	private String barcode;
 	/**
-	 * 扫描类型
+	 * 扫描物品
 	 */
-	@ApiModelProperty(value = "扫描类型(1-包条,2-托盘)")
-	@NotEmpty(message = "扫描类型不能为空")
+	@ApiModelProperty(value = "扫描物品(1-包条,2-托盘)")
 	private Integer type;
 
 
-	/**
-	 * 确认类型
-	 */
-	@ApiModelProperty(value = "确认类型(1-整车确认,2-零星确认)")
-	private Integer ackType;
 }

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryInfoMapper.xml

@@ -102,9 +102,9 @@
         SELECT
         count(*)
         FROM
-        logpm_distribution_delivery_info lddi
+        logpm_distribution_loadscan ldl
         <where>
-            lddi.is_deleted = 0 and lddi.reservation_id = #{id}
+            ldl.is_deleted = 0 and ldl.reservation_id = #{id}
         </where>
     </select>
     <select id="selectcustomListByOrderId" resultType="com.logpm.distribution.vo.DistributionDeliveryInfoVO">

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.java

@@ -81,4 +81,10 @@ public interface DistributionDeliveryListMapper extends BaseMapper<DistributionD
 	 * @return
 	 */
 	Integer updateloadingTime(Long id);
+	/**
+	 * 更新上车时间
+	 *
+	 * @return
+	 */
+	Integer updateloadingTimeById(Long id);
 }

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml

@@ -45,6 +45,9 @@
             SET lddl.loading_time = now()
              WHERE  ldl.package_id = #{id} and lddl.loading_time is null
     </update>
+    <update id="updateloadingTimeById">
+        UPDATE logpm_distribution_delivery_list lddl  SET lddl.loading_time = now()  WHERE lddl.id = #{id} and lddl.loading_time is null
+    </update>
 
 
     <select id="selectDistributionDeliveryListPage" resultType="com.logpm.distribution.vo.DistributionDeliveryListVO">
@@ -79,9 +82,18 @@
             logpm_distribution_delivery_list lddl
         <where>
 
+            <if test="param.trainNumber != null and param.trainNumber!=''">
+                and lddl.train_number like concat('%',#{param.trainNumber},'%')
+            </if>
             <if test="param.warehouseName != null and param.warehouseName!=''">
                 and lddl.warehouse_name like concat('%',#{param.warehouseName},'%')
             </if>
+            <if test="param.vehicleName != null and param.vehicleName!=''">
+                and lddl.vehicle_name like concat('%',#{param.vehicleName},'%')
+            </if>
+             <if test="param.driverName != null and param.driverName!=''">
+                and lddl.driver_name like concat('%',#{param.driverName},'%')
+            </if>
             <if test="param.kind != null and param.kind!=''">
                 and lddl.kind = #{param.kind}
             </if>
@@ -111,29 +123,41 @@
         SELECT * FROM logpm_distribution_delivery_list ${ew.customSqlSegment}
     </select>
     <select id="selectBycommercialNub" resultType="java.lang.Integer">
-        SELECT  COALESCE(COUNT(*), 0) FROM logpm_distribution_delivery_list
+        SELECT  COALESCE(COUNT(*), 0) FROM logpm_distribution_delivery_list lddl
         <where>
-             type = '2'
+            lddl.type = '2'
+            <if test="param.trainNumber != null and param.trainNumber!=''">
+                and lddl.train_number like concat('%',#{param.trainNumber},'%')
+            </if>
             <if test="param.warehouseName != null and param.warehouseName!=''">
-                and warehouse_name like concat('%',#{param.warehouseName},'%')
+                and lddl.warehouse_name like concat('%',#{param.warehouseName},'%')
+            </if>
+            <if test="param.vehicleName != null and param.vehicleName!=''">
+                and lddl.vehicle_name like concat('%',#{param.vehicleName},'%')
+            </if>
+            <if test="param.driverName != null and param.driverName!=''">
+                and lddl.driver_name like concat('%',#{param.driverName},'%')
             </if>
             <if test="param.kind != null and param.kind!=''">
-                and kind = #{param.kind}
+                and lddl.kind = #{param.kind}
             </if>
             <if test="param.distributionCompany != null and param.distributionCompany!=''">
-                and distribution_company = #{param.distributionCompany}
+                and lddl.distribution_company = #{param.distributionCompany}
+            </if>
+            <if test="param.type != null and param.type!=''">
+                and lddl.type = #{param.type}
             </if>
             <if test="param.state != null and param.state!=''">
-                and state = #{param.state}
+                and lddl.state = #{param.state}
             </if>
             <if test="param.createTime_query!=null and param.createTime_query!=''">
-                and  date_format(create_time,'%y%m%d%') = date_format(#{param.createTime_query},'%y%m%d%')
+                and  lddl.date_format(create_time,'%y%m%d%') = date_format(#{param.createTime_query},'%y%m%d%')
             </if>
-             <if test="param.leadTime!=null and param.leadTime!=''">
-                and  date_format(lead_time,'%y%m%d%') = date_format(#{param.leadTime},'%y%m%d%')
+            <if test="param.leadTime!=null and param.leadTime!=''">
+                and  lddl.date_format(lead_time,'%y%m%d%') = date_format(#{param.leadTime},'%y%m%d%')
             </if>
-             <if test="param.loadingTime!=null and param.loadingTime!=''">
-                and  date_format(loading_time,'%y%m%d%') = date_format(#{param.loadingTime},'%y%m%d%')
+            <if test="param.loadingTime!=null and param.loadingTime!=''">
+                and lddl.date_format(loading_time,'%y%m%d%') = date_format(#{param.loadingTime},'%y%m%d%')
             </if>
         </where>
     </select>
@@ -145,53 +169,77 @@
                 JOIN logpm_distribution_loadscan ldl ON lddl.id = ldl.delivery_id
         <where>
             lddl.type = '2'
+            <if test="param.trainNumber != null and param.trainNumber!=''">
+                and lddl.train_number like concat('%',#{param.trainNumber},'%')
+            </if>
             <if test="param.warehouseName != null and param.warehouseName!=''">
                 and lddl.warehouse_name like concat('%',#{param.warehouseName},'%')
             </if>
+            <if test="param.vehicleName != null and param.vehicleName!=''">
+                and lddl.vehicle_name like concat('%',#{param.vehicleName},'%')
+            </if>
+            <if test="param.driverName != null and param.driverName!=''">
+                and lddl.driver_name like concat('%',#{param.driverName},'%')
+            </if>
             <if test="param.kind != null and param.kind!=''">
                 and lddl.kind = #{param.kind}
             </if>
             <if test="param.distributionCompany != null and param.distributionCompany!=''">
                 and lddl.distribution_company = #{param.distributionCompany}
             </if>
+            <if test="param.type != null and param.type!=''">
+                and lddl.type = #{param.type}
+            </if>
             <if test="param.state != null and param.state!=''">
                 and lddl.state = #{param.state}
             </if>
             <if test="param.createTime_query!=null and param.createTime_query!=''">
-                and  date_format(lddl.create_time,'%y%m%d%') = date_format(#{param.createTime_query},'%y%m%d%')
+                and  lddl.date_format(create_time,'%y%m%d%') = date_format(#{param.createTime_query},'%y%m%d%')
             </if>
             <if test="param.leadTime!=null and param.leadTime!=''">
-                and  date_format(lddl.lead_time,'%y%m%d%') = date_format(#{param.leadTime},'%y%m%d%')
+                and  lddl.date_format(lead_time,'%y%m%d%') = date_format(#{param.leadTime},'%y%m%d%')
             </if>
             <if test="param.loadingTime!=null and param.loadingTime!=''">
-                and  date_format(lddl.loading_time,'%y%m%d%') = date_format(#{param.loadingTime},'%y%m%d%')
+                and lddl.date_format(loading_time,'%y%m%d%') = date_format(#{param.loadingTime},'%y%m%d%')
             </if>
         </where>
     </select>
     <select id="selectmarketNub" resultType="java.lang.Integer">
-        SELECT  COALESCE(COUNT(*), 0) FROM logpm_distribution_delivery_list
+        SELECT  COALESCE(COUNT(*), 0) FROM logpm_distribution_delivery_list lddl
         <where>
-            type = '1'
+            lddl.type = '1'
+            <if test="param.trainNumber != null and param.trainNumber!=''">
+                and lddl.train_number like concat('%',#{param.trainNumber},'%')
+            </if>
             <if test="param.warehouseName != null and param.warehouseName!=''">
-                and warehouse_name like concat('%',#{param.warehouseName},'%')
+                and lddl.warehouse_name like concat('%',#{param.warehouseName},'%')
+            </if>
+            <if test="param.vehicleName != null and param.vehicleName!=''">
+                and lddl.vehicle_name like concat('%',#{param.vehicleName},'%')
+            </if>
+            <if test="param.driverName != null and param.driverName!=''">
+                and lddl.driver_name like concat('%',#{param.driverName},'%')
             </if>
             <if test="param.kind != null and param.kind!=''">
-                and kind = #{param.kind}
+                and lddl.kind = #{param.kind}
             </if>
             <if test="param.distributionCompany != null and param.distributionCompany!=''">
-                and distribution_company = #{param.distributionCompany}
+                and lddl.distribution_company = #{param.distributionCompany}
+            </if>
+            <if test="param.type != null and param.type!=''">
+                and lddl.type = #{param.type}
             </if>
             <if test="param.state != null and param.state!=''">
-                and state = #{param.state}
+                and lddl.state = #{param.state}
             </if>
             <if test="param.createTime_query!=null and param.createTime_query!=''">
-                and  date_format(create_time,'%y%m%d%') = date_format(#{param.createTime_query},'%y%m%d%')
+                and  lddl.date_format(create_time,'%y%m%d%') = date_format(#{param.createTime_query},'%y%m%d%')
             </if>
             <if test="param.leadTime!=null and param.leadTime!=''">
-                and  date_format(lead_time,'%y%m%d%') = date_format(#{param.leadTime},'%y%m%d%')
+                and  lddl.date_format(lead_time,'%y%m%d%') = date_format(#{param.leadTime},'%y%m%d%')
             </if>
             <if test="param.loadingTime!=null and param.loadingTime!=''">
-                and  date_format(loading_time,'%y%m%d%') = date_format(#{param.loadingTime},'%y%m%d%')
+                and lddl.date_format(loading_time,'%y%m%d%') = date_format(#{param.loadingTime},'%y%m%d%')
             </if>
         </where>
     </select>
@@ -204,26 +252,38 @@
 
         <where>
             lddl.type = '1'
+            <if test="param.trainNumber != null and param.trainNumber!=''">
+                and lddl.train_number like concat('%',#{param.trainNumber},'%')
+            </if>
             <if test="param.warehouseName != null and param.warehouseName!=''">
                 and lddl.warehouse_name like concat('%',#{param.warehouseName},'%')
             </if>
+            <if test="param.vehicleName != null and param.vehicleName!=''">
+                and lddl.vehicle_name like concat('%',#{param.vehicleName},'%')
+            </if>
+            <if test="param.driverName != null and param.driverName!=''">
+                and lddl.driver_name like concat('%',#{param.driverName},'%')
+            </if>
             <if test="param.kind != null and param.kind!=''">
                 and lddl.kind = #{param.kind}
             </if>
             <if test="param.distributionCompany != null and param.distributionCompany!=''">
                 and lddl.distribution_company = #{param.distributionCompany}
             </if>
+            <if test="param.type != null and param.type!=''">
+                and lddl.type = #{param.type}
+            </if>
             <if test="param.state != null and param.state!=''">
                 and lddl.state = #{param.state}
             </if>
             <if test="param.createTime_query!=null and param.createTime_query!=''">
-                and  date_format(lddl.create_time,'%y%m%d%') = date_format(#{param.createTime_query},'%y%m%d%')
+                and  lddl.date_format(create_time,'%y%m%d%') = date_format(#{param.createTime_query},'%y%m%d%')
             </if>
             <if test="param.leadTime!=null and param.leadTime!=''">
-                and  date_format(lddl.lead_time,'%y%m%d%') = date_format(#{param.leadTime},'%y%m%d%')
+                and  lddl.date_format(lead_time,'%y%m%d%') = date_format(#{param.leadTime},'%y%m%d%')
             </if>
             <if test="param.loadingTime!=null and param.loadingTime!=''">
-                and  date_format(lddl.loading_time,'%y%m%d%') = date_format(#{param.loadingTime},'%y%m%d%')
+                and lddl.date_format(loading_time,'%y%m%d%') = date_format(#{param.loadingTime},'%y%m%d%')
             </if>
         </where>
     </select>

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionLoadscanMapper.java

@@ -56,4 +56,16 @@ public interface DistributionLoadscanMapper extends BaseMapper<DistributionLoads
 	 * @return
 	 */
 	Integer updateByPackageId(Long id);
+	/**
+	 * 查询当前包条码所在车次
+	 *
+	 * @return
+	 */
+	String selecttrainNumberByPackageId(Long id);
+	/**
+	 * 装车件数
+	 *
+	 * @return
+	 */
+    Integer selectWrapdreCount(Long id);
 }

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionLoadscanMapper.xml

@@ -169,5 +169,17 @@
     <select id="exportDistributionLoadscan" resultType="com.logpm.distribution.excel.DistributionLoadscanExcel">
         SELECT * FROM logpm_distribution_loadscan ${ew.customSqlSegment}
     </select>
+    <select id="selecttrainNumberByPackageId" resultType="java.lang.String">
+        select train_number trainNumber from logpm_distribution_loadscan where is_deleted = 0 and package_id = #{id}
+    </select>
+    <select id="selectWrapdreCount" resultType="java.lang.Integer">
+        SELECT
+        count(*)
+        FROM
+        logpm_distribution_loadscan ldl
+        <where>
+            ldl.is_deleted = 0 and ldl.reservation_id = #{id} and  (ldl.scan_status =2 or  ldl.scan_status =3)
+        </where>
+    </select>
 
 </mapper>

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

@@ -25,6 +25,7 @@ import com.logpm.distribution.excel.DistributionDeliveryListExcel;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.logpm.distribution.vo.DistributionstatisticsnmbVO;
 import org.springblade.core.mp.base.BaseService;
+import org.springblade.core.tool.api.R;
 
 import java.util.List;
 
@@ -78,5 +79,17 @@ public interface IDistributionDeliveryListService extends BaseService<Distributi
 	/**
 	 *装车扫描
 	 */
-	Integer loadingscan(DistrilbutionloadingscanDTO distrilbutionloadingscanDTO);
+	R loadingscan(DistrilbutionloadingscanDTO distrilbutionloadingscanDTO);
+	/**
+	 *装车确认
+	 */
+	R loadingack(DistrilbutionloadingscanDTO distrilbutionloadingscanDTO);
+	/**
+	 *装车扫描(一键装车)
+	 */
+	R oneloading();
+	/**
+	 *装车扫描(一键确认)
+	 */
+	R oneack();
 }

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

@@ -31,6 +31,9 @@ import org.apache.commons.lang.StringUtils;
 import org.apache.poi.ss.formula.functions.T;
 import org.springblade.core.redis.cache.BladeRedis;
 import org.springblade.core.redis.config.RedisAutoCacheManager;
+import org.springblade.core.secure.BladeUser;
+import org.springblade.core.secure.utils.AuthUtil;
+import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -50,7 +53,9 @@ import java.math.BigInteger;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Date;
 import java.util.List;
+import java.util.concurrent.TimeUnit;
 
 /**
  * 配送管理 服务实现类
@@ -67,6 +72,8 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 	private final DistributionParcelListMapper distributionParcelListMapper;
 	private final DistributionLoadscanMapper distributionLoadscanMapper;
 	private final DistributionDeliveryListMapper distributionDeliveryListMapper;
+	private final DistributionSignforServiceImpl distributionSignforService;
+	private final DistributionStockArticleMapper distributionStockArticleMapper;
 	private final BladeRedis bladeRedis;
 	@Override
 	public IPage<DistributionDeliveryListVO> selectDistributionDeliveryListPage(IPage<DistributionDeliveryListVO> page, DistributionDeliveryListDTO distributionDeliveryList) {
@@ -158,15 +165,21 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 		//TODO 冗余加入签收表
 		distributionReservationEntities.forEach(e->{
 			DistributionSignforEntity distributionSignforEntity = new DistributionSignforEntity();
-			BeanUtils.copyProperties(e,distributionSignforEntity);
+			Func.copy(e,distributionSignforEntity);
 			distributionSignforEntity.setReservationId(e.getId());
 			distributionSignforEntity.setConsigneeName(e.getConsignee());
 			distributionSignforEntity.setWarehouseId(distributionDeliveryList.getWarehouseId());
 			distributionSignforEntity.setWarehouseName(distributionDeliveryList.getWarehouseName());
 			distributionSignforEntity.setTrainNumber(distributionDeliveryList.getTrainNumber());
-			//通过客户查询已经上车的订单
-			String orderIds  = distributionDeliveryInfoMapper.selectorderIdList(e.getId());
-			distributionSignforEntity.setOrderId(orderIds);
+			distributionSignforEntity.setDeliveryDriverName(distributionDeliveryList.getDriverName());
+			distributionSignforEntity.setDeliveryDriverId(distributionDeliveryList.getDriverId());
+			//配送时间
+			SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
+			String format = simpleDateFormat.format(new Date());
+			distributionSignforEntity.setDeliveryTime(format);
+			//通过客户查询已经上车的订单(待定)
+		//	String orderIds  = distributionDeliveryInfoMapper.selectorderIdList(e.getId());
+			distributionSignforEntity.setOrderId(e.getStockArticleId());
 			//查询订单总数
 			Integer i = StringUtils.countMatches(e.getStockArticleId(), ",")+1;
 			distributionSignforEntity.setOrderTotal(i);
@@ -174,8 +187,14 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 		  	Integer i1 =distributionDeliveryInfoMapper.selectWrapCount(e.getId());
 		    distributionSignforEntity.setTotal(i1);
 			//装车件数
+			Integer dre =	distributionLoadscanMapper.selectWrapdreCount(e.getId());
+			distributionSignforEntity.setLoadedNumber(dre);
+			//签收状态
+			distributionSignforEntity.setSigningStatus("1");
+			distributionSignforEntity.setReservationId(e.getId());
 			distributionSignforEntities.add(distributionSignforEntity);
 		});
+			distributionSignforService.saveBatch(distributionSignforEntities);
 		}else {
 
 		}
@@ -184,31 +203,74 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 		//获取关联订单
 		String orderId = distributionDeliveryList.getOrderId();
 		List<Long> orderIds = Arrays.asList(Long.valueOf(String.valueOf(orderId.split(","))));
+		//查询在库订单
+		List<DistributionStockArticleEntity> distributionStockArticleEntities = distributionStockArticleMapper.selectBatchIds(orderIds);
+		//插入配送详情表
+		distributionStockArticleEntities.forEach(e->{
+			DistributionSigndetailEntity distributionSigndetailEntity = new DistributionSigndetailEntity();
+			Func.copy(e,distributionSigndetailEntity);
+		});
 		//TODO 修改配送表id
 		return null;
 	}
 
 
 	@Override
-	public Integer loadingscan(DistrilbutionloadingscanDTO distrilbutionloadingscanDTO) {
-		//查询是否同一pda
-//		bladeRedis.setEx(distrilbutionloadingscanDTO.getPdaInformation(),);
+	public R loadingscan(DistrilbutionloadingscanDTO distrilbutionloadingscanDTO) {
+		//获取当前用户司机
+		BladeUser user = AuthUtil.getUser();
 		//寻找车次
+		List<DistributionDeliveryListEntity> distributionDeliveryListEntities = distributionDeliveryListMapper.selectList(new QueryWrapper<DistributionDeliveryListEntity>()
+			.lambda().eq(DistributionDeliveryListEntity::getState, 1).like(DistributionDeliveryListEntity::getDriverId, user.getUserId())
+		);
+		if (distributionDeliveryListEntities.size()<0){return R.fail(3001,"该司机无车次");}
+		//查询缓存
 		if (distrilbutionloadingscanDTO.getType()==1){
 		//找出该包条码
 		List<DistributionParcelListEntity> distributionParcelListEntities = distributionParcelListMapper.selectList(new QueryWrapper<DistributionParcelListEntity>().lambda()
 			.eq(DistributionParcelListEntity::getPacketBarCode,distrilbutionloadingscanDTO.getBarcode()));
-		distributionParcelListEntities.forEach(e->{
-		//修改对应的装车表
-		distributionLoadscanMapper.updateByPackageId(e.getId());
-		//TODO 查询本车次是否第一次扫码,没有则更新上车时间
-		Integer i =	distributionDeliveryListMapper.updateloadingTime(e.getId());
-		//	baseMapper.updateloadingTime(e.getId());
-		});
+			for (DistributionParcelListEntity e : distributionParcelListEntities) {
+				String trainNumber	 = distributionLoadscanMapper.selecttrainNumberByPackageId(e.getId());
+				if (!trainNumber.equals(distributionDeliveryListEntities.get(0).getTrainNumber())) {return R.fail(3002,"不是当前司机配送车次");}
+				if (Func.notNull(bladeRedis.get("ZC"+user.getUserId()))){
+					if (!(bladeRedis.get("ZC"+user.getUserId().toString()).equals(trainNumber))){
+						return R.fail(3003,"串货");
+					}
+				}else {
+				//第一次缓存
+				bladeRedis.setEx("ZC"+user.getUserId(),trainNumber,3600L);
+					//TODO 查询本车次是否第一次扫码,没有则更新上车时间
+				Integer i =	distributionDeliveryListMapper.updateloadingTimeById(distributionDeliveryListEntities.get(0).getId());
+				}
+				//修改对应的装车表
+				distributionLoadscanMapper.updateByPackageId(e.getId());
+				//	baseMapper.updateloadingTime(e.getId());
+			}
+
 		}else if (distrilbutionloadingscanDTO.getType()==2){
 		//TODO 托盘扫描
 		}
-		return 1;
+
+		return R.success("成功");
+	}
+
+	@Override
+	public R loadingack(DistrilbutionloadingscanDTO distrilbutionloadingscanDTO) {
+		return null;
+	}
+
+	@Override
+	public R oneloading() {
+		//获取当前用户司机
+		BladeUser user = AuthUtil.getUser();
+		//TODO 用个配送司机车辆中间表字段存储状态
+
+		return null;
+	}
+
+	@Override
+	public R oneack() {
+		return null;
 	}
 
 }

blade-service/logpm-factory/src/main/java/com/logpm/factory/comfac/service/impl/AsyncDataServiceImpl.java

@@ -240,13 +240,13 @@ public class AsyncDataServiceImpl implements IAsyncDataService {
 //				 serviceNum.setCreateTime(LocalDate.now());
 				serviceNum.setDeleteTime(0);
 				serviceNumEntityList.add(serviceNum);
+				serviceNumClient.addServiceNum(serviceNumEntityList);
 			}else{
 				log.info("#############handlerDataToHt: 当前服务号已存在数据serviceNum={}",sn);
+				serviceNum.setTotal(Integer.parseInt(serviceNum.getTotal())+1+"");
+				serviceNumClient.updateServiceNum(serviceNum);
 			}
 		}
-		if(!serviceNumEntityList.isEmpty()){
-			serviceNumClient.addServiceNum(serviceNumEntityList);
-		}
 		log.info("##############handlerDataToHt: 处理数据完成");
 	}
 
@@ -374,7 +374,7 @@ public class AsyncDataServiceImpl implements IAsyncDataService {
 				advanceDetailEntity.setDate6("");//车辆离厂时间
 				advanceDetailEntity.setCreateTime(LocalDate.now());//创建时间
 				advanceDetailEntity.setDeleteTime(0);//删除时间
-				advanceDetailEntity.setServiceNum("");//服务号
+				advanceDetailEntity.setServiceNum(StringUtil.isBlank(mtFactoryOrder.getMainOrderCode())?"":mtFactoryOrder.getMainOrderCode());//服务号
 				advanceDetailEntity.setAdmin("");//
 				advanceDetailEntity.setAdministratorsId(0);//导入人
 //				 advanceDetailEntity.setDueDate(0);//交期
@@ -408,12 +408,14 @@ public class AsyncDataServiceImpl implements IAsyncDataService {
 //				 serviceNum.setCreateTime(LocalDate.now());
 				serviceNum.setDeleteTime(0);
 				serviceNumEntityList.add(serviceNum);
+				serviceNumClient.addServiceNum(serviceNumEntityList);
 			}else{
 				log.info("#############handlerMtDataToHt: 当前服务号已存在数据serviceNum={}",sn);
+				serviceNum.setTotal(Integer.parseInt(serviceNum.getTotal())+1+"");
+				serviceNumClient.updateServiceNum(serviceNum);
 			}
 
 		}
-		serviceNumClient.addServiceNum(serviceNumEntityList);
 		log.info("##############handlerMtDataToHt: 处理数据完成");
 	}
 

blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/dto/MtOrderStatusDTO.java

@@ -24,7 +24,7 @@ public class MtOrderStatusDTO implements Serializable {
 	@JsonProperty("操作时间")
 	private Date operationTime;
 
-	@JsonProperty("中心仓编号")
+	@JsonProperty("仓库编号")
 	private String warehouse;
 
 	@JsonProperty("经销商名称")

blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/service/impl/MtFactoryDataServiceImpl.java

@@ -95,6 +95,7 @@ public class MtFactoryDataServiceImpl implements IMtFactoryDataService {
 			//判断是否有新的包件
 			if(packageInfos.size() == 0){
 				//如果没有新增包件就直接下一条数据
+				log.info("##################dealWithData: 没有新增包件，所以当前数据不保存 invoiceOrderCode={}",invoiceOrderCode);
 				continue;
 			}
 			//如果有新增包件就去存入订单发车单，和订单信息

blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/feign/ServiceNumClient.java

@@ -52,6 +52,12 @@ public class ServiceNumClient implements IServiceNumClient {
 		return serviceNumService.findByserviceNum(sn);
 	}
 
+	@Override
+	@PostMapping(API_PREFIX + "/updateServiceNum")
+	public void updateServiceNum(ServiceNumEntity serviceNum) {
+		serviceNumService.updateServiceNum(serviceNum);
+	}
+
 //    @Override
 //    @GetMapping(TOP)
 //    public BladePage<ServiceNumEntity> top(Integer current, Integer size) {

blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/service/IServiceNumService.java

@@ -34,4 +34,5 @@ public interface IServiceNumService {
 
     ServiceNumEntity findByserviceNum(String sn);
 
+    void updateServiceNum(ServiceNumEntity serviceNum);
 }

blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/service/impl/ServiceNumServiceImpl.java

@@ -52,4 +52,9 @@ public class ServiceNumServiceImpl implements IServiceNumService {
 		queryWrapper.eq("serviceNum",sn);
 		return serviceNumMapper.selectOne(queryWrapper);
 	}
+
+	@Override
+	public void updateServiceNum(ServiceNumEntity serviceNum) {
+		serviceNumMapper.updateById(serviceNum);
+	}
 }