楚江ERP-订货单规格变更记录相关接口开发（基本的增删改查）

@@ -77,6 +77,11 @@ public class OrderSpecificationChangeRecord extends BaseEntity implements BaseDt
     private String status;
     private String status;
 
 
     /**
     /**
+     * 变更原因及变更后的质量要求
+     */
+    private String description;
+
+    /**
      * 创建人ID
      * 创建人ID
      */
      */
     @TableField(fill = FieldFill.INSERT)
     @TableField(fill = FieldFill.INSERT)

@@ -3,22 +3,20 @@ package com.lframework.xingyun.sc.impl.order;
 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.starter.web.core.components.security.SecurityUtil;
+import com.lframework.starter.web.core.utils.*;
+import com.lframework.starter.web.inner.entity.SysUser;
+import com.lframework.starter.web.inner.service.system.SysUserService;
 import com.lframework.xingyun.sc.entity.OrderSpecificationChangeRecord;
 import com.lframework.xingyun.sc.entity.OrderSpecificationChangeRecord;
 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.components.resp.PageResult;
 import com.lframework.starter.web.core.components.resp.PageResult;
-import com.lframework.starter.web.core.utils.OpLogUtil;
 import com.lframework.starter.common.exceptions.impl.DefaultClientException;
 import com.lframework.starter.common.exceptions.impl.DefaultClientException;
-import com.lframework.starter.web.core.utils.IdUtil;
 import com.lframework.starter.common.utils.ObjectUtil;
 import com.lframework.starter.common.utils.ObjectUtil;
 import com.lframework.starter.web.core.annotations.oplog.OpLog;
 import com.lframework.starter.web.core.annotations.oplog.OpLog;
-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.entity.PurchaseOrderLine;
 import com.lframework.xingyun.sc.entity.PurchaseOrderLine;
 import com.lframework.xingyun.sc.service.order.PurchaseOrderLineService;
 import com.lframework.xingyun.sc.service.order.PurchaseOrderLineService;
-import com.lframework.xingyun.sc.vo.order.CreatePurchaseOrderLineVo;
-import com.lframework.xingyun.sc.vo.order.UpdatePurchaseOrderLineVo;
 import com.lframework.xingyun.sc.vo.order.change.*;
 import com.lframework.xingyun.sc.vo.order.change.*;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.annotation.Transactional;
@@ -27,6 +25,7 @@ import com.lframework.xingyun.sc.service.order.OrderSpecificationChangeRecordSer
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 
 
 import javax.annotation.Resource;
 import javax.annotation.Resource;
+import java.math.BigDecimal;
 import java.util.*;
 import java.util.*;
 
 
 @Service
 @Service
@@ -35,6 +34,8 @@ public class OrderSpecificationChangeRecordServiceImpl extends BaseMpServiceImpl
 
 
     @Resource
     @Resource
     private PurchaseOrderLineService purchaseOrderLineService;
     private PurchaseOrderLineService purchaseOrderLineService;
+    @Resource
+    private SysUserService sysUserService;
 
 
 
 
     @Override
     @Override
@@ -69,7 +70,7 @@ public class OrderSpecificationChangeRecordServiceImpl extends BaseMpServiceImpl
         }
         }
         // 变更前
         // 变更前
         Map<String, List<PurchaseOrderLine>> beforeChangeMap = new HashMap<>(orderIds.size());
         Map<String, List<PurchaseOrderLine>> beforeChangeMap = new HashMap<>(orderIds.size());
-        List<PurchaseOrderLine> beforeChangeList = purchaseOrderLineService.listByIds(orderIds);
+        List<PurchaseOrderLine> beforeChangeList = purchaseOrderLineService.listByOrderIds(orderIds);
         for (PurchaseOrderLine purchaseOrderLine : beforeChangeList) {
         for (PurchaseOrderLine purchaseOrderLine : beforeChangeList) {
             String purchaseOrderId = purchaseOrderLine.getPurchaseOrderId();
             String purchaseOrderId = purchaseOrderLine.getPurchaseOrderId();
             List<PurchaseOrderLine> list = beforeChangeMap.computeIfAbsent(purchaseOrderId, k -> new ArrayList<>());
             List<PurchaseOrderLine> list = beforeChangeMap.computeIfAbsent(purchaseOrderId, k -> new ArrayList<>());
@@ -95,9 +96,20 @@ public class OrderSpecificationChangeRecordServiceImpl extends BaseMpServiceImpl
 
 
     @Override
     @Override
     public OrderSpecificationChangeRecord findById(String id) {
     public OrderSpecificationChangeRecord findById(String id) {
+        OrderSpecificationChangeRecord changeRecord = getBaseMapper().selectById(id);
+        if (changeRecord == null) {
+            throw new DefaultClientException("订货单规格变更记录不存在!");
+        };
+        String orderId = changeRecord.getOrderId();
+        // 获取规格数据
+        // 变更前
+        List<PurchaseOrderLine> beforeChangeList = purchaseOrderLineService.listByOrderIds(Collections.singletonList(orderId));
+        changeRecord.setBeforeChangeSpecList(beforeChangeList);
+        // 变更后
+        List<PurchaseOrderLine> afterChangeList = purchaseOrderLineService.listByChangeIds(Collections.singletonList(id));
+        changeRecord.setAfterChangeSpecList(afterChangeList);
 
 
-
-        return getBaseMapper().selectById(id);
+        return changeRecord;
     }
     }
 
 
     @OpLog(type = OtherOpLogType.class, name = "新增订货单规格变更记录，ID：{}", params = {"#id"})
     @OpLog(type = OtherOpLogType.class, name = "新增订货单规格变更记录，ID：{}", params = {"#id"})
@@ -110,10 +122,37 @@ public class OrderSpecificationChangeRecordServiceImpl extends BaseMpServiceImpl
         data.setOrderId(vo.getOrderId());
         data.setOrderId(vo.getOrderId());
         data.setOrderQuantity(vo.getOrderQuantity());
         data.setOrderQuantity(vo.getOrderQuantity());
         data.setDeliveryDate(vo.getDeliveryDate());
         data.setDeliveryDate(vo.getDeliveryDate());
+        // 审核中
+        data.setStatus("AUDIT");
 
 
-        getBaseMapper().insert(data);
+        // 获取当前人员信息
+        String userId = SecurityUtil.getCurrentUser().getId();
+        SysUser user = sysUserService.findById(userId);
         // 处理规格数据
         // 处理规格数据
+        BigDecimal totalQuantity = new BigDecimal(0);
+        List<PurchaseOrderLine> orderLineList = new ArrayList<>();
         List<CreateOrderSpecificationInfoVo> orderSpecList = vo.getOrderSpecList();
         List<CreateOrderSpecificationInfoVo> orderSpecList = vo.getOrderSpecList();
+        for (int i = 0; i < orderSpecList.size(); i++) {
+            CreateOrderSpecificationInfoVo createSpecVo = orderSpecList.get(i);
+            PurchaseOrderLine orderLine = JsonUtil.parseObject(JsonUtil.toJsonString(createSpecVo), PurchaseOrderLine.class);
+            orderLine.setId(IdUtil.getId());
+            orderLine.setChangeId(id);
+            orderLine.setCreateById(userId);
+            orderLine.setCreateBy(user.getName());
+            orderLine.setUpdateById(userId);
+            orderLine.setUpdateBy(user.getName());
+            if (orderLine.getShowOrder() == null) {
+                orderLine.setShowOrder(i + 1);
+            }
+            totalQuantity = totalQuantity.add(orderLine.getQuantity());
+
+            orderLineList.add(orderLine);
+        }
+        if (data.getOrderQuantity() == null) {
+            data.setOrderQuantity(totalQuantity.doubleValue());
+        }
+        getBaseMapper().insert(data);
+        purchaseOrderLineService.batchAdd(orderLineList);
 
 
         OpLogUtil.setVariable("id", data.getId());
         OpLogUtil.setVariable("id", data.getId());
         OpLogUtil.setExtra(vo);
         OpLogUtil.setExtra(vo);
@@ -133,10 +172,30 @@ public class OrderSpecificationChangeRecordServiceImpl extends BaseMpServiceImpl
                 .set(OrderSpecificationChangeRecord::getOrderId, vo.getOrderId())
                 .set(OrderSpecificationChangeRecord::getOrderId, vo.getOrderId())
                 .set(OrderSpecificationChangeRecord::getOrderQuantity, vo.getOrderQuantity())
                 .set(OrderSpecificationChangeRecord::getOrderQuantity, vo.getOrderQuantity())
                 .set(OrderSpecificationChangeRecord::getDeliveryDate, vo.getDeliveryDate())
                 .set(OrderSpecificationChangeRecord::getDeliveryDate, vo.getDeliveryDate())
+                .set(OrderSpecificationChangeRecord::getStatus, "AUDIT")
                 .eq(OrderSpecificationChangeRecord::getId, vo.getId());
                 .eq(OrderSpecificationChangeRecord::getId, vo.getId());
-        getBaseMapper().update(updateWrapper);
+        // 获取当前人员信息
+        String userId = SecurityUtil.getCurrentUser().getId();
+        SysUser user = sysUserService.findById(userId);
         // 更新规格数据
         // 更新规格数据
+        BigDecimal totalQuantity = new BigDecimal(0);
+        List<PurchaseOrderLine> orderLineList = new ArrayList<>();
         List<UpdateOrderSpecificationInfoVo> orderSpecList = vo.getOrderSpecList();
         List<UpdateOrderSpecificationInfoVo> orderSpecList = vo.getOrderSpecList();
+        for (UpdateOrderSpecificationInfoVo updateSpecVo : orderSpecList) {
+            PurchaseOrderLine orderLine = JsonUtil.parseObject(JsonUtil.toJsonString(updateSpecVo), PurchaseOrderLine.class);
+            orderLine.setUpdateById(userId);
+            orderLine.setUpdateBy(user.getName());
+            totalQuantity = totalQuantity.add(orderLine.getQuantity());
+
+            orderLineList.add(orderLine);
+        }
+        if (vo.getOrderQuantity() == null) {
+            updateWrapper.set(OrderSpecificationChangeRecord::getOrderQuantity, totalQuantity.doubleValue());
+        } else {
+            updateWrapper.set(OrderSpecificationChangeRecord::getOrderQuantity, vo.getOrderQuantity());
+        }
+        getBaseMapper().update(updateWrapper);
+        purchaseOrderLineService.batchUpdate(orderLineList);
 
 
         OpLogUtil.setVariable("id", data.getId());
         OpLogUtil.setVariable("id", data.getId());
         OpLogUtil.setExtra(vo);
         OpLogUtil.setExtra(vo);

@@ -24,7 +24,7 @@ import com.lframework.xingyun.sc.service.order.PurchaseOrderLineService;
 import com.lframework.xingyun.sc.vo.order.CreatePurchaseOrderLineVo;
 import com.lframework.xingyun.sc.vo.order.CreatePurchaseOrderLineVo;
 import com.lframework.xingyun.sc.vo.order.QueryPurchaseOrderLineVo;
 import com.lframework.xingyun.sc.vo.order.QueryPurchaseOrderLineVo;
 import com.lframework.xingyun.sc.vo.order.UpdatePurchaseOrderLineVo;
 import com.lframework.xingyun.sc.vo.order.UpdatePurchaseOrderLineVo;
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 
 
@@ -188,17 +188,43 @@ public class PurchaseOrderLineServiceImpl extends BaseMpServiceImpl<PurchaseOrde
     }
     }
 
 
     @Override
     @Override
-    public List<PurchaseOrderLine> listByOrderId(String orderId) {
-        if (StringUtils.isBlank(orderId)) {
+    public List<PurchaseOrderLine> listByOrderIds(List<String> orderIds) {
+        if (CollectionUtils.isEmpty(orderIds)) {
             return Collections.emptyList();
             return Collections.emptyList();
         }
         }
         LambdaQueryWrapper<PurchaseOrderLine> queryWrapper = Wrappers.lambdaQuery(PurchaseOrderLine.class);
         LambdaQueryWrapper<PurchaseOrderLine> queryWrapper = Wrappers.lambdaQuery(PurchaseOrderLine.class);
-        queryWrapper.eq(PurchaseOrderLine::getChangeId, orderId)
+        queryWrapper.in(PurchaseOrderLine::getPurchaseOrderId, orderIds)
                 .orderByAsc(PurchaseOrderLine::getShowOrder);
                 .orderByAsc(PurchaseOrderLine::getShowOrder);
 
 
         return getBaseMapper().selectList(queryWrapper);
         return getBaseMapper().selectList(queryWrapper);
     }
     }
 
 
+    /**
+     * 批量新增
+     *
+     * @param specList  数据集合
+     */
+    @Override
+    public void batchAdd(List<PurchaseOrderLine> specList) {
+        if (CollectionUtils.isEmpty(specList)) {
+            return;
+        }
+        getBaseMapper().batchAdd(specList);
+    }
+
+    /**
+     * 批量更新
+     *
+     * @param specList  数据集合
+     */
+    @Override
+    public void batchUpdate(List<PurchaseOrderLine> specList) {
+        if (CollectionUtils.isEmpty(specList)) {
+            return;
+        }
+        getBaseMapper().batchUpdate(specList);
+    }
+
     @Override
     @Override
     public void cleanCacheByKey(Serializable key) {
     public void cleanCacheByKey(Serializable key) {
 
 

@@ -21,4 +21,18 @@ public interface PurchaseOrderLineMapper extends BaseMapper<PurchaseOrderLine> {
      * @return
      * @return
      */
      */
     List<PurchaseOrderLine> query(@Param("vo") QueryPurchaseOrderLineVo vo);
     List<PurchaseOrderLine> query(@Param("vo") QueryPurchaseOrderLineVo vo);
+
+    /**
+     * 批量新增
+     *
+     * @param specList  数据集合
+     */
+    int batchAdd(@Param("specList") List<PurchaseOrderLine> specList);
+
+    /**
+     * 批量新增
+     *
+     * @param specList  数据集合
+     */
+    int batchUpdate(@Param("specList") List<PurchaseOrderLine> specList);
 }
 }

@@ -65,8 +65,22 @@ public interface PurchaseOrderLineService extends BaseMpService<PurchaseOrderLin
     /**
     /**
      * 根据订货单ID查询
      * 根据订货单ID查询
      *
      *
-     * @param orderId   订货单ID
+     * @param orderIds  订货单ID集合
      * @return          List<PurchaseOrderLine>
      * @return          List<PurchaseOrderLine>
      */
      */
-    List<PurchaseOrderLine> listByOrderId(String orderId);
+    List<PurchaseOrderLine> listByOrderIds(List<String> orderIds);
+
+    /**
+     * 批量新增
+     *
+     * @param specList  数据集合
+     */
+    void batchAdd(List<PurchaseOrderLine> specList);
+
+    /**
+     * 批量更新
+     *
+     * @param specList  数据集合
+     */
+    void batchUpdate(List<PurchaseOrderLine> specList);
 }
 }

@@ -9,7 +9,6 @@ import com.lframework.starter.web.core.vo.BaseVo;
 import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.NotNull;
 
 
-import com.lframework.xingyun.sc.vo.order.CreatePurchaseOrderLineVo;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiModelProperty;
 import com.lframework.starter.web.core.components.validation.TypeMismatch;
 import com.lframework.starter.web.core.components.validation.TypeMismatch;
 import org.hibernate.validator.constraints.Length;
 import org.hibernate.validator.constraints.Length;
@@ -48,6 +47,12 @@ public class CreateOrderSpecificationChangeRecordVo implements BaseVo, Serializa
     private LocalDate deliveryDate;
     private LocalDate deliveryDate;
 
 
     /**
     /**
+     * 变更原因及变更后的质量要求
+     */
+    @ApiModelProperty(value = "变更原因及变更后的质量要求")
+    private String description;
+
+    /**
      * 规格变更记录
      * 规格变更记录
      */
      */
     @Valid
     @Valid

@@ -53,6 +53,12 @@ public class UpdateOrderSpecificationChangeRecordVo implements BaseVo, Serializa
     private LocalDate deliveryDate;
     private LocalDate deliveryDate;
 
 
     /**
     /**
+     * 变更原因及变更后的质量要求
+     */
+    @ApiModelProperty(value = "变更原因及变更后的质量要求")
+    private String description;
+
+    /**
      * 规格变更记录
      * 规格变更记录
      */
      */
     @Valid
     @Valid

@@ -80,4 +80,115 @@
         </where>
         </where>
         ORDER BY tb.show_order ASC
         ORDER BY tb.show_order ASC
     </select>
     </select>
+
+    <insert id="batchAdd" parameterType="java.util.List">
+        INSERT INTO tbl_purchase_order_line (
+        id, purchase_order_id, change_id, industry, quality, brand,
+        thickness, thickness_tol_pos, thickness_tol_neg,
+        width, width_tol_pos, width_tol_neg,
+        length, length_tol_pos, length_tol_neg,
+        status, quantity, sales_price, delivery_date, show_order,
+        assessment_exceeds_agreement, create_by_id, create_by, update_by_id, update_by
+        ) VALUES
+        <foreach collection="specList" item="item" separator=",">
+            (
+            #{item.id}, #{item.purchaseOrderId}, #{item.changeId}, #{item.industry}, #{item.quality}, #{item.brand},
+            #{item.thickness}, #{item.thicknessTolPos}, #{item.thicknessTolNeg},
+            #{item.width}, #{item.widthTolPos}, #{item.widthTolNeg},
+            #{item.length}, #{item.lengthTolPos}, #{item.lengthTolNeg},
+            #{item.status}, #{item.quantity}, #{item.salesPrice}, #{item.deliveryDate}, #{item.showOrder},
+            #{item.assessmentExceedsAgreement}, #{item.createById}, #{item.createBy}, #{item.updateById}, #{item.updateBy}
+            )
+        </foreach>
+    </insert>
+
+    <update id="batchUpdate" parameterType="java.util.List">
+        UPDATE tbl_purchase_order_line
+        SET
+        industry =
+        <foreach collection="specList" item="item" open="CASE id" close="END">
+            WHEN #{item.id} THEN #{item.industry}
+        </foreach>,
+        quality =
+        <foreach collection="specList" item="item" open="CASE id" close="END">
+            WHEN #{item.id} THEN #{item.quality}
+        </foreach>,
+        brand =
+        <foreach collection="specList" item="item" open="CASE id" close="END">
+            WHEN #{item.id} THEN #{item.brand}
+        </foreach>,
+        thickness =
+        <foreach collection="specList" item="item" open="CASE id" close="END">
+            WHEN #{item.id} THEN #{item.thickness}
+        </foreach>,
+        thickness_tol_pos =
+        <foreach collection="specList" item="item" open="CASE id" close="END">
+            WHEN #{item.id} THEN #{item.thicknessTolPos}
+        </foreach>,
+        thickness_tol_neg =
+        <foreach collection="specList" item="item" open="CASE id" close="END">
+            WHEN #{item.id} THEN #{item.thicknessTolNeg}
+        </foreach>,
+        width =
+        <foreach collection="specList" item="item" open="CASE id" close="END">
+            WHEN #{item.id} THEN #{item.width}
+        </foreach>,
+        width_tol_pos =
+        <foreach collection="specList" item="item" open="CASE id" close="END">
+            WHEN #{item.id} THEN #{item.widthTolPos}
+        </foreach>,
+        width_tol_neg =
+        <foreach collection="specList" item="item" open="CASE id" close="END">
+            WHEN #{item.id} THEN #{item.widthTolNeg}
+        </foreach>,
+        length =
+        <foreach collection="specList" item="item" open="CASE id" close="END">
+            WHEN #{item.id} THEN #{item.length}
+        </foreach>,
+        length_tol_pos =
+        <foreach collection="specList" item="item" open="CASE id" close="END">
+            WHEN #{item.id} THEN #{item.lengthTolPos}
+        </foreach>,
+        length_tol_neg =
+        <foreach collection="specList" item="item" open="CASE id" close="END">
+            WHEN #{item.id} THEN #{item.lengthTolNeg}
+        </foreach>,
+        status =
+        <foreach collection="specList" item="item" open="CASE id" close="END">
+            WHEN #{item.id} THEN #{item.status}
+        </foreach>,
+        quantity =
+        <foreach collection="specList" item="item" open="CASE id" close="END">
+            WHEN #{item.id} THEN #{item.quantity}
+        </foreach>,
+        sales_price =
+        <foreach collection="specList" item="item" open="CASE id" close="END">
+            WHEN #{item.id} THEN #{item.salesPrice}
+        </foreach>,
+        delivery_date =
+        <foreach collection="specList" item="item" open="CASE id" close="END">
+            WHEN #{item.id} THEN #{item.deliveryDate}
+        </foreach>,
+        show_order =
+        <foreach collection="specList" item="item" open="CASE id" close="END">
+            WHEN #{item.id} THEN #{item.showOrder}
+        </foreach>,
+        assessment_exceeds_agreement =
+        <foreach collection="specList" item="item" open="CASE id" close="END">
+            WHEN #{item.id} THEN #{item.assessmentExceedsAgreement}
+        </foreach>,
+        update_by_id =
+        <foreach collection="specList" item="item" open="CASE id" close="END">
+            WHEN #{item.id} THEN #{item.updateById}
+        </foreach>,
+        update_by =
+        <foreach collection="specList" item="item" open="CASE id" close="END">
+            WHEN #{item.id} THEN #{item.updateBy}
+        </foreach>,
+        update_time = NOW()
+        WHERE id IN
+        <foreach collection="specList" item="item" open="(" separator="," close=")">
+            #{item.id}
+        </foreach>
+    </update>
 </mapper>
 </mapper>