楚江ERP-发货状态处理

@@ -282,18 +282,33 @@ public class PurchaseOrderLineServiceImpl extends BaseMpServiceImpl<PurchaseOrde
     }
     }
 
 
     @Override
     @Override
-    public List<PurchaseOrderLine> listByShipmentDate(List<LocalDate> shipmentDateList) {
+    public List<PurchaseOrderLine> listByShipmentDate(List<LocalDate> shipmentDateList, boolean includeShipment) {
         if (CollectionUtils.isEmpty(shipmentDateList)) {
         if (CollectionUtils.isEmpty(shipmentDateList)) {
             return Collections.emptyList();
             return Collections.emptyList();
         }
         }
         // 根据日期批量查询
         // 根据日期批量查询
         LambdaQueryWrapper<PurchaseOrderLine> queryWrapper = Wrappers.lambdaQuery(PurchaseOrderLine.class);
         LambdaQueryWrapper<PurchaseOrderLine> queryWrapper = Wrappers.lambdaQuery(PurchaseOrderLine.class);
+        if (!includeShipment) {
+            queryWrapper.eq(PurchaseOrderLine::getShipment, Boolean.FALSE);
+        }
         queryWrapper.in(PurchaseOrderLine::getDeliveryDate, shipmentDateList);
         queryWrapper.in(PurchaseOrderLine::getDeliveryDate, shipmentDateList);
 
 
         return getBaseMapper().selectList(queryWrapper);
         return getBaseMapper().selectList(queryWrapper);
     }
     }
 
 
     @Override
     @Override
+    public void updateShipments(List<String> ids) {
+        if (CollectionUtils.isEmpty(ids)) {
+            return;
+        }
+        LambdaUpdateWrapper<PurchaseOrderLine> updateWrapper = Wrappers.lambdaUpdate(PurchaseOrderLine.class);
+        updateWrapper.set(PurchaseOrderLine::getShipment, Boolean.TRUE);
+        updateWrapper.in(PurchaseOrderLine::getId, ids);
+
+        getBaseMapper().update(updateWrapper);
+    }
+
+    @Override
     public void cleanCacheByKey(Serializable key) {
     public void cleanCacheByKey(Serializable key) {
 
 
     }
     }

@@ -228,7 +228,7 @@ public class ShipmentsPlanDetailServiceImpl extends BaseMpServiceImpl<ShipmentsP
         List<LocalDate> dateList = new ArrayList<>();
         List<LocalDate> dateList = new ArrayList<>();
         dateList.add(tomorrow);
         dateList.add(tomorrow);
         dateList.add(afTomorrow);
         dateList.add(afTomorrow);
-        List<PurchaseOrderLine> orderLineList = purchaseOrderLineService.listByShipmentDate(dateList);
+        List<PurchaseOrderLine> orderLineList = purchaseOrderLineService.listByShipmentDate(dateList, false);
         // 获取订货单数据
         // 获取订货单数据
         Map<String, PurchaseOrderInfo> orderInfoMap = new HashMap<>();
         Map<String, PurchaseOrderInfo> orderInfoMap = new HashMap<>();
         if (CollectionUtils.isNotEmpty(orderLineList)) {
         if (CollectionUtils.isNotEmpty(orderLineList)) {

@@ -15,6 +15,7 @@ import com.lframework.starter.web.core.annotations.oplog.OpLog;
 import com.lframework.starter.web.core.utils.PageHelperUtil;
 import com.lframework.starter.web.core.utils.PageHelperUtil;
 import com.lframework.starter.common.utils.Assert;
 import com.lframework.starter.common.utils.Assert;
 import com.lframework.starter.web.inner.components.oplog.OtherOpLogType;
 import com.lframework.starter.web.inner.components.oplog.OtherOpLogType;
+import com.lframework.xingyun.sc.service.order.PurchaseOrderLineService;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.annotation.Transactional;
 import com.lframework.xingyun.sc.mappers.ShipmentsPlanMapper;
 import com.lframework.xingyun.sc.mappers.ShipmentsPlanMapper;
 import com.lframework.xingyun.sc.service.shipments.ShipmentsPlanService;
 import com.lframework.xingyun.sc.service.shipments.ShipmentsPlanService;
@@ -23,6 +24,7 @@ import com.lframework.xingyun.sc.vo.shipments.plan.QueryShipmentsPlanVo;
 import com.lframework.xingyun.sc.vo.shipments.plan.UpdateShipmentsPlanVo;
 import com.lframework.xingyun.sc.vo.shipments.plan.UpdateShipmentsPlanVo;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 
 
+import javax.annotation.Resource;
 import java.util.List;
 import java.util.List;
 
 
 @Service
 @Service
@@ -30,6 +32,8 @@ public class ShipmentsPlanServiceImpl extends BaseMpServiceImpl<ShipmentsPlanMap
 
 
 
 
 
 
+    @Resource
+    private PurchaseOrderLineService orderLineService;
 
 
     @Override
     @Override
     public PageResult<ShipmentsPlan> query(Integer pageIndex, Integer pageSize, QueryShipmentsPlanVo vo) {
     public PageResult<ShipmentsPlan> query(Integer pageIndex, Integer pageSize, QueryShipmentsPlanVo vo) {
@@ -84,6 +88,9 @@ public class ShipmentsPlanServiceImpl extends BaseMpServiceImpl<ShipmentsPlanMap
                 .eq(ShipmentsPlan::getId, vo.getId());
                 .eq(ShipmentsPlan::getId, vo.getId());
 
 
         getBaseMapper().update(updateWrapper);
         getBaseMapper().update(updateWrapper);
+        if ("CHECK".equals(vo.getStatus())) {
+            // 更新订货单规格发货状态
+        }
 
 
         OpLogUtil.setVariable("id", data.getId());
         OpLogUtil.setVariable("id", data.getId());
         OpLogUtil.setExtra(vo);
         OpLogUtil.setExtra(vo);

@@ -112,7 +112,15 @@ public interface PurchaseOrderLineService extends BaseMpService<PurchaseOrderLin
      * 根据发货日期批量查询
      * 根据发货日期批量查询
      *
      *
      * @param shipmentDateList  发货日期
      * @param shipmentDateList  发货日期
+     * @param includeShipment   是否包含已发货数据
      * @return                  List<PurchaseOrderLine>
      * @return                  List<PurchaseOrderLine>
      */
      */
-    List<PurchaseOrderLine> listByShipmentDate(List<LocalDate> shipmentDateList);
+    List<PurchaseOrderLine> listByShipmentDate(List<LocalDate> shipmentDateList, boolean includeShipment);
+
+    /**
+     * 更新发货状态
+     *
+     * @param ids    主键ID
+     */
+    void updateShipments(List<String> ids);
 }
 }