Browse Source

待采购添加生产标签

yzc 1 year ago
parent
commit
4f3d09ed7c

+ 5 - 0
hx-purchase/src/main/java/com/fjhx/purchase/entity/subscribe/vo/SubscribeDetailVo.java

@@ -120,5 +120,10 @@ public class SubscribeDetailVo extends SubscribeDetail {
      */
     private BigDecimal productHeight;
 
+    /**
+     * 合同生产标签
+     */
+    private String prodTag;
+
 
 }

+ 4 - 2
hx-purchase/src/main/resources/mapper/subscribe/SubscribeDetailMapper.xml

@@ -12,7 +12,8 @@
                       t2.required_arrival_time AS requiredArrivalTime,
                       t2.put_warehouse_id      AS putWarehouseId,
                       t2.flow_id,
-                      t2.company_id            AS corporationId
+                      t2.company_id            AS corporationId,
+                      null                     AS prodTag
                FROM subscribe_detail t1
                         LEFT JOIN subscribe t2 ON t1.subscribe_id = t2.id
                    AND t1.data_type = 0
@@ -27,7 +28,8 @@
                       null           AS requiredArrivalTime,
                       null           AS putWarehouseId,
                       t2.flow_id,
-                      null           AS corporationId
+                      null           AS corporationId,
+                      t2.prod_tag    AS prodTag
                FROM subscribe_detail t1
                         LEFT JOIN contract t2 ON t1.contract_id = t2.id
                WHERE t1.data_type = 1)) t2