Browse Source

问题处理

yzc 1 năm trước cách đây
mục cha
commit
4c257c6ff2

+ 3 - 1
hx-mes/src/main/java/com/fjhx/mes/service/work/impl/WorkOrderServiceImpl.java

@@ -326,6 +326,7 @@ public class WorkOrderServiceImpl extends ServiceImpl<WorkOrderMapper, WorkOrder
         boolean update = this.update(q -> q
                 .eq(WorkOrder::getId, dto.getId())
                 .set(WorkOrder::getProductionQuantity, dto.getProductionQuantity())
+                .set(WorkOrder::getStockWaitQuantity, dto.getStockWaitQuantity())
                 .set(BasePo::getUpdateTime, new Date())
                 .set(BasePo::getUpdateUser, SecurityUtils.getUserId())
         );
@@ -350,7 +351,8 @@ public class WorkOrderServiceImpl extends ServiceImpl<WorkOrderMapper, WorkOrder
         }
 
         //根据BOM冻结物料库存
-        if(ObjectUtil.isNotEmpty(dto.getProductionQuantity())) {
+        if(ObjectUtil.isNotEmpty(workOrder.getProductionQuantity())) {
+            dto.setProductId(workOrder.getProductId());
             freezeMaterial(dto);
         }
     }

+ 4 - 1
hx-mes/src/main/resources/mapper/production/ProductionTaskDetailMapper.xml

@@ -23,7 +23,10 @@
         from production_task_detail ptd
             left JOIN production_task_processes_detail ptpd ON ptpd.production_task_id = ptd.production_task_id
             AND ptpd.production_processes_id = ptd.production_processes_id
-            LEFT JOIN bytesailing_jxst.sales_contract_details scd ON scd.sales_contract_id = ptd.id
+            LEFT JOIN production_task pt ON ptd.production_task_id = pt.id
+            LEFT JOIN production_plan pp ON pt.production_plan_id = pp.id
+            LEFT JOIN work_order wo ON pp.work_order_id = wo.id
+            LEFT JOIN bytesailing_jxst.sales_contract_details scd ON wo.contract_details_id = scd.id
             AND scd.del_flag =0
             ${ew.customSqlSegment}
     </select>