Selaa lähdekoodia

增加直接出库数量

yzc 1 vuosi sitten
vanhempi
commit
d417ebc012

+ 1 - 4
hx-mes/src/main/java/com/fjhx/mes/entity/work/dto/WorkOrderDto.java

@@ -16,8 +16,5 @@ import java.math.BigDecimal;
 @Setter
 public class WorkOrderDto extends WorkOrder {
 
-    /**
-     * 待出库数量
-     */
-    private BigDecimal stockWaitQuantity;
+
 }

+ 5 - 0
hx-mes/src/main/java/com/fjhx/mes/entity/work/po/WorkOrder.java

@@ -78,6 +78,11 @@ public class WorkOrder extends BasePo {
     private BigDecimal productionQuantity;
 
     /**
+     * 工单直接出库数量
+     */
+    private BigDecimal stockWaitQuantity;
+
+    /**
      * 合同明细id
      */
     private Long contractDetailsId;

+ 2 - 1
hx-mes/src/main/resources/mapper/work/WorkOrderMapper.xml

@@ -20,7 +20,8 @@
                      wo.production_quantity - ifnull(sum(pp.quantity), 0) AS remainingQuantity,
                      wo.bom_status,
                      wo.technology_status,
-                     wo.production_quantity
+                     wo.production_quantity,
+                     wo.stock_wait_quantity
               FROM work_order wo
                        LEFT JOIN bytesailing_jxst.sales_contract sc ON wo.source_id = sc.id
                        LEFT JOIN production_plan pp ON pp.work_order_id = wo.id