楚江erp:发货单填写发货日期逻辑调整

@@ -132,13 +132,13 @@ public class ShipmentsOrderInfoController extends DefaultBaseController {
     }
 
     /**
-     * 修改
+     * 填写实际发货日期
      */
-    @ApiOperation("修改")
+    @ApiOperation("填写实际发货日期")
     @HasPermission({"shipping-plan-manage:invoice:modify"})
     @PutMapping
     public InvokeResult<Void> update(@Valid UpdateShipmentsOrderInfoVo vo) {
-        shipmentsOrderInfoService.update(vo);
+        shipmentsOrderInfoService.updateShipmentDate(vo);
         return InvokeResultBuilder.success();
     }
 

@@ -1259,7 +1259,12 @@ public class ReceiptLedgerInfoServiceImpl extends BaseMpServiceImpl<ReceiptLedge
             data.setRegion(region);
         }
         data.setCustomerId(shipmentsOrderInfo.getCustomerId());
-        data.setShipmentDate(shipmentsOrderInfo.getShipmentsDate());
+        // 发货日期处理
+        LocalDate shipmentsDate = shipmentsOrderInfo.getShipmentsDate();
+        if (BooleanUtils.isFalse(shipmentsOrderInfo.getOnTimeShipment())) {
+            shipmentsDate = shipmentsOrderInfo.getNewShipmentDate();
+        }
+        data.setShipmentDate(shipmentsDate);
 
         String contractType = null;
         List<String> supplyUnitList = new ArrayList<>();

@@ -287,8 +287,8 @@ public class ShipmentsOrderInfoServiceImpl extends BaseMpServiceImpl<ShipmentsOr
     @OpLog(type = OtherOpLogType.class, name = "修改发货单，ID：{}", params = {"#id"})
     @Transactional(rollbackFor = Exception.class)
     @Override
-    public void update(UpdateShipmentsOrderInfoVo vo) {
-        ShipmentsOrderInfo data = getBaseMapper().selectById(vo.getId());
+    public void updateShipmentDate(UpdateShipmentsOrderInfoVo vo) {
+        ShipmentsOrderInfo data = findById(vo.getId());
         if (ObjectUtil.isNull(data)) {
             throw new DefaultClientException("发货单不存在！");
         }
@@ -297,9 +297,34 @@ public class ShipmentsOrderInfoServiceImpl extends BaseMpServiceImpl<ShipmentsOr
                 .eq(ShipmentsOrderInfo::getId, vo.getId());
 
         getBaseMapper().update(updateWrapper);
-
-        OpLogUtil.setVariable("id", data.getId());
-        OpLogUtil.setExtra(vo);
+        // 判断当前日期是否大于等于发货日期
+        LocalDate now = LocalDate.now();
+        LocalDate newShipmentDate = vo.getNewShipmentDate();
+        if (!now.isBefore(newShipmentDate)) {
+            List<ShipmentsPlanDetail> detailList = data.getDetailList();
+            if (CollectionUtils.isEmpty(detailList)) {
+                throw new DefaultClientException("发货明细不存在！");
+            }
+            List<String> orderIds = new ArrayList<>();
+            List<String> orderSpecIds = new ArrayList<>();
+            List<String> detailIds = new ArrayList<>();
+            for (ShipmentsPlanDetail detail : detailList) {
+                String orderId = detail.getOrderId();
+                String orderSpecId = detail.getOrderSpecId();
+                String detailId = detail.getId();
+                if (!orderIds.contains(orderId)) {
+                    orderIds.add(orderId);
+                }
+                if (!orderSpecIds.contains(orderSpecId)) {
+                    orderSpecIds.add(orderSpecId);
+                }
+                if (!detailIds.contains(detailId)) {
+                    detailIds.add(detailId);
+                }
+            }
+            List<PurchaseOrderInfo> orderInfoList = purchaseOrderInfoService.listByIds(orderIds);
+            this.handleData(data, orderInfoList, orderSpecIds, detailIds);
+        }
     }
 
     @OpLog(type = OtherOpLogType.class, name = "删除发货单，ID：{}", params = {"#id"})

@@ -310,7 +310,9 @@ public class ShipmentDetailStatisticsServiceImpl extends BaseMpServiceImpl<Shipm
                 iterator.remove();
             }
         }
-        getBaseMapper().batchAdd(needStatisticsDataList);
+        if (CollectionUtils.isNotEmpty(needStatisticsDataList)) {
+            getBaseMapper().batchAdd(needStatisticsDataList);
+        }
     }
 
     @Override

@@ -52,7 +52,7 @@ public interface ShipmentsOrderInfoService extends BaseMpService<ShipmentsOrderI
      *
      * @param vo    数据实体
      */
-    void update(UpdateShipmentsOrderInfoVo vo);
+    void updateShipmentDate(UpdateShipmentsOrderInfoVo vo);
 
     /**
      * 根据ID删除

@@ -149,9 +149,12 @@
             o.settlement_terms,
             o.supply_unit as supplier,
             o.workshop_id,
-            o.delivery_method,
             so.code as shipment_order_no,
-            so.shipments_date as shipment_date,
+            case
+                when so.on_time_shipment = true then so.shipments_date
+                when so.on_time_shipment = false then so.new_shipment_date
+                else so.shipments_date
+            end as shipment_date,
             sc.id as contract_id,
             sc.type as contract_type,
             sc.packaging_requirements,
@@ -164,7 +167,7 @@
         left join tbl_contract_distributor_standard sc on o.contract_id = sc.id
         left join tbl_contract_std_processing_line cl on sc.id = cl.contract_id
         <where>
-            and sd.del_flag = false
+            and sd.del_flag = false and so.status != 'DRAFT'
             <if test="vo.ids != null and vo.ids.size() > 0">
                 and sd.id in
                 <foreach collection="vo.ids" open="(" separator="," close=")" item="item">