楚江ERP-1、订货单变更增加模糊搜索；2、增加可以补货的订货单数据；3、发货计划状态逻辑调整；4、新增发货明细bug修复；5、生成发货单列表数据逻辑调整；

@@ -267,6 +267,8 @@ public class ShipmentsOrderInfoServiceImpl extends BaseMpServiceImpl<ShipmentsOr
             List<List<ShipmentsPlanDetail>> batchList = CommonUtil.partition(detailList, 8);
             handleBatchData(batchList, planId);
         }
+        // 更细发货计划状态
+        shipmentsPlanDetailService.completed(planId);
     }
 
 

@@ -23,10 +23,7 @@ import com.lframework.xingyun.sc.service.order.PurchaseOrderLineService;
 import com.lframework.xingyun.sc.service.shipments.ShipmentsPlanDetailService;
 import com.lframework.xingyun.sc.service.shipments.ShipmentsPlanService;
 import com.lframework.xingyun.sc.utils.CommonUtil;
-import com.lframework.xingyun.sc.vo.shipments.plan.CreateShipmentsPlanDetailVo;
-import com.lframework.xingyun.sc.vo.shipments.plan.QueryShipmentsPlanDetailVo;
-import com.lframework.xingyun.sc.vo.shipments.plan.ShipmentsPlanDetailSplitVo;
-import com.lframework.xingyun.sc.vo.shipments.plan.UpdateShipmentsPlanDetailVo;
+import com.lframework.xingyun.sc.vo.shipments.plan.*;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
@@ -148,13 +145,14 @@ public class ShipmentsPlanDetailServiceImpl extends BaseMpServiceImpl<ShipmentsP
      */
     @Override
     public PageResult<ShipmentsPlanDetail> queryCanShipmentsData(Integer pageIndex, Integer pageSize, QueryShipmentsPlanDetailVo vo) {
-        // 获取已经加入发货计划的订货单规格id
-        LambdaQueryWrapper<ShipmentsPlanDetail> queryWrapper = Wrappers.lambdaQuery(ShipmentsPlanDetail.class);
-        queryWrapper.eq(ShipmentsPlanDetail::getPreShipments, Boolean.FALSE)
-                .select(ShipmentsPlanDetail::getOrderSpecId);
-        List<ShipmentsPlanDetail> shipmentsPlanDetails = getBaseMapper().selectList(queryWrapper);
-        if (CollectionUtils.isNotEmpty(shipmentsPlanDetails)) {
-            List<String> orderSpecIds = shipmentsPlanDetails.stream().map(ShipmentsPlanDetail::getOrderSpecId).collect(Collectors.toList());
+        // 获取发货计划数据
+        ShipmentsPlan plan = shipmentsPlanService.findById(vo.getPlanId());
+        if (plan == null) {
+            throw new DefaultClientException("发货计划不存在！");
+        }
+        // 获取已经存在的明细数据
+        List<String> orderSpecIds = getBaseMapper().getExistsOrderSpecIds(plan.getAfTomoPreShipDate());
+        if (CollectionUtils.isNotEmpty(orderSpecIds)) {
             vo.setOrderSpecIds(orderSpecIds);
         }
         // 开启分页
@@ -324,6 +322,26 @@ public class ShipmentsPlanDetailServiceImpl extends BaseMpServiceImpl<ShipmentsP
         return getBaseMapper().listByPlanId(planId);
     }
 
+    @Override
+    public void completed(String planId) {
+        if (StringUtils.isBlank(planId)) {
+            return;
+        }
+        LambdaQueryWrapper<ShipmentsPlanDetail> queryWrapper = Wrappers.lambdaQuery(ShipmentsPlanDetail.class);
+        queryWrapper.eq(ShipmentsPlanDetail::getPlanId, planId)
+                .and(wrapper -> wrapper.isNull(ShipmentsPlanDetail::getShipmentOrderId)
+                        .or()
+                        .eq(ShipmentsPlanDetail::getShipmentOrderId, ""));
+        Integer count = getBaseMapper().selectCount(queryWrapper);
+        if (count == 0) {
+            // 已全部完成
+            UpdateShipmentsPlanVo planVo = new UpdateShipmentsPlanVo();
+            planVo.setId(planId);
+            planVo.setStatus("COMPLETED");
+            shipmentsPlanService.update(planVo);
+        }
+    }
+
 
     /**
      * 封装发货计划明细数据

@@ -63,4 +63,13 @@ public interface ShipmentsPlanDetailMapper extends BaseMapper<ShipmentsPlanDetai
      * @return ShipmentsPlanDetail
      */
     ShipmentsPlanDetail findById(@Param("id") String id);
+
+    /**
+     * 获取已经存在的规格ID
+     * 包含预发数据
+     *
+     * @param shipmentsDate 发货日期
+     * @return              List<String>
+     */
+    List<String> getExistsOrderSpecIds(LocalDate shipmentsDate);
 }

@@ -105,4 +105,12 @@ public interface ShipmentsPlanDetailService extends BaseMpService<ShipmentsPlanD
      * @return          List<ShipmentsPlanDetail>
      */
     List<ShipmentsPlanDetail> listByPlanId(String planId);
+
+
+    /**
+     * 判断发货计划明细是否已全部完成
+     *
+     * @param planId    计划ID
+     */
+    void completed(String planId);
 }

@@ -15,6 +15,7 @@ public class QueryPurchaseOrderInfoVo extends PageVo implements BaseVo, Serializ
      * 查询类型
      * REVOKE：撤销
      * CHANGE：变更
+     * REPLENISHMENT：补货
      */
     @ApiModelProperty("查询类型")
     private String queryType;
@@ -99,4 +100,11 @@ public class QueryPurchaseOrderInfoVo extends PageVo implements BaseVo, Serializ
     @ApiModelProperty("订货单位或订单编号")
     private String orderingUnitNameOrOrderNo;
 
+    /**
+     * 搜索关键字
+     * 移动端使用
+     * 根据订货单位和订货单编号模糊搜索
+     */
+    @ApiModelProperty("搜索关键字")
+    private String searchKey;
 }

@@ -45,4 +45,10 @@ public class QueryShipmentsPlanDetailVo extends PageVo implements BaseVo, Serial
      */
     @ApiModelProperty("客户名称")
     private String customerName;
+
+    /**
+     * 是否已完成
+     */
+    @ApiModelProperty("客户名称")
+    private Boolean completed;
 }

@@ -117,6 +117,12 @@
             <if test="vo.workshopId != null and vo.workshopId != ''">
                 AND tb.workshop_id = #{vo.workshopId}
             </if>
+            <if test="vo.searchKey != null and vo.searchKey != ''">
+                AND (
+                    cu.name LIKE CONCAT('%', #{vo.searchKey},'%')
+                    OR tb.order_no LIKE CONCAT('%', #{vo.searchKey},'%')
+                )
+            </if>
         </where>
         ORDER BY tb.update_time DESC
     </select>

@@ -192,10 +192,14 @@
             </when>
             <when test="vo.queryType == 'CHANGE'">
                 AND tb.examine_status = 'PASS'
-                AND tb.status != 'SHIPPED'
+                AND tb.status NOT IN ('SHIPPED', 'DELIVERED')
                 AND (tb.revoke_status != 'UNDOING' OR tb.revoke_status IS NULL)
                 AND (tb.spec_change_status != 'IN_PROGRESS' OR tb.spec_change_status IS NULL)
             </when>
+            <when test="vo.queryType == 'REPLENISHMENT'">
+                AND tb.examine_status = 'PASS'
+                AND tb.status IN ('TRANSIT', 'SHIPPED', 'DELIVERED')
+            </when>
             <otherwise>
                 AND 1 = 0  <!-- 确保查询不到任何数据 -->
             </otherwise>

@@ -86,6 +86,16 @@
             <if test="vo.shipmentsDate != null">
                 AND tb.shipments_date = #{vo.shipmentsDate}
             </if>
+            <if test="vo.completed != null">
+                <choose>
+                    <when test="vo.completed == true">
+                        AND tb.shipment_order_id IS NOT NULL AND tb.shipment_order_id != ''
+                    </when>
+                    <otherwise>
+                        AND (tb.shipment_order_id IS NULL OR tb.shipment_order_id = '')
+                    </otherwise>
+                </choose>
+            </if>
         </where>
         ORDER BY tb.create_time desc
     </select>
@@ -238,4 +248,10 @@
             </if>
         </where>
     </select>
+
+    <select id="getExistsOrderSpecIds" resultType="java.lang.String">
+        select distinct tb.order_spec_id
+        from shipments_plan_detail tb
+        where tb.pre_shipments = false or (tb.pre_shipments = true and tb.shipments_date = #{shipmentsDate})
+    </select>
 </mapper>