1.签收明细

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionDeliveryListEntity.java

@@ -183,6 +183,11 @@ public class DistributionDeliveryListEntity extends TenantEntity {
 	 */
 	@ApiModelProperty(value = "关联订单id")
 	private String orderId;
+	/**
+	 * 订单自编号
+	 */
+	@ApiModelProperty(value = "订单自编号")
+	private String orderSelfNumbering;
 	/**
 	 * 备货时间
 	 */
@@ -199,7 +204,6 @@ public class DistributionDeliveryListEntity extends TenantEntity {
 	 */
 	@ApiModelProperty(value = "配送单号")
 	private String noteNumber;
-
 	/**
 	 * 数据来源
 	 */

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionSigndetailEntity.java

@@ -94,7 +94,12 @@ public class DistributionSigndetailEntity extends TenantEntity {
 	 * 订单自编号
 	 */
 	@ApiModelProperty(value = "订单自编号")
-	private String orderId;
+	private String orderSelfNumbering;
+	/**
+	 * 在库订单id
+	 */
+	@ApiModelProperty(value = "在库订单id")
+	private Long orderId;
 	/**
 	 * 商城名称
 	 */
@@ -104,7 +109,7 @@ public class DistributionSigndetailEntity extends TenantEntity {
 	 * 货物名称
 	 */
 	@ApiModelProperty(value = "货物名称")
-	private String goodsName;
+	private String descriptionGoods;
 	/**
 	 * 仓库名称
 	 */
@@ -121,7 +126,7 @@ public class DistributionSigndetailEntity extends TenantEntity {
 	@ApiModelProperty(value = "入库时间")
 //	@JsonFormat(shape = JsonFormat.Shape.STRING, pattern="yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
 //	@DateTimeFormat(pattern="yyyy-MM-dd HH:ss:mm")
-	private String warehousingTime;
+	private String warehouseEntryTime;
 	/**
 	 * 备货时间
 	 */
@@ -132,17 +137,17 @@ public class DistributionSigndetailEntity extends TenantEntity {
 	 * 在库时长;(天)
 	 */
 	@ApiModelProperty(value = "在库时长;(天)")
-	private Integer durationInStock;
+	private String storeTime;
 	/**
 	 * 签收件数
 	 */
 	@ApiModelProperty(value = "签收件数")
 	private Integer signedNumber;
 	/**
-	 * 订单总数
+	 * 订单总件数
 	 */
-	@ApiModelProperty(value = "订单总数")
-	private Integer ordersNumber;
+	@ApiModelProperty(value = "订单总件数")
+	private Integer totalNumber;
 	/**
 	 * 是否齐套
 	 */

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

@@ -165,8 +165,8 @@ public class DistributionDeliveryListController extends BladeController {
 	@PostMapping("/start")
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入distributionDeliveryList")
-	public R<Integer> start(@Valid @RequestBody DistributionDeliveryListDTO distributionDeliveryList) {
-		Integer i	= distributionDeliveryListService.start(distributionDeliveryList);
+	public R<Boolean> start(@Valid @RequestBody DistributionDeliveryListDTO distributionDeliveryList) {
+		Boolean i	= distributionDeliveryListService.start(distributionDeliveryList);
 		return R.data(i);
 	}
 

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

@@ -116,7 +116,7 @@ public class DistributionSigndetailController extends BladeController {
 	@ApiOperationSupport(order = 3)
 	@ApiOperation(value = "分页", notes = "传入distributionSigndetail")
 	public R<IPage<DistributionSigndetailVO>> page(DistributionSigndetailDTO distributionSigndetail, Query query) {
-		log.info("接收>>>>>>>>>>>>>>>{}",distributionSigndetail.getWarehousingTime());
+//		log.info("接收>>>>>>>>>>>>>>>{}",distributionSigndetail.getWarehousingTime());
 		//获取当前登录用户
 		BladeUser user = AuthUtil.getUser();
 		IPage<DistributionSigndetailVO> pages = distributionSigndetailService.selectDistributionSigndetailPage(Condition.getPage(query), distributionSigndetail);

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

@@ -60,14 +60,14 @@ public class DistributionSigndetailDTO extends DistributionSigndetailEntity {
 	 * 签收时间
 	 */
 	@ApiModelProperty(value = "签收时间")
-	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
-	private Date signingTime;
+//	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+	private String signingTime;
 	/**
 	 * 司机签收时间
 	 */
 	@ApiModelProperty(value = "司机签收时间")
-	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
-	private Date sjsigningTime;
+//	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+	private String sjsigningTime;
 
 
 	/**

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

@@ -249,7 +249,6 @@
         FROM
         logpm_distribution_delivery_list lddl
         JOIN logpm_distribution_loadscan ldl ON lddl.id = ldl.delivery_id
-
         <where>
             lddl.type = '1'
             <if test="param.trainNumber != null and param.trainNumber!=''">

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

@@ -25,11 +25,11 @@
         <result column="serve_type" property="serveType"/>
         <result column="order_id" property="orderId"/>
         <result column="mall_name" property="mallName"/>
-        <result column="goods_name" property="goodsName"/>
+        <result column="description_goods" property="descriptionGoods"/>
         <result column="warehouse" property="warehouseName"/>
-        <result column="warehousing_time" property="warehousingTime"/>
+        <result column="warehouse_entry_time" property="warehouseEntryTime"/>
         <result column="lead_time" property="leadTime"/>
-        <result column="duration_in_stock" property="durationInStock"/>
+        <result column="store_time" property="storeTime"/>
         <result column="signed_number" property="signedNumber"/>
         <result column="is_kitting" property="isKitting"/>
         <result column="brand" property="brand"/>
@@ -44,14 +44,14 @@
         ldsd.train_number trainNumber,
         ldsd.serve_type serveType,
         ldsd.order_id orderId,
+        ldsd.order_self_numbering orderSelfNumbering,
         ldsd.mall_name mallName,
-        ldsd.goods_name goodsName,
+        ldsd.description_goods descriptionGoods,
         ldsd.warehouse warehouse,
-        ldsd.warehousing_time warehousingTime,
+        ldsd.warehouse_entry_time warehouseEntryTime,
         ldsd.lead_time leadTime,
-        ldsd.duration_in_stock durationInStock,
-        ldsd.orders_number ordersNumber,
-        ldsd.is_kitting isKitting,
+        ldsd.store_time storeTime,
+        ldsd.complete_set completeSet,
         ldsd.brand brand,
         ldsd.signed_number signedNumber,
         ldsf.consignee_name consigneeName,
@@ -59,6 +59,7 @@
         ldsf.signing_time signingTime,
         ldsf.sjsigning_time sjsigningTime,
         ldsf.delivery_phone deliveryPhone,
+        ldsf.order_self_numbering orderSelfNumbering,
         ldsf.delivery_address deliveryAddress
         FROM
         logpm_distribution_signdetail ldsd
@@ -83,15 +84,12 @@
             <if test="param.mallName!=null and param.mallName!=''">
                 and ldsd.mall_name like concat('%',#{param.mallName},'%')
             </if>
-            <if test="param.goodsName!=null and param.goodsName!=''">
-                and ldsd.goods_name like concat('%',#{param.goodsName},'%')
+            <if test="param.descriptionGoods!=null and param.descriptionGoods!=''">
+                and ldsd.description_goods like concat('%',#{param.descriptionGoods},'%')
             </if>
             <if test="param.warehouseName!=null and param.warehouseName!=''">
                 and ldsf.warehouse_name like concat('%',#{param.warehouseName},'%')
             </if>
-            <if test="param.durationInStock!=null and param.durationInStock!=''">
-                and ldsd.duration_in_stock like concat('%',#{param.durationInStock},'%')
-            </if>
             <if test="param.deliveryAddress!=null and param.deliveryAddress!=''">
                 and ldsf.deliveryAddress like concat('%',#{param.deliveryAddress},'%')
             </if>
@@ -101,8 +99,8 @@
             <if test="param.consigneePhone!=null and param.consigneePhone!=''">
                 and ldsd.consignee_phone like concat('%',#{param.consigneePhone},'%')
             </if>
-            <if test="param.warehousingTime!=null and param.warehousingTime!=''">
-                and  date_format(ldsd.warehousing_time,'%y%m%d%') = date_format(#{param.warehousingTime},'%y%m%d%')
+            <if test="param.warehouseEntryTime!=null and param.warehouseEntryTime!=''">
+                and  date_format(ldsd.warehouse_entry_time,'%y%m%d%') = date_format(#{param.warehouseEntryTime},'%y%m%d%')
             </if>
             <if test="param.signingTime!=null and param.signingTime!=''">
                 and  date_format(ldsf.signing_time,'%y%m%d%') = date_format(#{param.signingTime},'%y%m%d%')
@@ -113,12 +111,6 @@
               <if test="param.leadTime!=null and param.leadTime!=''">
                 and  date_format(ldsd.lead_time,'%y%m%d%') = date_format(#{param.leadTime},'%y%m%d%')
             </if>
-              <if test="param.sjsigningTime!=null and param.sjsigningTime!=''">
-                and  date_format(ldsd.sjsigning_time,'%y%m%d%') = date_format(#{param.sjsigningTime},'%y%m%d%')
-            </if>
-             <if test="param.createTime_query!=null and param.createTime_query!=''">
-                and  date_format(ldsd.create_time,'%y%m%d%') = date_format(#{param.createTime_query},'%y%m%d%')
-            </if>
         </where>
             order by ldsd.create_time desc
     </select>

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

@@ -93,4 +93,10 @@ public interface DistributionSignforMapper extends BaseMapper<DistributionSignfo
 	 * @return
 	 */
 	Integer selectclerkNubCount(@Param("param") DistributionSignforDTO distributionSignfor);
+	/**
+	 * 通过订单id查询主Id
+	 *
+	 * @return
+	 */
+    Long selectIdByOrderId(Long id);
 }

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

@@ -248,5 +248,12 @@
             </if>
         </where>
     </select>
+    <select id="selectIdByOrderId" resultType="java.lang.Long">
+        select  id from logpm_distribution_signfor
+        <where>
+        is_deleted = 0 and order_id like concat('%',#{id},'%')
+        </where>
+            order by create_time desc  limit 1
+    </select>
 
 </mapper>

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

@@ -75,7 +75,7 @@ public interface IDistributionDeliveryListService extends BaseService<Distributi
 	 * @param
 	 * @return
 	 */
-	Integer start(DistributionDeliveryListDTO distributionDeliveryList);
+	Boolean start(DistributionDeliveryListDTO distributionDeliveryList);
 	/**
 	 *装车扫描
 	 */

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

@@ -57,4 +57,10 @@ public interface IDistributionSignforService extends BaseService<DistributionSig
 	 * @return
 	 */
 	DistributionSignforsnmbVO getNubTotal(DistributionSignforDTO distributionSignfor);
+	/**
+	 * 通过订单id查询签收Id
+	 *
+	 * @return
+	 */
+    Long selectIdByOrderId(Long id);
 }

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

@@ -17,6 +17,7 @@
 package com.logpm.distribution.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.logpm.distribution.dto.DistributionDeliveryListDTO;
 import com.logpm.distribution.dto.DistributionSignforDTO;
 import com.logpm.distribution.dto.DistrilbutionloadingscanDTO;
@@ -74,6 +75,8 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 	private final DistributionDeliveryListMapper distributionDeliveryListMapper;
 	private final DistributionSignforServiceImpl distributionSignforService;
 	private final DistributionStockArticleMapper distributionStockArticleMapper;
+	private final DistributionSigndetailServiceImpl distributionSigndetailService;
+	private final DistributionPackadeliServiceImpl distributionPackadeliService;
 	private final BladeRedis bladeRedis;
 	@Override
 	public IPage<DistributionDeliveryListVO> selectDistributionDeliveryListPage(IPage<DistributionDeliveryListVO> page, DistributionDeliveryListDTO distributionDeliveryList) {
@@ -148,7 +151,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 
 	@Override
 	@Transactional(isolation = Isolation.READ_COMMITTED, rollbackFor = Exception.class)
-	public Integer start(DistributionDeliveryListDTO distributionDeliveryList) {
+	public Boolean start(DistributionDeliveryListDTO distributionDeliveryList) {
 		log.info("开始发车>>>>>>>>>{}", distributionDeliveryList);
 		//获取关联的客户信息
 		if (distributionDeliveryList.getSource() ==1){
@@ -198,24 +201,43 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 		}else {
 
 		}
-		//插入配送管理表
-
 		//获取关联订单
 		String orderId = distributionDeliveryList.getOrderId();
 		List<Long> orderIds = Arrays.asList(Long.valueOf(String.valueOf(orderId.split(","))));
 		//查询在库订单
 		List<DistributionStockArticleEntity> distributionStockArticleEntities = distributionStockArticleMapper.selectBatchIds(orderIds);
 		//插入配送详情表
+		ArrayList<DistributionSigndetailEntity> arrayList = new ArrayList<>();
 		distributionStockArticleEntities.forEach(e->{
 			DistributionSigndetailEntity distributionSigndetailEntity = new DistributionSigndetailEntity();
 			Func.copy(e,distributionSigndetailEntity);
+			//查询签收表id
+			Long masterId	= distributionSignforService.selectIdByOrderId(e.getId());
+			distributionSigndetailEntity.setMasterId(masterId);
+			distributionSigndetailEntity.setOrderId(e.getId());
 		});
-		//TODO 修改配送表id
-		return null;
+		distributionSigndetailService.saveBatch(arrayList);
+		//插入签收包条表
+		ArrayList<DistributionPackadeliEntity> DistributionPackadeliEntitys = new ArrayList<>();
+		List<DistributionLoadscanEntity> distributionLoadscanEntities = distributionLoadscanMapper.selectList(new QueryWrapper<DistributionLoadscanEntity>().lambda()
+			.eq(DistributionLoadscanEntity::getDeliveryId,distributionDeliveryList.getId())
+			.ne(DistributionLoadscanEntity::getScanStatus,1));
+		distributionLoadscanEntities.forEach(e->{
+			DistributionPackadeliEntity distributionPackadeliEntity = new DistributionPackadeliEntity();
+
+			DistributionPackadeliEntitys.add(distributionPackadeliEntity);
+		});
+		distributionPackadeliService.saveBatch(DistributionPackadeliEntitys);
+		//TODO 修改配送表
+		return this.update(new UpdateWrapper<DistributionDeliveryListEntity>().lambda()
+			.eq(DistributionDeliveryListEntity::getId,distributionDeliveryList.getId())
+			.set(DistributionDeliveryListEntity::getState,"2")
+		);
 	}
 
 
 	@Override
+	@Transactional(isolation = Isolation.READ_COMMITTED, rollbackFor = Exception.class)
 	public R loadingscan(DistrilbutionloadingscanDTO distrilbutionloadingscanDTO) {
 		//获取当前用户司机
 		BladeUser user = AuthUtil.getUser();

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

@@ -70,4 +70,10 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 		return distributionSignforsnmbVO;
 	}
 
+	@Override
+	public Long selectIdByOrderId(Long id) {
+		return baseMapper.selectIdByOrderId(id);
+	}
+
+
 }