Merge branch 'master_after0506' into master_after0506_report02

@@ -326,6 +326,7 @@ public class ContractDistributorStandardController extends DefaultBaseController
         GetContractDistributorStandardBo result = new GetContractDistributorStandardBo(data);
         GetContractDistributorStandardBo result = new GetContractDistributorStandardBo(data);
         Wrapper<ContractDistributorLine> lineWrapper = Wrappers.lambdaQuery(ContractDistributorLine.class)
         Wrapper<ContractDistributorLine> lineWrapper = Wrappers.lambdaQuery(ContractDistributorLine.class)
                 .eq(ContractDistributorLine::getContractId, id)
                 .eq(ContractDistributorLine::getContractId, id)
+                .gt(ContractDistributorLine::getQuantity, BigDecimal.ZERO)
                 .orderByAsc(ContractDistributorLine::getShowOrder);
                 .orderByAsc(ContractDistributorLine::getShowOrder);
         List<ContractDistributorLine> contractDistributorLineList = contractDistributorLineService.list(lineWrapper);
         List<ContractDistributorLine> contractDistributorLineList = contractDistributorLineService.list(lineWrapper);
 
 

@@ -444,6 +444,7 @@ public class PurchaseOrderInfoController extends DefaultBaseController {
                     dataMap.put("supplyUnit", supplyUnitDicItem == null ? "" : supplyUnitDicItem.getName());
                     dataMap.put("supplyUnit", supplyUnitDicItem == null ? "" : supplyUnitDicItem.getName());
                     dataMap.put("orderNo", data.getOrderNo());
                     dataMap.put("orderNo", data.getOrderNo());
                     dataMap.put("orderingUnitName", data.getOrderingUnitName());
                     dataMap.put("orderingUnitName", data.getOrderingUnitName());
+                    dataMap.put("workshopName", data.getWorkshopName());
                     dataMap.put("customerTier", data.getCustomerTier());
                     dataMap.put("customerTier", data.getCustomerTier());
                     dataMap.put("orderDate", data.getOrderDate() == null ? "" : data.getOrderDate().format(dateFormatter));
                     dataMap.put("orderDate", data.getOrderDate() == null ? "" : data.getOrderDate().format(dateFormatter));
 
 

@@ -39,7 +39,7 @@ public class OrderDetailStatisticsModel implements ExcelModel {
      * 订货日期
      * 订货日期
      */
      */
     @ExcelProperty("订货日期")
     @ExcelProperty("订货日期")
-    @DateTimeFormat("yyyy-MM-dd")
+    @DateTimeFormat("yyyy/M/d")
     private Date orderDate1;
     private Date orderDate1;
 
 
     /**
     /**
@@ -64,7 +64,7 @@ public class OrderDetailStatisticsModel implements ExcelModel {
      * 订货日期
      * 订货日期
      */
      */
     @ExcelProperty("订货日期")
     @ExcelProperty("订货日期")
-    @DateTimeFormat("yyyy-MM-dd")
+    @DateTimeFormat("yyyy/M/d")
     private Date orderDate;
     private Date orderDate;
 
 
     /**
     /**
@@ -167,7 +167,7 @@ public class OrderDetailStatisticsModel implements ExcelModel {
      * 发货日期
      * 发货日期
      */
      */
     @ExcelProperty("发货日期")
     @ExcelProperty("发货日期")
-    @DateTimeFormat("yyyy-MM-dd")
+    @DateTimeFormat("yyyy/M/d")
     private Date deliveryDate;
     private Date deliveryDate;
 
 
     /**
     /**

@@ -12,6 +12,9 @@ import com.lframework.xingyun.sc.service.statistics.OrderDetailReportService;
 import com.lframework.xingyun.sc.utils.CommonUtil;
 import com.lframework.xingyun.sc.utils.CommonUtil;
 import com.lframework.xingyun.sc.vo.statistics.orderDetail.QueryOrderDetailReportVo;
 import com.lframework.xingyun.sc.vo.statistics.orderDetail.QueryOrderDetailReportVo;
 
 
+import java.time.LocalDate;
+import java.time.ZoneId;
+import java.util.Date;
 import java.util.List;
 import java.util.List;
 import java.util.stream.Collectors;
 import java.util.stream.Collectors;
 
 
@@ -49,10 +52,35 @@ public class QualityOrderDetailReportExportTaskWorker implements
                 data.getLengthTolPos() != null ? data.getLengthTolPos().doubleValue() : null,
                 data.getLengthTolPos() != null ? data.getLengthTolPos().doubleValue() : null,
                 data.getLengthTolNeg() != null ? data.getLengthTolNeg().doubleValue() : null);
                 data.getLengthTolNeg() != null ? data.getLengthTolNeg().doubleValue() : null);
 
 
-        QualityOrderDetailStatisticsModel model = JsonUtil.parseObject(JsonUtil.toJsonString(data), QualityOrderDetailStatisticsModel.class);
+        QualityOrderDetailStatisticsModel model = new QualityOrderDetailStatisticsModel();
+        model.setOrderNo(data.getOrderNo());
+        model.setWorkshopName(data.getWorkshopName());
+        model.setDeptName(data.getDeptName());
+        model.setRegionName(data.getRegionName());
+        model.setOrderingUnitName(data.getOrderingUnitName());
+        model.setIndustry(data.getIndustry());
+        model.setBrand(data.getBrand());
+        model.setThickness(data.getThickness());
+        model.setWidth(data.getWidth());
+        model.setLength(data.getLength());
+        model.setStatus(data.getStatus());
+        model.setQuantity(data.getQuantity());
+        model.setProductionProcess(data.getProductionProcess());
+        model.setPieceWeightHeader(data.getPieceWeightHeader());
+        model.setSurface(data.getSurface());
+        model.setTolerance(data.getTolerance());
+        model.setPerformance(data.getPerformance());
+        model.setPackaging(data.getPackaging());
+        model.setSpecialRequirements(data.getSpecialRequirements());
+        model.setRemarks(data.getRemarks());
+        model.setCustomerType(data.getCustomerType());
+        model.setContractType(data.getContractType());
+        model.setStockUpCompanyName(data.getStockUpCompanyName());
         model.setThicknessTol(thicknessTol);
         model.setThicknessTol(thicknessTol);
         model.setWidthTol(widthTol);
         model.setWidthTol(widthTol);
         model.setLengthTol(lengthTol);
         model.setLengthTol(lengthTol);
+        model.setOrderDate(toDate(data.getOrderDate()));
+        model.setDeliveryDate(toDate(data.getDeliveryDate()));
         return model;
         return model;
     }
     }
 
 
@@ -60,4 +88,11 @@ public class QualityOrderDetailReportExportTaskWorker implements
     public Class<QualityOrderDetailStatisticsModel> getModelClass() {
     public Class<QualityOrderDetailStatisticsModel> getModelClass() {
         return QualityOrderDetailStatisticsModel.class;
         return QualityOrderDetailStatisticsModel.class;
     }
     }
+
+    private static Date toDate(LocalDate date) {
+        if (date == null) {
+            return null;
+        }
+        return Date.from(date.atStartOfDay(ZoneId.systemDefault()).toInstant());
+    }
 }
 }

 package com.lframework.xingyun.sc.excel.statistics;
 package com.lframework.xingyun.sc.excel.statistics;
 
 
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.format.DateTimeFormat;
 import com.lframework.starter.web.core.components.excel.ExcelModel;
 import com.lframework.starter.web.core.components.excel.ExcelModel;
 import lombok.Data;
 import lombok.Data;
 
 
 import java.math.BigDecimal;
 import java.math.BigDecimal;
+import java.util.Date;
 
 
 /**
 /**
  * <p>
  * <p>
@@ -25,7 +27,8 @@ public class QualityOrderDetailStatisticsModel implements ExcelModel {
      * 订货日期
      * 订货日期
      */
      */
     @ExcelProperty("订货日期")
     @ExcelProperty("订货日期")
-    private String orderDate;
+    @DateTimeFormat("yyyy/M/d")
+    private Date orderDate;
 
 
     /**
     /**
      * 生产厂
      * 生产厂
@@ -121,7 +124,8 @@ public class QualityOrderDetailStatisticsModel implements ExcelModel {
      * 发货日期
      * 发货日期
      */
      */
     @ExcelProperty("发货日期")
     @ExcelProperty("发货日期")
-    private String deliveryDate;
+    @DateTimeFormat("yyyy/M/d")
+    private Date deliveryDate;
 
 
     /**
     /**
      * 工艺要求
      * 工艺要求

@@ -24,7 +24,7 @@ public class StockInOrderDetailReportModel implements ExcelModel {
     private String customerShortName;
     private String customerShortName;
 
 
     @ExcelProperty(value = "订货日期", index = 3)
     @ExcelProperty(value = "订货日期", index = 3)
-    @DateTimeFormat("yyyy-MM-dd")
+    @DateTimeFormat("yyyy/M/d")
     private Date orderDate;
     private Date orderDate;
 
 
     @ExcelProperty(value = "生产厂", index = 4)
     @ExcelProperty(value = "生产厂", index = 4)
@@ -76,7 +76,7 @@ public class StockInOrderDetailReportModel implements ExcelModel {
     private BigDecimal suggestedPrice;
     private BigDecimal suggestedPrice;
 
 
     @ExcelProperty(value = "交货日期", index = 20)
     @ExcelProperty(value = "交货日期", index = 20)
-    @DateTimeFormat("yyyy-MM-dd")
+    @DateTimeFormat("yyyy/M/d")
     private Date deliveryDate;
     private Date deliveryDate;
 
 
     @ExcelProperty(value = "超价协调价", index = 21)
     @ExcelProperty(value = "超价协调价", index = 21)

@@ -15,7 +15,7 @@ import java.util.Date;
 public class StockInboundOrderDetailReportModel implements ExcelModel {
 public class StockInboundOrderDetailReportModel implements ExcelModel {
 
 
     @ExcelProperty(value = "日期", index = 0)
     @ExcelProperty(value = "日期", index = 0)
-    @DateTimeFormat("yyyy-MM-dd")
+    @DateTimeFormat("yyyy/M/d")
     private Date date;
     private Date date;
 
 
     @ExcelProperty(value = "订单编号", index = 1)
     @ExcelProperty(value = "订单编号", index = 1)
@@ -28,7 +28,7 @@ public class StockInboundOrderDetailReportModel implements ExcelModel {
     private String customerShortName;
     private String customerShortName;
 
 
     @ExcelProperty(value = "订货日期", index = 4)
     @ExcelProperty(value = "订货日期", index = 4)
-    @DateTimeFormat("yyyy-MM-dd")
+    @DateTimeFormat("yyyy/M/d")
     private Date orderDate;
     private Date orderDate;
 
 
     @ExcelProperty(value = "生产厂", index = 5)
     @ExcelProperty(value = "生产厂", index = 5)
@@ -80,7 +80,7 @@ public class StockInboundOrderDetailReportModel implements ExcelModel {
     private BigDecimal suggestedPrice;
     private BigDecimal suggestedPrice;
 
 
     @ExcelProperty(value = "交货日期", index = 21)
     @ExcelProperty(value = "交货日期", index = 21)
-    @DateTimeFormat("yyyy-MM-dd")
+    @DateTimeFormat("yyyy/M/d")
     private Date deliveryDate;
     private Date deliveryDate;
 
 
     @ExcelProperty(value = "超价协调价", index = 22)
     @ExcelProperty(value = "超价协调价", index = 22)

@@ -787,8 +787,8 @@ public class ContractDistributorStandardServiceImpl extends
         }
         }
 
 
         BigDecimal newOriginalTotalQuantity = original.getTotalQuantity().subtract(splitTotalQuantity);
         BigDecimal newOriginalTotalQuantity = original.getTotalQuantity().subtract(splitTotalQuantity);
-        if (newOriginalTotalQuantity.compareTo(BigDecimal.ZERO) < 0) {
-            throw new DefaultClientException("拆分数量不能大于合同合计数量！");
+        if (newOriginalTotalQuantity.compareTo(BigDecimal.ZERO) <= 0) {
+            throw new DefaultClientException("拆分数量不能大于等于合同合计数量！");
         }
         }
 
 
         String baseCode = original.getCode();
         String baseCode = original.getCode();

@@ -413,10 +413,10 @@ public class OrderChangeRecordServiceImpl extends BaseMpServiceImpl<OrderChangeR
                             , purchaseOrderInfo.getContractCreateById());
                             , purchaseOrderInfo.getContractCreateById());
                 }
                 }
             }
             }
-            purchaseOrderInfoService.update(orderInfo);
-            // 更新订货单物料行数据
-            purchaseOrderLineService.update(record.getOrderId(), record.getAfterChangeSpecList());
         }
         }
+        purchaseOrderInfoService.update(orderInfo);
+        // 更新订货单物料行数据
+        purchaseOrderLineService.update(record.getOrderId(), record.getAfterChangeSpecList());
     }
     }
 
 
     @Override
     @Override

@@ -221,6 +221,9 @@ public class OrderDetailReportServiceImpl extends BaseMpServiceImpl<OrderDetailR
         if (vo.getShowOrder() != null) {
         if (vo.getShowOrder() != null) {
             data.setShowOrder(vo.getShowOrder());
             data.setShowOrder(vo.getShowOrder());
         }
         }
+        if (!StringUtil.isBlank(vo.getType())) {
+            data.setType(vo.getType());
+        }
 
 
         getBaseMapper().insert(data);
         getBaseMapper().insert(data);
 
 

@@ -79,6 +79,8 @@
             <if test="vo.contractId != null and vo.contractId != ''">
             <if test="vo.contractId != null and vo.contractId != ''">
                 AND tb.contract_id = #{vo.contractId}
                 AND tb.contract_id = #{vo.contractId}
             </if>
             </if>
+            AND tb.quantity IS NOT NULL
+            AND tb.quantity <![CDATA[>]]> 0
         </where>
         </where>
     </select>
     </select>
 </mapper>
 </mapper>