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

@@ -9,7 +9,9 @@ import com.lframework.starter.web.inner.service.system.SysUserService;
 import com.lframework.xingyun.sc.bo.shipments.order.GetShipmentsOrderInfoBo;
 import com.lframework.xingyun.sc.bo.shipments.order.GetShipmentsOrderInfoBo;
 import com.lframework.xingyun.sc.bo.shipments.order.QueryShipmentsOrderInfoBo;
 import com.lframework.xingyun.sc.bo.shipments.order.QueryShipmentsOrderInfoBo;
 import com.lframework.xingyun.sc.bo.shipments.plan.ShipmentsPlanDetailBo;
 import com.lframework.xingyun.sc.bo.shipments.plan.ShipmentsPlanDetailBo;
+import com.lframework.xingyun.sc.entity.PurchaseOrderInfo;
 import com.lframework.xingyun.sc.entity.ShipmentsPlanDetail;
 import com.lframework.xingyun.sc.entity.ShipmentsPlanDetail;
+import com.lframework.xingyun.sc.service.order.PurchaseOrderInfoService;
 import com.lframework.xingyun.sc.service.shipments.ShipmentsPlanDetailService;
 import com.lframework.xingyun.sc.service.shipments.ShipmentsPlanDetailService;
 import com.lframework.xingyun.sc.utils.ExcelUtil;
 import com.lframework.xingyun.sc.utils.ExcelUtil;
 import com.lframework.xingyun.sc.utils.LatexFormulaExcelExporterUtil;
 import com.lframework.xingyun.sc.utils.LatexFormulaExcelExporterUtil;
@@ -27,6 +29,7 @@ import javax.validation.constraints.NotBlank;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParam;
 import com.lframework.starter.web.core.components.resp.InvokeResultBuilder;
 import com.lframework.starter.web.core.components.resp.InvokeResultBuilder;
 import com.lframework.starter.common.exceptions.impl.DefaultClientException;
 import com.lframework.starter.common.exceptions.impl.DefaultClientException;
+import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperation;
 import com.lframework.starter.common.utils.CollectionUtil;
 import com.lframework.starter.common.utils.CollectionUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.Api;
@@ -37,6 +40,7 @@ import org.apache.poi.ss.usermodel.Sheet;
 import org.apache.poi.ss.usermodel.Workbook;
 import org.apache.poi.ss.usermodel.Workbook;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import com.lframework.starter.web.core.controller.DefaultBaseController;
 import com.lframework.starter.web.core.controller.DefaultBaseController;
 import com.lframework.starter.web.core.annotations.security.HasPermission;
 import com.lframework.starter.web.core.annotations.security.HasPermission;
@@ -50,6 +54,7 @@ import java.math.RoundingMode;
 import java.nio.file.Files;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.nio.file.Paths;
+import java.time.LocalDate;
 import java.time.format.DateTimeFormatter;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.util.*;
 import java.util.stream.Collectors;
 import java.util.stream.Collectors;
@@ -78,6 +83,8 @@ public class ShipmentsOrderInfoController extends DefaultBaseController {
     private RedisTemplate redisTemplate;
     private RedisTemplate redisTemplate;
     @Resource
     @Resource
     private SysDeptService sysDeptService;
     private SysDeptService sysDeptService;
+    @Resource
+    private PurchaseOrderInfoService purchaseOrderInfoService;
 
 
 
 
     /**
     /**
@@ -228,6 +235,39 @@ public class ShipmentsOrderInfoController extends DefaultBaseController {
         return InvokeResultBuilder.success();
         return InvokeResultBuilder.success();
     }
     }
 
 
+    @ApiModelProperty("数据处理")
+    @GetMapping("/dataHandler")
+    @Scheduled(cron = "0 8 0 * * ?")
+    public InvokeResult<Void> dataHandler() {
+        List<ShipmentsOrderInfo> shipmentsOrderInfoList = shipmentsOrderInfoService.queryByShipmentDate(LocalDate.now());
+        if (CollectionUtils.isNotEmpty(shipmentsOrderInfoList)) {
+            for (ShipmentsOrderInfo  orderInfo : shipmentsOrderInfoList) {
+                ShipmentsOrderInfo shipmentsOrderInfo = shipmentsOrderInfoService.findById(orderInfo.getId());
+                List<ShipmentsPlanDetail> detailList = shipmentsPlanDetailService.listByShipmentOrderId(shipmentsOrderInfo.getId());
+                if (CollectionUtils.isNotEmpty(detailList)) {
+                    continue;
+                }
+                List<String> orderIds = new ArrayList<>();
+                List<String> orderSpecIds = new ArrayList<>();
+                List<String> detailIds = new ArrayList<>();
+                for (ShipmentsPlanDetail shipmentsPlanDetail : detailList) {
+                    if (!orderIds.contains(shipmentsPlanDetail.getOrderId())) {
+                        orderIds.add(shipmentsPlanDetail.getOrderId());
+                    }
+                    if (!orderSpecIds.contains(shipmentsPlanDetail.getOrderSpecId())) {
+                        orderSpecIds.add(shipmentsPlanDetail.getOrderSpecId());
+                    }
+                    if (!detailIds.contains(shipmentsPlanDetail.getId())) {
+                        detailIds.add(shipmentsPlanDetail.getId());
+                    }
+                }
+                List<PurchaseOrderInfo> orderInfoList = purchaseOrderInfoService.listByIds(orderIds);
+                shipmentsOrderInfoService.handleData(shipmentsOrderInfo, orderInfoList, orderSpecIds, detailIds);
+            }
+        }
+        return InvokeResultBuilder.success();
+    }
+
 
 
     /**
     /**
      * 发货单批量打印
      * 发货单批量打印

@@ -136,6 +136,13 @@ public class ShipmentsOrderInfo extends BaseEntity implements BaseDto {
     private LocalDate newShipmentDate;
     private LocalDate newShipmentDate;
 
 
     /**
     /**
+     * 发货类型
+     * ALL：全部发货
+     * PART：部分发货
+     */
+    private String shipmentType;
+
+    /**
      * 发货明细数据
      * 发货明细数据
      */
      */
     @TableField(exist = false)
     @TableField(exist = false)

@@ -388,6 +388,7 @@ public class ShipmentsOrderInfoServiceImpl extends BaseMpServiceImpl<ShipmentsOr
         }
         }
         LambdaUpdateWrapper<ShipmentsOrderInfo> updateWrapper = Wrappers.lambdaUpdate(ShipmentsOrderInfo.class);
         LambdaUpdateWrapper<ShipmentsOrderInfo> updateWrapper = Wrappers.lambdaUpdate(ShipmentsOrderInfo.class);
         updateWrapper.set(ShipmentsOrderInfo::getOnTimeShipment, vo.getOnTimeShipment())
         updateWrapper.set(ShipmentsOrderInfo::getOnTimeShipment, vo.getOnTimeShipment())
+                .set(ShipmentsOrderInfo::getShipmentType, vo.getType())
                 .eq(ShipmentsOrderInfo::getId, shipmentsOrderId);
                 .eq(ShipmentsOrderInfo::getId, shipmentsOrderId);
         getBaseMapper().update(updateWrapper);
         getBaseMapper().update(updateWrapper);
 
 
@@ -433,48 +434,10 @@ public class ShipmentsOrderInfoServiceImpl extends BaseMpServiceImpl<ShipmentsOr
         orderInfo.setDetailList(shipmentsOrderDetailList);
         orderInfo.setDetailList(shipmentsOrderDetailList);
         // 更新发货明细
         // 更新发货明细
         shipmentsPlanDetailService.updateBatchById(dataList);
         shipmentsPlanDetailService.updateBatchById(dataList);
-        // 更新发货单状态
-        updateStatus(shipmentsOrderId, "SHIPMENTS");
-        // 更新订货单物料行发货状态
-        purchaseOrderLineService.dispatched(orderSpecIds);
-        // 更新订货单状态
-        purchaseOrderInfoService.updateStatus(orderIds);
-        // 消息通知
-        String type = vo.getType();
+        // 获取订货单数据
         List<PurchaseOrderInfo> orderInfoList = purchaseOrderInfoService.listByIds(orderIds);
         List<PurchaseOrderInfo> orderInfoList = purchaseOrderInfoService.listByIds(orderIds);
-        if (CollectionUtils.isNotEmpty(orderInfoList)) {
-            // 试样订单生成反馈单数据
-            sampleResultFeedbackService.generateFeedbackData(orderInfoList, detailIds);
-
-            List<String> userIds = new ArrayList<>();
-            StringBuilder orderNoBuilder = new StringBuilder();
-            for (PurchaseOrderInfo info : orderInfoList) {
-                userIds.add(info.getContractCreateById());
-                orderNoBuilder.append(info.getOrderNo()).append("、");
-            }
-            if (orderNoBuilder.length() > 0) {
-                orderNoBuilder.setLength(orderNoBuilder.length() - 1);
-            }
-            String title = "订货单：" + orderNoBuilder + "，";
-            if ("ALL".equals(type)) {
-                title += "已全部发货！";
-            } else if ("PART".equals(type)) {
-                title += "已部分发货！";
-            }
-            messageHandler.sendMsg(userIds, title, title, shipmentsOrderId, null);
-        }
-        // 判断当前日期是否大于等于发货日期
-        LocalDate now = LocalDate.now();
-        LocalDate shipmentsDate = orderInfo.getShipmentsDate();
-        if (BooleanUtils.isTrue(vo.getOnTimeShipment()) && !now.isBefore(shipmentsDate)) {
-            // 生成应收款台账明细数据
-            receiptLedgerInfoService.generateLedgerInfo(Collections.singletonList(orderInfo));
-            // 生成发货明细报表数据
-            shipmentDetailStatisticsService.generateStatisticsData(detailIds);
-            // 生成要车计划、要车单数据
-            ShipmentsOrderInfo shipmentsOrderInfo = findById(shipmentsOrderId);
-            carRequestPlanService.generate(orderInfoList, shipmentsOrderInfo);
-        }
+        // 试样订单生成反馈单数据
+        sampleResultFeedbackService.generateFeedbackData(orderInfoList, detailIds);
         //生成产品试样结果跟踪单
         //生成产品试样结果跟踪单
         if (CollectionUtils.isNotEmpty(orderIds)) {
         if (CollectionUtils.isNotEmpty(orderIds)) {
             Map<Object, List<ShipmentsPlanDetail>> map = shipmentsOrderDetailList.stream()
             Map<Object, List<ShipmentsPlanDetail>> map = shipmentsOrderDetailList.stream()
@@ -533,6 +496,13 @@ public class ShipmentsOrderInfoServiceImpl extends BaseMpServiceImpl<ShipmentsOr
                 sampleResultTrackingService.create(vo1);
                 sampleResultTrackingService.create(vo1);
             }
             }
         }
         }
+        // 判断当前日期是否大于等于发货日期
+        LocalDate now = LocalDate.now();
+        LocalDate shipmentsDate = orderInfo.getShipmentsDate();
+        if (BooleanUtils.isTrue(vo.getOnTimeShipment()) && !now.isBefore(shipmentsDate)) {
+            orderInfo = findById(shipmentsOrderId);
+            handleData(orderInfo, orderInfoList, orderSpecIds, detailIds);
+        }
     }
     }
 
 
     @Override
     @Override
@@ -660,9 +630,9 @@ public class ShipmentsOrderInfoServiceImpl extends BaseMpServiceImpl<ShipmentsOr
             // 今天或之前的数据
             // 今天或之前的数据
             shipmentDate = LocalDate.now();
             shipmentDate = LocalDate.now();
             queryWrapper.and(wrapper -> wrapper
             queryWrapper.and(wrapper -> wrapper
-                    .le(ShipmentsOrderInfo::getShipmentsDate, LocalDate.now())
+                    .lt(ShipmentsOrderInfo::getShipmentsDate, LocalDate.now())
                     .or()
                     .or()
-                    .le(ShipmentsOrderInfo::getNewShipmentDate, LocalDate.now()));
+                    .lt(ShipmentsOrderInfo::getNewShipmentDate, LocalDate.now()));
         }
         }
         List<ShipmentsOrderInfo> shipmentsOrderInfos = getBaseMapper().selectList(queryWrapper);
         List<ShipmentsOrderInfo> shipmentsOrderInfos = getBaseMapper().selectList(queryWrapper);
         if (CollectionUtils.isEmpty(shipmentsOrderInfos)) {
         if (CollectionUtils.isEmpty(shipmentsOrderInfos)) {
@@ -710,6 +680,43 @@ public class ShipmentsOrderInfoServiceImpl extends BaseMpServiceImpl<ShipmentsOr
         return result;
         return result;
     }
     }
 
 
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void handleData(ShipmentsOrderInfo shipmentsOrderInfo, List<PurchaseOrderInfo> orderInfoList
+            , List<String> orderSpecIds, List<String> detailIds) {
+        // 更新发货单状态
+        updateStatus(shipmentsOrderInfo.getId(), "SHIPMENTS");
+        // 更新订货单物料行发货状态
+        purchaseOrderLineService.dispatched(orderSpecIds);
+        // 更新订货单状态
+        List<String> orderIds = orderInfoList.stream().map(PurchaseOrderInfo::getId).collect(Collectors.toList());
+        purchaseOrderInfoService.updateStatus(orderIds);
+        // 生成应收款台账明细数据
+        receiptLedgerInfoService.generateLedgerInfo(Collections.singletonList(shipmentsOrderInfo));
+        // 生成发货明细报表数据
+        shipmentDetailStatisticsService.generateStatisticsData(detailIds);
+        // 生成要车计划、要车单数据
+        carRequestPlanService.generate(orderInfoList, shipmentsOrderInfo);
+        // 消息通知
+        String type = shipmentsOrderInfo.getShipmentType();
+        List<String> userIds = new ArrayList<>();
+        StringBuilder orderNoBuilder = new StringBuilder();
+        for (PurchaseOrderInfo info : orderInfoList) {
+            userIds.add(info.getContractCreateById());
+            orderNoBuilder.append(info.getOrderNo()).append("、");
+        }
+        if (orderNoBuilder.length() > 0) {
+            orderNoBuilder.setLength(orderNoBuilder.length() - 1);
+        }
+        String title = "订货单：" + orderNoBuilder + "，";
+        if ("ALL".equals(type)) {
+            title += "已全部发货！";
+        } else if ("PART".equals(type)) {
+            title += "已部分发货！";
+        }
+        messageHandler.sendMsg(userIds, title, title, shipmentsOrderInfo.getId(), null);
+    }
+
 
 
     /**
     /**
      * 处理批次数据
      * 处理批次数据

 package com.lframework.xingyun.sc.service.shipments;
 package com.lframework.xingyun.sc.service.shipments;
 
 
+import com.lframework.xingyun.sc.entity.PurchaseOrderInfo;
 import com.lframework.xingyun.sc.vo.shipments.order.*;
 import com.lframework.xingyun.sc.vo.shipments.order.*;
 import com.lframework.xingyun.sc.entity.ShipmentsOrderInfo;
 import com.lframework.xingyun.sc.entity.ShipmentsOrderInfo;
 import com.lframework.starter.web.core.service.BaseMpService;
 import com.lframework.starter.web.core.service.BaseMpService;
@@ -139,4 +140,18 @@ public interface ShipmentsOrderInfoService extends BaseMpService<ShipmentsOrderI
      * @return              String
      * @return              String
      */
      */
     String generateSerialNumber(String pre, String key, String format, LocalDateTime startTime, LocalDateTime endTime);
     String generateSerialNumber(String pre, String key, String format, LocalDateTime startTime, LocalDateTime endTime);
+
+    /**
+     * 数据处理
+     * 状态流转
+     * 台账数据
+     * 报表数据
+     * 要车相关数据
+     *
+     * @param shipmentsOrderInfo    发货单信息
+     * @param orderInfoList         订货单数据集
+     * @param orderSpecIds          订货单规格ID集合
+     * @param detailIds             订货单明细
+     */
+    void handleData(ShipmentsOrderInfo shipmentsOrderInfo, List<PurchaseOrderInfo> orderInfoList, List<String> orderSpecIds, List<String> detailIds);
 }
 }

@@ -221,7 +221,11 @@
             supplier,
             supplier,
             customer_short_name,
             customer_short_name,
             customer_type,
             customer_type,
-            delivery_method
+            delivery_method,
+            create_by_id,
+            update_by_id,
+            create_time,
+            update_time
         ) VALUES
         ) VALUES
         <foreach collection="list" item="item" separator=",">
         <foreach collection="list" item="item" separator=",">
             (
             (
@@ -264,7 +268,11 @@
                 #{item.supplier},
                 #{item.supplier},
                 #{item.customerShortName},
                 #{item.customerShortName},
                 #{item.customerType},
                 #{item.customerType},
-                #{item.deliveryMethod}
+                #{item.deliveryMethod},
+                #{item.createById},
+                #{item.updateById},
+                #{item.createTime},
+                #{item.updateTime}
             )
             )
         </foreach>
         </foreach>
     </insert>
     </insert>