Merge branch 'master_chujiang_0819' into master_plan

@@ -323,6 +323,9 @@ CREATE TABLE IF NOT EXISTS `purchase_order_info`
     KEY                          `idx_order_date` (`order_date`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COMMENT='订货单表';
 
+ALTER TABLE `purchase_order_info`
+    ADD COLUMN `finish_date` datetime DEFAULT NULL COMMENT '完成日期（审核通过时间）';
+
 -- 订货单表物料行
 DROP TABLE IF EXISTS `tbl_purchase_order_line`;
 CREATE TABLE IF NOT EXISTS `tbl_purchase_order_line`

@@ -275,6 +275,13 @@ public class GetPurchaseOrderInfoBo extends BaseBo<PurchaseOrderInfo> {
     private String specChangeStatus;
 
     /**
+     * 完成日期（审核通过时间，精确到时分秒）
+     */
+    @ApiModelProperty("完成日期")
+    @JsonFormat(pattern = StringPool.DATE_TIME_PATTERN)
+    private LocalDateTime finishDate;
+
+    /**
      * 订货单类型（生产：PRODUCTION 无需生产：NO_PRODUCTION）
      */
     @ApiModelProperty("订货单类型")

@@ -256,6 +256,11 @@ public class PurchaseOrderInfo extends BaseEntity implements BaseDto {
     private String specChangeStatus;
 
     /**
+     * 完成日期（审核通过时间，精确到时分秒）
+     */
+    private LocalDateTime finishDate;
+
+    /**
      * 订货单类型（生产：PRODUCTION 无需生产：NO_PRODUCTION）
      */
     private String type;

@@ -51,6 +51,7 @@ import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
+import java.time.LocalDateTime;
 import java.util.*;
 import java.util.function.Function;
 import java.util.stream.Collectors;
@@ -605,7 +606,8 @@ public class PurchaseOrderInfoServiceImpl extends BaseMpServiceImpl<PurchaseOrde
         if ("PASS".equals(status)) {
             LambdaUpdateWrapper<PurchaseOrderInfo> updateWrapper = Wrappers.lambdaUpdate(PurchaseOrderInfo.class)
                     .set(PurchaseOrderInfo::getExamineStatus, status)
-                    .set(PurchaseOrderInfo::getStatus, "ISSUED")//已下发
+                    .set(PurchaseOrderInfo::getStatus, "ISSUED")
+                    .set(PurchaseOrderInfo::getFinishDate, LocalDateTime.now())
                     .eq(PurchaseOrderInfo::getId, id);
             getBaseMapper().update(updateWrapper);
         } else if ("WAIT".equals(status)) {

@@ -109,16 +109,6 @@ public class SalesmanQuotationServiceImpl
     private static final String CODE_PREFIX = "BJ";
 
     /**
-     * 默认协调事由
-     */
-    private static final String DEFAULT_COORDINATION_REASON = "受市场影响,申请协调";
-
-    /**
-     * 默认票类状况
-     */
-    private static final String DEFAULT_INVOICE_TYPE_STATUS = "增票";
-
-    /**
      * 分页查询
      *
      * @param pageIndex 页码
@@ -398,8 +388,8 @@ public class SalesmanQuotationServiceImpl
         data.setDeliveryDate(vo.getDeliveryDate());
         data.setSettlementMethod(vo.getSettlementMethod());
         data.setSettlementRatio(vo.getSettlementRatio());
-        data.setCoordinationReason(DEFAULT_COORDINATION_REASON);
-        data.setInvoiceTypeStatus(DEFAULT_INVOICE_TYPE_STATUS);
+        data.setCoordinationReason(vo.getCoordinationReason());
+        data.setInvoiceTypeStatus(vo.getInvoiceTypeStatus());
         data.setMaterialConditionEnabled(vo.getMaterialConditionEnabled());
         data.setMaterialConditionCopperRice(normalizeMaterialText(vo.getMaterialConditionEnabled(), vo.getMaterialConditionCopperRice()));
         data.setMaterialConditionBrightCopper(normalizeMaterialText(vo.getMaterialConditionEnabled(), vo.getMaterialConditionBrightCopper()));
@@ -443,8 +433,8 @@ public class SalesmanQuotationServiceImpl
         data.setDeliveryDate(vo.getDeliveryDate());
         data.setSettlementMethod(vo.getSettlementMethod());
         data.setSettlementRatio(vo.getSettlementRatio());
-        data.setCoordinationReason(DEFAULT_COORDINATION_REASON);
-        data.setInvoiceTypeStatus(DEFAULT_INVOICE_TYPE_STATUS);
+        data.setCoordinationReason(vo.getCoordinationReason());
+        data.setInvoiceTypeStatus(vo.getInvoiceTypeStatus());
         data.setMaterialConditionEnabled(vo.getMaterialConditionEnabled());
         data.setMaterialConditionCopperRice(normalizeMaterialText(vo.getMaterialConditionEnabled(), vo.getMaterialConditionCopperRice()));
         data.setMaterialConditionBrightCopper(normalizeMaterialText(vo.getMaterialConditionEnabled(), vo.getMaterialConditionBrightCopper()));

@@ -160,6 +160,20 @@ public class CreateSalesmanQuotationVo implements BaseVo, Serializable {
     private BigDecimal settlementRatio;
 
     /**
+     * 协调事由
+     */
+    @ApiModelProperty(value = "协调事由", required = true)
+    @NotNull(message = "协调事由不能为空！")
+    private String coordinationReason;
+
+    /**
+     * 票类状况
+     */
+    @ApiModelProperty(value = "票类状况", required = true)
+    @NotNull(message = "票类状况不能为空！")
+    private String invoiceTypeStatus;
+
+    /**
      * 是否启用料质状况
      */
     @ApiModelProperty(value = "是否启用料质状况", required = true)

@@ -159,6 +159,20 @@ public class UpdateSalesmanQuotationVo implements BaseVo, Serializable {
     private BigDecimal settlementRatio;
 
     /**
+     * 协调事由
+     */
+    @ApiModelProperty(value = "协调事由", required = true)
+    @NotNull(message = "协调事由不能为空！")
+    private String coordinationReason;
+
+    /**
+     * 票类状况
+     */
+    @ApiModelProperty(value = "票类状况", required = true)
+    @NotNull(message = "票类状况不能为空！")
+    private String invoiceTypeStatus;
+
+    /**
      * 是否启用料质状况
      */
     @ApiModelProperty(value = "是否启用料质状况", required = true)

@@ -181,4 +181,16 @@ public class QueryPurchaseOrderInfoVo extends PageVo implements BaseVo, Serializ
      */
     @ApiModelProperty("合同类型")
     private String contractType;
+
+    /**
+     * 完成开始日期（审核通过时间）
+     */
+    @ApiModelProperty("完成开始日期")
+    private String finishDateStart;
+
+    /**
+     * 完成结束日期（审核通过时间）
+     */
+    @ApiModelProperty("完成结束日期")
+    private String finishDateEnd;
 }

@@ -30,6 +30,7 @@
         <result column="examine_status" property="examineStatus"/>
         <result column="revoke_status" property="revokeStatus"/>
         <result column="spec_change_status" property="specChangeStatus"/>
+        <result column="finish_date" property="finishDate"/>
         <result column="production_process" property="productionProcess"/>
         <result column="dept_id" property="deptId"/>
         <result column="dept_name" property="deptName"/>
@@ -90,6 +91,7 @@
             tb.examine_status,
             tb.revoke_status,
             tb.spec_change_status,
+            tb.finish_date,
             tb.production_process,
             tb.dept_id,
             sd.name AS dept_name,
@@ -217,6 +219,14 @@
             <if test="vo.contractType != null and vo.contractType != ''">
                 AND cds.type = #{vo.contractType}
             </if>
+            <if test="vo.finishDateStart != null">
+                AND tb.finish_date >= #{vo.finishDateStart}
+            </if>
+            <if test="vo.finishDateEnd != null">
+                <![CDATA[
+                  AND tb.finish_date < DATE_ADD(#{vo.finishDateEnd}, INTERVAL 1 DAY)
+                ]]>
+            </if>
         </where>
         ORDER BY tb.create_time DESC
     </select>
@@ -284,6 +294,14 @@
                     AND 1 = 0  <!-- 确保查询不到任何数据 -->
                 </otherwise>
             </choose>
+            <if test="vo.finishDateStart != null">
+                AND tb.finish_date >= #{vo.finishDateStart}
+            </if>
+            <if test="vo.finishDateEnd != null">
+                <![CDATA[
+                  AND tb.finish_date < DATE_ADD(#{vo.finishDateEnd}, INTERVAL 1 DAY)
+                ]]>
+            </if>
         </where>
         ORDER BY tb.update_time DESC
     </select>

@@ -85,6 +85,7 @@
         LEFT JOIN tbl_purchase_order_line ol ON tb.order_spec_id = ol.id
         LEFT JOIN tbl_contract_distributor_standard s on s.id = o.contract_id
         LEFT JOIN base_data_workshop ws on ws.id = o.workshop_id
+        LEFT JOIN sys_dept d on d.id = o.dept_id
     </sql>
 
     <select id="query" resultMap="ShipmentsPlanDetail">
@@ -126,7 +127,20 @@
                 </choose>
             </if>
         </where>
-        ORDER BY tb.create_time desc
+        ORDER BY
+        CASE
+            WHEN d.code = 'NB' THEN 1
+            WHEN d.code = 'WZ' THEN 2
+            WHEN d.code = 'DG' THEN 3
+            WHEN d.code = 'FS' THEN 4
+            WHEN d.code = 'SZ' THEN 5
+            WHEN d.code = 'CZ' THEN 6
+            WHEN d.code = 'BF' THEN 7
+            WHEN d.code = 'ZT' THEN 8
+            WHEN d.code = 'WM' THEN 9
+        ELSE 10
+        END ASC,
+        tb.create_time desc
     </select>
 
     <insert id="batchAdd">