订单转库存品过滤装车签收包件、预约计划批量修改订单客户

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

@@ -353,6 +353,13 @@ public class DistributionStockArticleController extends BladeController {
 		return R.status(distributionStockArticleService.updateById(distributionStockArticle));
 	}
 
+	@PostMapping("/updateBatchClient")
+	@ApiOperationSupport(order = 5)
+	@ApiOperation(value = "修改", notes = "传入distributionStockArticle")
+	public R updateBatchClient(@Valid @RequestBody DistributionStockArticleDTO distributionStockArticleDTO) {
+		return R.status(distributionStockArticleService.updateBatchById(distributionStockArticleDTO.getEntityList()));
+	}
+
 	/**
 	 * 配送在库订单 新增或修改
 	 */

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

@@ -38,6 +38,8 @@ public class DistributionParcelListDTO extends DistributionParcelListEntity {
 	private Long materialId;
 	private String materialName;
 	private String materialCode;
+	private Integer isLoading;
+	private Integer isSigning;
 	private String materialUnit;
 	private Integer reservationNum; //预约数量
 	private String sku;

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

@@ -71,5 +71,11 @@ public class DistributionStockArticleDTO extends DistributionStockArticleEntity
 	@TableField(exist = false)
 	private List<DistributionParcelNumberVO> parcelNumberVOS;
 
+	/**
+	 //	 * 零担订单品类信息
+	 //	 */
+	@TableField(exist = false)
+	private List<DistributionStockArticleEntity> entityList;
+
 
 }

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

@@ -93,14 +93,6 @@
         lds.received_quantity receivedQuantity,
         lds.is_have_abnormal_package isHaveAbnormalPackage,
         lds.signee_name signeeName,
-        (SELECT
-       ldss.forklift_name
-        FROM
-        logpm_distribution_stockup_info AS ldsi
-        LEFT JOIN logpm_distribution_stockup AS ldss ON ldsi.stockup_id = ldss.id
-        WHERE
-        ldsi.reservation_id = lds.reservation_id
-        ) AS forkliftName,
         CASE
         WHEN ldr.stockup_status ='10' THEN '待指派'
         WHEN ldr.stockup_status ='20' THEN '待备货'
@@ -118,10 +110,20 @@
         CASE
         WHEN lds.driver_signing ='1' THEN '未完成'
         else '已完成'
-        END driverSigning
+        END driverSigning,
+        t.forklift_name AS forkliftName
         FROM
         logpm_distribution_signfor lds
-        JOIN logpm_distribution_reservation ldr ON ldr.id = lds.reservation_id
+        LEFT JOIN logpm_distribution_reservation ldr ON ldr.id = lds.reservation_id
+        LEFT JOIN (SELECT
+        ldss.forklift_name,
+        ldsi.reservation_id
+        FROM
+        logpm_distribution_stockup_info AS ldsi
+        LEFT JOIN logpm_distribution_stockup AS ldss ON ldsi.stockup_id = ldss.id
+        WHERE
+        ldsi.reservation_id = lds.reservation_id
+        ) AS t ON t.reservation_id = ldsi.reservation_id
         <where>
             lds.is_deleted = 0 and lds.delivery_id = #{id} and ldr.reservation_status != 40 AND (ldr.reservation_num + ldr.reservation_stock_list_num) > 0
         </where>

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

@@ -638,6 +638,12 @@
             <if test="param.orderPackageReservationStatus != null and param.orderPackageReservationStatus != ''">and
                 ldpl.order_package_reservation_status = #{param.orderPackageReservationStatus}
             </if>
+            <if test="param.isLoading != null and param.isLoading == 0">and
+                ldpl.order_package_loading_status != 20
+            </if>
+            <if test="param.isSigning != null and param.isSigning == 0">and
+                ldpl.order_package_status != 70
+            </if>
             <if test="param.orderPackageFreezeStatus != null and param.orderPackageFreezeStatus != ''">and
                 ldpl.order_package_freeze_status = #{param.orderPackageFreezeStatus}
             </if>

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

@@ -232,4 +232,5 @@ public interface IDistributionStockArticleService extends BaseService<Distributi
 
     void submitHandleNumAndTotalNumberByOrderId(Integer subNum, Long articleId);
 
+
 }

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

@@ -19,6 +19,7 @@ package com.logpm.distribution.service.impl;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
@@ -1789,6 +1790,8 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
 	}
 
 
+
+
 	@Override
 	public DistributionStockArticleEntity findZeroByOrderCodeAndWarehouseId(String orderCode, Long warehouseId) {
 		QueryWrapper<DistributionStockArticleEntity> queryWrapper = new QueryWrapper<>();