Merge branch 'master_chujiang_0805' into master_quotation

@@ -1104,6 +1104,7 @@ CREATE TABLE `pending_delivery_order` (
 
 
 alter table shipments_order_info add column delivery_time datetime default null comment '签收时间';
 alter table shipments_order_info add column delivery_time datetime default null comment '签收时间';
 alter table shipments_plan add column auto_generate bool default true comment '是否系统自动生成';
 alter table shipments_plan add column auto_generate bool default true comment '是否系统自动生成';
+alter table shipments_plan add column source varchar(32) default null comment '来源（APPLY_SHIPMENT-申请发货，null-其它）';
 
 
 create table if not exists base_data_customer_short(
 create table if not exists base_data_customer_short(
     id varchar(32) primary key comment 'ID',
     id varchar(32) primary key comment 'ID',

@@ -58,6 +58,11 @@ public class ShipmentsPlan extends BaseEntity implements BaseDto {
     private Boolean autoGenerate;
     private Boolean autoGenerate;
 
 
     /**
     /**
+     * 来源（APPLY_SHIPMENT-申请发货，null-其它）
+     */
+    private String source;
+
+    /**
      * 经营办审核人(发货计划提交人)
      * 经营办审核人(发货计划提交人)
      */
      */
     private String businessOfficeAuditor;
     private String businessOfficeAuditor;

@@ -207,7 +207,7 @@ public class ShipmentsPlanDetail extends BaseEntity implements BaseDto {
     private LocalTime shipmentsTime;
     private LocalTime shipmentsTime;
 
 
     /**
     /**
-     * 是否预发
+     * 是否预发（明日预发 false,后日预发 true）
      */
      */
     private Boolean preShipments;
     private Boolean preShipments;
 
 

@@ -371,6 +371,7 @@ public class ShipmentsPlanDetailServiceImpl extends BaseMpServiceImpl<ShipmentsP
             plan.setWorkshopId(workshop.getId());
             plan.setWorkshopId(workshop.getId());
             plan.setTomoPreShipDate(tomorrow);
             plan.setTomoPreShipDate(tomorrow);
             plan.setAfTomoPreShipDate(afTomorrow);
             plan.setAfTomoPreShipDate(afTomorrow);
+            plan.setAutoGenerate(Boolean.TRUE);
 
 
             shipmentsPlanService.getBaseMapper().insert(plan);
             shipmentsPlanService.getBaseMapper().insert(plan);
             // 生成发货计划明细
             // 生成发货计划明细
@@ -417,6 +418,97 @@ public class ShipmentsPlanDetailServiceImpl extends BaseMpServiceImpl<ShipmentsP
         }
         }
     }
     }
 
 
+    @Override
+    public void autoCreateShipmentPlanFromApply(String purchaseOrderId, String workshopId) {
+        // 1. 获取订货单数据
+        PurchaseOrderInfo orderInfo = purchaseOrderInfoService.findById(purchaseOrderId);
+        if (orderInfo == null) {
+            return;
+        }
+
+        // 2. 过滤不需要发货的数据(参考autoCreateShipmentPlan逻辑)
+        String type = orderInfo.getType();
+        String examineStatus = orderInfo.getExamineStatus();
+        String status = orderInfo.getStatus();
+        String revokeStatus = orderInfo.getRevokeStatus();
+        String specChangeStatus = orderInfo.getSpecChangeStatus();
+        if (!"PRODUCTION".equals(type) || !"PASS".equals(examineStatus)
+                || "SHIPPED".equals(status) || "DELIVERED".equals(status) || "CANCEL".equals(status)
+                || "UNDOING".equals(revokeStatus) || "IN_PROGRESS".equals(specChangeStatus)) {
+            return;
+        }
+
+        // 3. 获取订货单规格
+        List<PurchaseOrderLine> orderLines = purchaseOrderLineService.listByOrderIds(Collections.singletonList(purchaseOrderId), false);
+        if (CollectionUtils.isEmpty(orderLines)) {
+            return;
+        }
+
+        // 4. 过滤已在发货计划中的数据（明日预发的数据）
+        List<String> specIds = orderLines.stream().map(PurchaseOrderLine::getId).collect(Collectors.toList());
+        LambdaQueryWrapper<ShipmentsPlanDetail> queryWrapper = Wrappers.lambdaQuery(ShipmentsPlanDetail.class);
+        queryWrapper.in(ShipmentsPlanDetail::getOrderSpecId, specIds)
+                .eq(ShipmentsPlanDetail::getDelFlag, Boolean.FALSE)
+                .eq(ShipmentsPlanDetail::getPreShipments, Boolean.FALSE);
+        List<ShipmentsPlanDetail> existingDetails = getBaseMapper().selectList(queryWrapper);
+        if (CollectionUtils.isNotEmpty(existingDetails)) {
+            // 过滤掉已在发货计划中的规格
+            List<String> existingSpecIds = existingDetails.stream()
+                    .map(ShipmentsPlanDetail::getOrderSpecId).distinct().collect(Collectors.toList());
+            orderLines.removeIf(next -> existingSpecIds.contains(next.getId()));
+        }
+        if (CollectionUtils.isEmpty(orderLines)) {
+            return;
+        }
+
+        // 5. 查找30分钟内同分厂的申请发货计划
+        LocalDateTime thirtyMinutesAgo = LocalDateTime.now().minusMinutes(30);
+        LambdaQueryWrapper<ShipmentsPlan> planQueryWrapper = Wrappers.lambdaQuery(ShipmentsPlan.class);
+        planQueryWrapper.eq(ShipmentsPlan::getWorkshopId, workshopId)
+                .eq(ShipmentsPlan::getSource, "APPLY_SHIPMENT")
+                .eq(ShipmentsPlan::getStatus, "DRAFT")
+                .ge(ShipmentsPlan::getCreateTime, thirtyMinutesAgo);
+        List<ShipmentsPlan> existingPlans = shipmentsPlanService.getBaseMapper().selectList(planQueryWrapper);
+
+        ShipmentsPlan plan;
+        LocalDate tomorrow = LocalDate.now().plusDays(1);
+        if (CollectionUtils.isNotEmpty(existingPlans)) {
+            // 已存在30分钟内的计划，复用
+            plan = existingPlans.get(0);
+        } else {
+            // 新建发货计划
+            plan = new ShipmentsPlan();
+            plan.setId(IdUtil.getId());
+            plan.setStatus("DRAFT");
+            plan.setWorkshopId(workshopId);
+            plan.setTomoPreShipDate(tomorrow);
+            plan.setAfTomoPreShipDate(LocalDate.now().plusDays(2));
+            plan.setAutoGenerate(Boolean.TRUE);
+            plan.setSource("APPLY_SHIPMENT");
+            shipmentsPlanService.getBaseMapper().insert(plan);
+        }
+
+        // 6. 生成发货计划明细，加入明日预发
+        List<ShipmentsPlanDetail> planDetails = new ArrayList<>();
+        for (PurchaseOrderLine line : orderLines) {
+            ShipmentsPlanDetail detail = new ShipmentsPlanDetail();
+            detail.setId(IdUtil.getId());
+            detail.setPlanId(plan.getId());
+            detail.setOrderId(purchaseOrderId);
+            detail.setOrderSpecId(line.getId());
+            detail.setShipmentsDate(tomorrow);
+            detail.setPreShipments(Boolean.FALSE);
+            detail.setDelFlag(Boolean.FALSE);
+            detail.setCreateById("1");
+            detail.setUpdateById("1");
+
+            planDetails.add(detail);
+        }
+        if (CollectionUtils.isNotEmpty(planDetails)) {
+            getBaseMapper().batchAdd(planDetails);
+        }
+    }
+
     /**
     /**
      * 批量删除
      * 批量删除
      *
      *

@@ -27,6 +27,7 @@ import com.lframework.xingyun.sc.entity.DraftRequestCarTicket;
 import com.lframework.xingyun.sc.entity.PurchaseOrderInfo;
 import com.lframework.xingyun.sc.entity.PurchaseOrderInfo;
 import com.lframework.xingyun.sc.mappers.DraftRequestCarTicketMapper;
 import com.lframework.xingyun.sc.mappers.DraftRequestCarTicketMapper;
 import com.lframework.xingyun.sc.service.order.PurchaseOrderInfoService;
 import com.lframework.xingyun.sc.service.order.PurchaseOrderInfoService;
+import com.lframework.xingyun.sc.service.shipments.ShipmentsPlanDetailService;
 import com.lframework.xingyun.sc.service.shipments.car.DraftRequestCarTicketService;
 import com.lframework.xingyun.sc.service.shipments.car.DraftRequestCarTicketService;
 import com.lframework.xingyun.sc.vo.shipments.car.*;
 import com.lframework.xingyun.sc.vo.shipments.car.*;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.collections.CollectionUtils;
@@ -51,6 +52,8 @@ public class DraftRequestCarTicketServiceImpl extends BaseMpServiceImpl<DraftReq
     private PurchaseOrderInfoService purchaseOrderInfoService;
     private PurchaseOrderInfoService purchaseOrderInfoService;
     @Resource
     @Resource
     private SysUserService sysUserService;
     private SysUserService sysUserService;
+    @Resource
+    private ShipmentsPlanDetailService shipmentsPlanDetailService;
 
 
     @Override
     @Override
     public PageResult<DraftRequestCarTicket> query(Integer pageIndex, Integer pageSize, QueryDraftRequestCarTicketVo vo) {
     public PageResult<DraftRequestCarTicket> query(Integer pageIndex, Integer pageSize, QueryDraftRequestCarTicketVo vo) {
@@ -185,6 +188,8 @@ public class DraftRequestCarTicketServiceImpl extends BaseMpServiceImpl<DraftReq
         OpLogUtil.setVariable("id", data.getId());
         OpLogUtil.setVariable("id", data.getId());
         OpLogUtil.setExtra(vo);
         OpLogUtil.setExtra(vo);
         if (!"SHIPMENTSPLAN".equals(vo.getSource())) {
         if (!"SHIPMENTSPLAN".equals(vo.getSource())) {
+            // 申请发货自动生成发货计划，30分钟内同分厂数据加入同一个计划的明日预发
+            shipmentsPlanDetailService.autoCreateShipmentPlanFromApply(vo.getPurchaseOrderId(), vo.getWorkshopId());
             //开启审核
             //开启审核
             data.setUpdateById(SecurityUtil.getCurrentUser().getId());
             data.setUpdateById(SecurityUtil.getCurrentUser().getId());
             flowInstanceWrapperService.startInstance(BPM_FLAG, data.getId(), BPM_FLAG, data);
             flowInstanceWrapperService.startInstance(BPM_FLAG, data.getId(), BPM_FLAG, data);

@@ -162,4 +162,13 @@ public interface ShipmentsPlanDetailService extends BaseMpService<ShipmentsPlanD
      * @return                  List<String>
      * @return                  List<String>
      */
      */
     List<String> getOrderIdByShipmentOrderId(String shipmentOrderId);
     List<String> getOrderIdByShipmentOrderId(String shipmentOrderId);
+
+    /**
+     * 申请发货自动生成发货计划
+     * 30分钟内同分厂的数据加入同一个发货计划的明日预发
+     *
+     * @param purchaseOrderId   订货单ID
+     * @param workshopId        分厂ID
+     */
+    void autoCreateShipmentPlanFromApply(String purchaseOrderId, String workshopId);
 }
 }

@@ -10,6 +10,7 @@
         <result column="tomo_pre_ship_date" property="tomoPreShipDate"/>
         <result column="tomo_pre_ship_date" property="tomoPreShipDate"/>
         <result column="af_tomo_pre_ship_date" property="afTomoPreShipDate"/>
         <result column="af_tomo_pre_ship_date" property="afTomoPreShipDate"/>
         <result column="auto_generate" property="autoGenerate"/>
         <result column="auto_generate" property="autoGenerate"/>
+        <result column="source" property="source"/>
         <result column="business_office_auditor" property="businessOfficeAuditor"/>
         <result column="business_office_auditor" property="businessOfficeAuditor"/>
         <result column="create_by_id" property="createById"/>
         <result column="create_by_id" property="createById"/>
         <result column="update_by_id" property="updateById"/>
         <result column="update_by_id" property="updateById"/>
@@ -26,6 +27,7 @@
             tb.tomo_pre_ship_date,
             tb.tomo_pre_ship_date,
             tb.af_tomo_pre_ship_date,
             tb.af_tomo_pre_ship_date,
             tb.auto_generate,
             tb.auto_generate,
+            tb.source,
             tb.business_office_auditor,
             tb.business_office_auditor,
             tb.create_by_id,
             tb.create_by_id,
             tb.update_by_id,
             tb.update_by_id,