yzc 1 anno fa
parent
commit
c550ddd0cb

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

@@ -93,11 +93,11 @@ public class ProductionTaskDetailServiceImpl extends ServiceImpl<ProductionTaskD
     public Page<ProductionTaskDetailVo> circulationPage(ProductionTaskDetailSelectDto dto) {
         IWrapper<ProductionTaskDetail> wrapper = getWrapper();
         //过滤负责人为自己的任务
-        wrapper.eq(ProductionTaskDetail::getPersonLiableId, SecurityUtils.getUserId());
+        wrapper.eq("ptd",ProductionTaskDetail::getPersonLiableId, SecurityUtils.getUserId());
         //过滤未在流转的记录
-        wrapper.eq(ProductionTaskDetail::getCirculationStatus, 0);
+        wrapper.eq("ptd",ProductionTaskDetail::getCirculationStatus, 0);
         //过滤未完成的记录
-        wrapper.eq(ProductionTaskDetail::getFinishStatus, 0);
+        wrapper.eq("ptd",ProductionTaskDetail::getFinishStatus, 0);
         return pageCom(wrapper, dto);
     }
 

+ 2 - 0
hx-mes/src/main/java/com/fjhx/mes/service/production/impl/ProductionTaskServiceImpl.java

@@ -195,6 +195,8 @@ public class ProductionTaskServiceImpl extends ServiceImpl<ProductionTaskMapper,
         stockWait.setType(2);//出库
         stockWait.setStatus(0);//待出库
         stockWait.setBusinessType(StockWaitType.PRODUCTION_TASK_OUT.getDetailType());//生产任务出库
+        stockWait.setBusinessCode(productionTaskDto.getCode());
+        stockWait.setBusinessId(productionTaskDto.getId());
         stockWaitService.save(stockWait);
         //创建待出库明细
         List<StockWaitDetails> stockWaitDetailsList = new ArrayList<>();

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

@@ -131,7 +131,11 @@
             scd.product_remark
         FROM
             production_task_detail ptd
-                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>