Browse Source

报价单->生产 添加 品质等级字段

yzc 11 months ago
parent
commit
433461ddac

+ 5 - 0
hx-mes/src/main/java/com/fjhx/mes/entity/production/vo/ProductionOrderVo.java

@@ -71,4 +71,9 @@ public class ProductionOrderVo extends ProductionOrder {
      */
     private List<ArrivalDetailVo> arrivalDetailList;
 
+    /**
+     * 品质等级
+     */
+    private String qualityLv;
+
 }

+ 2 - 1
hx-mes/src/main/resources/mapper/production/ProduceOrderMapper.xml

@@ -19,7 +19,8 @@
                (if(IFNULL(po.finish_time, NOW()) > po.delivery_period, 1, 0)) AS isOverdue,
                po.confirm_status,
                c.contract_type,
-               c.of_company_id                                                as contractCompanyId
+               c.of_company_id                                                as contractCompanyId,
+               c.quality_lv
         from production_order po
                  LEFT JOIN contract c ON po.contract_id = c.id
             ${ew.customSqlSegment}

+ 5 - 0
hx-sale/src/main/java/com/fjhx/sale/entity/contract/po/Contract.java

@@ -534,6 +534,11 @@ public class Contract extends BasePo {
      */
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
     private Date settleEndDate;
+
+    /**
+     * 品质等级
+     */
+    private String qualityLv;
     //========================================================================
     /**
      * 交接单附件列表

+ 5 - 0
hx-sale/src/main/java/com/fjhx/sale/entity/ext/po/ExtQuotation.java

@@ -140,4 +140,9 @@ public class ExtQuotation extends BasePo {
      * 生成待创建产品时间
      */
     private Date waitProductTime;
+
+    /**
+     * 品质等级
+     */
+    private String qualityLv;
 }

+ 5 - 0
hx-sale/src/main/java/com/fjhx/sale/entity/sale/po/SaleQuotation.java

@@ -142,4 +142,9 @@ public class SaleQuotation extends BasePo {
      * 业务成本总金额
      */
     private BigDecimal businessCostAmount;
+
+    /**
+     * 品质等级
+     */
+    private String qualityLv;
 }

+ 3 - 2
hx-sale/src/main/resources/mapper/ext/ExtQuotationMapper.xml

@@ -28,9 +28,10 @@
                      eq.sale_quotation_id,
                      eq.last_follow_time,
                      eq.of_company_id,
-                     eq.create_product_status
+                     eq.create_product_status,
+                     eq.quality_lv
               from ext_quotation eq
-                  ${ew.customSqlSegment}
+                     ${ew.customSqlSegment}
        </select>
 
 </mapper>