1：合同锁规修改；2：报表导出优化

@@ -97,8 +97,8 @@ public class OrderDetailReportController extends DefaultBaseController {
      */
     @ApiOperation("订单明细导出")
     @HasPermission({"statistical-report:order-detail:export"})
-    @GetMapping("/export")
-    public InvokeResult<Void> export(@Valid QueryOrderDetailReportVo vo) {
+    @PostMapping("/export")
+    public InvokeResult<Void> export(@Valid @RequestBody QueryOrderDetailReportVo vo) {
         vo.setExportType(ExportType.ORDER_DETAIL_REPORT.getCode());
         ExportTaskUtil.exportTask("订单明细报表", OrderDetailReportExportTaskWorker.class, vo);
         return InvokeResultBuilder.success();

@@ -85,8 +85,8 @@ public class ShipmentDetailStatisticsController extends DefaultBaseController {
      */
     @ApiOperation("发货明细导出")
     @HasPermission({"statistical-report:delivery-detail:export"})
-    @GetMapping("/export")
-    public InvokeResult<Void> export(@Valid QueryShipmentDetailStatisticsVo vo) {
+    @PostMapping("/export")
+    public InvokeResult<Void> export(@Valid @RequestBody QueryShipmentDetailStatisticsVo vo) {
         vo.setExportType(ExportType.SHIPMENT_DETAIL_REPORT.getCode());
         ExportTaskUtil.exportTask("发货明细报表", ShipmentDetailReportExportTaskWorker.class, vo);
         return InvokeResultBuilder.success();

@@ -1143,25 +1143,35 @@ public class ContractDistributorStandardServiceImpl extends
 //        data.setStandardizedAt(LocalDateTime.now());
         getBaseMapper().insert(data);
 
-        Wrapper<ContractDistributorLine> lineWrapper = Wrappers.lambdaQuery(ContractDistributorLine.class)
-                .eq(ContractDistributorLine::getContractId, vo.getId())
-                .orderByAsc(ContractDistributorLine::getShowOrder);
-        List<ContractDistributorLine> oldContractDistributorLineList = contractDistributorLineService.list(lineWrapper);
-        Map<String, ContractDistributorLine> contractDistributorLineMap = CollectionUtils.emptyIfNull(oldContractDistributorLineList)
-                .stream().collect(Collectors.toMap(ContractDistributorLine::getId, Function.identity()));
-
         for (UpdateContractDistributorLineVo lineVo : lineVoList) {
-            ContractDistributorLine contractDistributorLine = contractDistributorLineMap.remove(lineVo.getId());
-            if (contractDistributorLine == null) {
-                throw new DefaultClientException("合同行数据不存在！");
-            }
+            ContractDistributorLine contractDistributorLine = new ContractDistributorLine();
 
             contractDistributorLine.setId(IdUtil.getUUID());
             contractDistributorLine.setContractId(data.getId());
+            contractDistributorLine.setIndustry(lineVo.getIndustry());
+            contractDistributorLine.setQuality(lineVo.getQuality());
+            contractDistributorLine.setBrand(lineVo.getBrand());
+            contractDistributorLine.setThickness(lineVo.getThickness());
+            contractDistributorLine.setWidth(lineVo.getWidth());
+            contractDistributorLine.setLength(lineVo.getLength());
+            contractDistributorLine.setStatus(lineVo.getStatus());
             contractDistributorLine.setQuantity(lineVo.getQuantity());
+            contractDistributorLine.setProcessingFee(lineVo.getProcessingFee());
             contractDistributorLine.setUnitPrice(lineVo.getUnitPrice());
             contractDistributorLine.setAmountExcludingTax(lineVo.getAmountExcludingTax());
             contractDistributorLine.setTotalAmount(lineVo.getTotalAmount());
+            contractDistributorLine.setDeliveryDate(lineVo.getDeliveryDate());
+            contractDistributorLine.setShowOrder(lineVo.getShowOrder());
+            contractDistributorLine.setItemId(lineVo.getItemId());
+            contractDistributorLine.setSampleOrder(lineVo.getSampleOrder());
+            contractDistributorLine.setProductId(lineVo.getProductId());
+            contractDistributorLine.setThicknessTolPos(lineVo.getThicknessTolPos());
+            contractDistributorLine.setThicknessTolNeg(lineVo.getThicknessTolNeg());
+            contractDistributorLine.setWidthTolPos(lineVo.getWidthTolPos());
+            contractDistributorLine.setWidthTolNeg(lineVo.getWidthTolNeg());
+            contractDistributorLine.setLengthTolPos(lineVo.getLengthTolPos());
+            contractDistributorLine.setLengthTolNeg(lineVo.getLengthTolNeg());
+            contractDistributorLine.setMaterialCode(lineVo.getMaterialCode());
             contractDistributorLineService.getBaseMapper().insert(contractDistributorLine);
         }
 

@@ -5,12 +5,20 @@ import com.lframework.starter.web.core.vo.PageVo;
 import com.lframework.starter.web.core.vo.BaseVo;
 import io.swagger.annotations.ApiModelProperty;
 import java.io.Serializable;
+import java.util.List;
 
 @Data
 public class QueryOrderDetailReportVo extends PageVo implements BaseVo, Serializable {
 
     private static final long serialVersionUID = 1L;
 
+
+    /**
+     * 发货明细ID集合
+     */
+    @ApiModelProperty("订单明细ID集合")
+    private List<String> ids;
+
     /**
      * 订货单物料行ID
      */

@@ -199,6 +199,12 @@
         FROM order_detail_report tb
         LEFT JOIN base_data_workshop ws ON ws.id = tb.workshop_id
         <where>
+            <if test="vo.ids != null and !vo.ids.isEmpty()">
+                AND tb.id IN
+                <foreach collection="vo.ids" item="id" open="(" separator="," close=")">
+                    #{id}
+                </foreach>
+            </if>
             <if test="vo.purchaseOrderLineId != null and vo.purchaseOrderLineId != ''">
                 AND tb.purchase_order_line_id = #{vo.purchaseOrderLineId}
             </if>

@@ -101,6 +101,12 @@
     <select id="query" resultMap="ShipmentDetailStatistics">
         <include refid="ShipmentDetailStatistics_sql"/>
         <where>
+            <if test="vo.ids != null and !vo.ids.isEmpty()">
+                AND tb.id IN
+                <foreach collection="vo.ids" item="id" open="(" separator="," close=")">
+                    #{id}
+                </foreach>
+            </if>
             <if test="vo.workshopName != null and vo.workshopName != ''">
              AND tb.workshop_name LIKE CONCAT('%', #{vo.workshopName}, '%')
             </if>