楚江ERP-发货计划基础接口开发

@@ -180,7 +180,8 @@ public class OrderChangeRecordServiceImpl extends BaseMpServiceImpl<OrderChangeR
             purchaseOrderLineService.create(orderLineVo);
             purchaseOrderLineService.create(orderLineVo);
         }
         }
         // 缓存订货单物料行数据
         // 缓存订货单物料行数据
-        redisHandler.set(vo.getOrderId() + "_order_line_info", JsonUtil.toJsonString(orderLineVoList));
+        List<PurchaseOrderLine> orderLineList = purchaseOrderLineService.listByOrderIds(Collections.singletonList(data.getOrderId()));
+        redisHandler.set(vo.getOrderId() + "_order_line_info", JsonUtil.toJsonString(orderLineList));
         // 更新订货单变更状态
         // 更新订货单变更状态
         purchaseOrderInfoService.updateSpecChangeStatus(vo.getOrderId(), OrderSpecChangeStatus.IN_PROGRESS.getCode());
         purchaseOrderInfoService.updateSpecChangeStatus(vo.getOrderId(), OrderSpecChangeStatus.IN_PROGRESS.getCode());
         // 发起流程
         // 发起流程
@@ -230,8 +231,6 @@ public class OrderChangeRecordServiceImpl extends BaseMpServiceImpl<OrderChangeR
         for (UpdatePurchaseOrderLineVo updatePurchaseOrderLineVo : lineVoList) {
         for (UpdatePurchaseOrderLineVo updatePurchaseOrderLineVo : lineVoList) {
             purchaseOrderLineService.update(updatePurchaseOrderLineVo);
             purchaseOrderLineService.update(updatePurchaseOrderLineVo);
         }
         }
-        // 更新订货单物料行缓存数据
-        redisHandler.set(vo.getOrderId() + "_order_line_info", JsonUtil.toJsonString(lineVoList));
         // 重新发起流程
         // 重新发起流程
         Boolean output = data.getOutput();
         Boolean output = data.getOutput();
         if (BooleanUtils.isTrue(output)) {
         if (BooleanUtils.isTrue(output)) {

@@ -3,7 +3,7 @@ package com.lframework.xingyun.sc.impl.shipments;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.github.pagehelper.PageInfo;
 import com.github.pagehelper.PageInfo;
-import com.lframework.xingyun.sc.entity.PurchaseOrderInfo;
+import com.lframework.starter.web.core.components.security.SecurityUtil;
 import com.lframework.xingyun.sc.entity.ShipmentsPlanDetail;
 import com.lframework.xingyun.sc.entity.ShipmentsPlanDetail;
 import com.lframework.starter.web.core.impl.BaseMpServiceImpl;
 import com.lframework.starter.web.core.impl.BaseMpServiceImpl;
 import com.lframework.starter.web.core.utils.PageResultUtil;
 import com.lframework.starter.web.core.utils.PageResultUtil;
@@ -23,7 +23,6 @@ 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.QueryShipmentsPlanDetailVo;
 import com.lframework.xingyun.sc.vo.shipments.plan.UpdateShipmentsPlanDetailVo;
 import com.lframework.xingyun.sc.vo.shipments.plan.UpdateShipmentsPlanDetailVo;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.collections4.CollectionUtils;
-import org.springframework.data.redis.core.RedisHash;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.annotation.Transactional;
 
 
@@ -70,6 +69,8 @@ public class ShipmentsPlanDetailServiceImpl extends BaseMpServiceImpl<ShipmentsP
         if (CollectionUtils.isEmpty(orderIds)) {
         if (CollectionUtils.isEmpty(orderIds)) {
             throw new DefaultClientException("订货单ID不能为空！");
             throw new DefaultClientException("订货单ID不能为空！");
         }
         }
+        // 当前人员id
+        String userId = SecurityUtil.getCurrentUser().getId();
         List<ShipmentsPlanDetail> detailList = new ArrayList<>();
         List<ShipmentsPlanDetail> detailList = new ArrayList<>();
         for (String orderId : orderIds) {
         for (String orderId : orderIds) {
             ShipmentsPlanDetail data = new ShipmentsPlanDetail();
             ShipmentsPlanDetail data = new ShipmentsPlanDetail();
@@ -77,10 +78,12 @@ public class ShipmentsPlanDetailServiceImpl extends BaseMpServiceImpl<ShipmentsP
             data.setPlanId(vo.getPlanId());
             data.setPlanId(vo.getPlanId());
             data.setOrderId(orderId);
             data.setOrderId(orderId);
             data.setShipmentsDate(vo.getShipmentDate());
             data.setShipmentsDate(vo.getShipmentDate());
+            data.setCreateById(userId);
+            data.setUpdateById(userId);
 
 
             detailList.add(data);
             detailList.add(data);
         }
         }
-
+        getBaseMapper().batchAdd(detailList);
     }
     }
 
 
     @OpLog(type = OtherOpLogType.class, name = "修改发货计划明细，ID：{}", params = {"#id"})
     @OpLog(type = OtherOpLogType.class, name = "修改发货计划明细，ID：{}", params = {"#id"})

@@ -22,4 +22,11 @@ public interface ShipmentsPlanDetailMapper extends BaseMapper<ShipmentsPlanDetai
      * @return      List<ShipmentsPlanDetail>
      * @return      List<ShipmentsPlanDetail>
      */
      */
     List<ShipmentsPlanDetail> query(@Param("vo") QueryShipmentsPlanDetailVo vo);
     List<ShipmentsPlanDetail> query(@Param("vo") QueryShipmentsPlanDetailVo vo);
+
+    /**
+     * 批量新增
+     *
+     * @param dataList  数据实体
+     */
+    void batchAdd(List<ShipmentsPlanDetail> dataList);
 }
 }

@@ -25,12 +25,5 @@ public class QueryShipmentsPlanDetailVo extends PageVo implements BaseVo, Serial
      */
      */
     @ApiModelProperty("发货日期")
     @ApiModelProperty("发货日期")
     @TypeMismatch(message = "发货日期格式有误！")
     @TypeMismatch(message = "发货日期格式有误！")
-    private LocalDate shipmentsDate;
-
-    /**
-     * 发货日期
-     */
-    @ApiModelProperty("发货日期")
-    @TypeMismatch(message = "发货日期格式有误！")
     private List<LocalDate> shipmentsDateList;
     private List<LocalDate> shipmentsDateList;
 }
 }

@@ -74,4 +74,39 @@
             </if>
             </if>
         </where>
         </where>
     </select>
     </select>
+
+    <insert id="batchAdd">
+        INSERT INTO shipments_plan_detail (
+        id,
+        plan_id,
+        order_id,
+        parent_id,
+        status,
+        shipments_date,
+        shipments_time,
+        can_shipments,
+        del_flag,
+        create_by_id,
+        update_by_id,
+        create_time,
+        update_time
+        ) VALUES
+        <foreach collection="list" item="item" separator=",">
+            (
+            #{item.id},
+            #{item.planId},
+            #{item.orderId},
+            #{item.parentId},
+            #{item.status},
+            #{item.shipmentsDate},
+            #{item.shipmentsTime},
+            #{item.canShipments},
+            #{item.delFlag},
+            #{item.createById},
+            #{item.updateById},
+            #{item.createTime},
+            #{item.updateTime}
+            )
+        </foreach>
+    </insert>
 </mapper>
 </mapper>