任务明细接口添加上一工序流转记录id，流转记录排序改为升序，物料分页添加库存阈值

hx-item/src/main/resources/mapper/product/ProductInfoMapper.xml

@@ -22,7 +22,8 @@
             pi.bar_code,
             IF(DATEDIFF(now(),pi.create_time)> json_unquote( victoriatourist_json -> '$.growUpDay' ),3,IF( DATEDIFF(now(),pi.create_time)> json_unquote( victoriatourist_json -> '$.newProductsDay' ), 2, 1 )) AS lifeCycle,
             pi.unit_price,
-            pi.standard_json
+            pi.standard_json,
+            pi.stock_threshold
         FROM
             product_info pi
                 LEFT JOIN bytesailing_mes.applicable_products aps ON aps.product_id = pi.id

hx-mes/src/main/java/com/fjhx/mes/entity/production/po/ProductionTaskDetail.java

@@ -88,4 +88,9 @@ public class ProductionTaskDetail extends BasePo {
      */
     private Integer processesStatus;
 
+    /**
+     * 前一道工序记录id
+     */
+    private Long previousProcessesRecordId;
+
 }

hx-mes/src/main/java/com/fjhx/mes/service/production/impl/ProductionTaskDetailServiceImpl.java

@@ -622,7 +622,7 @@ public class ProductionTaskDetailServiceImpl extends ServiceImpl<ProductionTaskD
         //赋值工序提交记录
         List<ProductionTaskDetailRecord> productionTaskDetailRecordList = productionTaskDetailRecordService.list(q -> q
                 .eq(ProductionTaskDetailRecord::getProductionTaskDetailId, id)
-                .orderByDesc(ProductionTaskDetailRecord::getCreateTime)
+                .orderByAsc(ProductionTaskDetailRecord::getCreateTime)
         );
         List<ProductionTaskDetailRecordVo> productionTaskDetailRecordVos = BeanUtil.copyToList(productionTaskDetailRecordList, ProductionTaskDetailRecordVo.class);
         //赋值工序名称
@@ -636,6 +636,18 @@ public class ProductionTaskDetailServiceImpl extends ServiceImpl<ProductionTaskD
 
         productionTaskDetailVo.setProductionTaskDetailRecordList(productionTaskDetailRecordVos);
 
+
+        //赋值上一工序流转记录Id
+        List<Long> previousProcessesRecordIds = productionTaskDetailRecordService.listObject(ProductionTaskDetailRecord::getId,q -> q
+                .eq(ProductionTaskDetailRecord::getProductionTaskDetailId, id)
+                .eq(ProductionTaskDetailRecord::getProductionProcessesId, productionTaskDetailVo.getPreviousProcessesId())
+                .orderByDesc(ProductionTaskDetailRecord::getCreateTime)
+        );
+        if(ObjectUtil.isNotEmpty(previousProcessesRecordIds)){
+            productionTaskDetailVo.setPreviousProcessesRecordId(previousProcessesRecordIds.get(0));
+        }
+
+
         return productionTaskDetailVo;
     }
 

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

@@ -134,7 +134,8 @@
             ptd.received_time,
             ptd.previous_processes_id,
             ptd.processes_status,
-            scd.product_remark
+            scd.product_remark,
+            wo.id workOrderId
         FROM
             production_task_detail ptd
                 LEFT JOIN production_task pt ON ptd.production_task_id = pt.id