楚江ERP-订货单变更字段增加

@@ -86,6 +86,12 @@ public class OrderChangeRecordBo extends BaseBo<OrderInfoChangeRecord> {
     private String executionStandard;
 
     /**
+     * 执行标准备注
+     */
+    @ApiModelProperty("执行标准备注")
+    private String executionStandardRemarks;
+
+    /**
      * 开票情况
      */
     @ApiModelProperty("开票情况")

@@ -295,7 +295,7 @@ public class ScSelectorController extends DefaultBaseController {
         if (CollectionUtil.isEmpty(ids)) {
             return InvokeResultBuilder.success(CollectionUtil.emptyList());
         }
-        List<PurchaseOrderInfo> orderInfoList = orderInfoService.listByIds(ids);
+        List<PurchaseOrderInfo> orderInfoList = orderInfoService.findById(ids);
         if (CollectionUtils.isEmpty(orderInfoList)) {
             return new InvokeResult<>();
         }

@@ -78,6 +78,11 @@ public class OrderInfoChangeRecord extends BaseEntity implements BaseDto {
     private String executionStandard;
 
     /**
+     * 执行标准备注
+     */
+    private String executionStandardRemarks;
+
+    /**
      * 开票情况
      */
     private String invoicingStatus;

@@ -136,6 +136,9 @@ public class OrderChangeRecordServiceImpl extends BaseMpServiceImpl<OrderChangeR
         if (!StringUtil.isBlank(vo.getExecutionStandard())) {
             data.setExecutionStandard(vo.getExecutionStandard());
         }
+        if (!StringUtil.isBlank(vo.getExecutionStandardRemarks())) {
+            data.setExecutionStandardRemarks(vo.getExecutionStandardRemarks());
+        }
         if (!StringUtil.isBlank(vo.getInvoicingStatus())) {
             data.setInvoicingStatus(vo.getInvoicingStatus());
         }
@@ -172,6 +175,12 @@ public class OrderChangeRecordServiceImpl extends BaseMpServiceImpl<OrderChangeR
         if (!StringUtil.isBlank(vo.getWorkshopId())) {
             data.setWorkshopId(vo.getWorkshopId());
         }
+        if (vo.getTotalQuantity() != null) {
+            data.setTotalQuantity(vo.getTotalQuantity());
+        }
+        if (vo.getPackagingFee() != null) {
+            data.setPackagingFee(vo.getPackagingFee());
+        }
         getBaseMapper().insert(data);
         // 处理订货单订货单物料行
         List<CreatePurchaseOrderLineVo> orderLineVoList = vo.getOrderSpecList();
@@ -210,6 +219,7 @@ public class OrderChangeRecordServiceImpl extends BaseMpServiceImpl<OrderChangeR
                 .set(OrderInfoChangeRecord::getDeliveryMethod, StringUtil.isBlank(vo.getDeliveryMethod()) ? null : vo.getDeliveryMethod())
                 .set(OrderInfoChangeRecord::getPriceListNo, StringUtil.isBlank(vo.getPriceListNo()) ? null : vo.getPriceListNo())
                 .set(OrderInfoChangeRecord::getExecutionStandard, StringUtil.isBlank(vo.getExecutionStandard()) ? null : vo.getExecutionStandard())
+                .set(OrderInfoChangeRecord::getExecutionStandardRemarks, StringUtil.isBlank(vo.getExecutionStandardRemarks()) ? null : vo.getExecutionStandardRemarks())
                 .set(OrderInfoChangeRecord::getInvoicingStatus, StringUtil.isBlank(vo.getInvoicingStatus()) ? null : vo.getInvoicingStatus())
                 .set(OrderInfoChangeRecord::getShippingCost, StringUtil.isBlank(vo.getShippingCost()) ? null : vo.getShippingCost())
                 .set(OrderInfoChangeRecord::getPieceWeightHeader, StringUtil.isBlank(vo.getPieceWeightHeader()) ? null : vo.getPieceWeightHeader())
@@ -224,6 +234,8 @@ public class OrderChangeRecordServiceImpl extends BaseMpServiceImpl<OrderChangeR
                 .set(OrderInfoChangeRecord::getDeptId, StringUtil.isBlank(vo.getDeptId()) ? null : vo.getDeptId())
                 .set(OrderInfoChangeRecord::getWorkshopId, StringUtil.isBlank(vo.getWorkshopId()) ? null : vo.getWorkshopId())
                 .set(OrderInfoChangeRecord::getCustomerCreditId, StringUtil.isBlank(vo.getCustomerCreditId()) ? null : vo.getCustomerCreditId())
+                .set(OrderInfoChangeRecord::getTotalQuantity, vo.getTotalQuantity() == null ? null : vo.getTotalQuantity())
+                .set(OrderInfoChangeRecord::getPackagingFee, vo.getPackagingFee() == null ? null : vo.getPackagingFee())
                 .eq(OrderInfoChangeRecord::getId, vo.getId());
         getBaseMapper().update(updateWrapper);
         // 更新订货单物料行

@@ -37,10 +37,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 @Service
@@ -112,6 +109,14 @@ public class PurchaseOrderInfoServiceImpl extends BaseMpServiceImpl<PurchaseOrde
         return getBaseMapper().findById(id);
     }
 
+    @Override
+    public List<PurchaseOrderInfo> findById(List<String> ids) {
+        if (CollectionUtils.isEmpty(ids)) {
+            return new ArrayList<>();
+        }
+        return getBaseMapper().queryByIds(ids);
+    }
+
     @OpLog(type = OtherOpLogType.class, name = "新增订货单表，ID：{}", params = {"#id"})
     @Transactional(rollbackFor = Exception.class)
     @Override

@@ -30,4 +30,12 @@ public interface PurchaseOrderInfoMapper extends BaseMapper<PurchaseOrderInfo> {
     List<PurchaseOrderInfo> queryCanRevokeOrChangeList(@Param("vo") QueryPurchaseOrderInfoVo vo);
 
     PurchaseOrderInfo findById(@Param("id") String id);
+
+    /**
+     * 根据ID批量查询
+     *
+     * @param ids   主键集合
+     * @return      List<PurchaseOrderInfo>
+     */
+    List<PurchaseOrderInfo> queryByIds(@Param("ids") List<String> ids);
 }

@@ -45,6 +45,7 @@ public interface PurchaseOrderInfoService extends BaseMpService<PurchaseOrderInf
      * @return
      */
     PurchaseOrderInfo findById(String id);
+    List<PurchaseOrderInfo> findById(List<String> ids);
 
     /**
      * 创建

@@ -93,6 +93,13 @@ public class CreateOrderChangeRecordVo implements BaseVo, Serializable {
     private String executionStandard;
 
     /**
+     * 执行标准备注
+     */
+    @ApiModelProperty("执行标准备注")
+    @Length(message = "执行标准备注最多允许500个字符！")
+    private String executionStandardRemarks;
+
+    /**
      * 开票情况
      */
     @ApiModelProperty("开票情况")

@@ -97,6 +97,13 @@ public class UpdateOrderChangeRecordVo implements BaseVo, Serializable {
     private String executionStandard;
 
     /**
+     * 执行标准备注
+     */
+    @ApiModelProperty("执行标准备注")
+    @Length(message = "执行标准备注最多允许500个字符！")
+    private String executionStandardRemarks;
+
+    /**
      * 开票情况
      */
     @ApiModelProperty("开票情况")

@@ -203,4 +203,12 @@
             </if>
         </where>
     </select>
+
+    <select id="queryByIds" resultType="com.lframework.xingyun.sc.entity.PurchaseOrderInfo">
+        <include refid="PurchaseOrderInfo_sql"/>
+        where tb.id in
+        <foreach collection="ids" open="(" separator="," close=")" item="id">
+            #{id}
+        </foreach>
+    </select>
 </mapper>