Browse Source

杰生 定时任务指定面料统计

home 2 năm trước cách đây
mục cha
commit
78d2976428

+ 1 - 1
hx-common/service-flow/src/main/java/com/fjhx/controller/process/ProcessTenantController.java

@@ -62,7 +62,7 @@ public class ProcessTenantController {
     }
 
     /**
-     * 添加流程版本
+     * 获取流程详情
      */
     @PostMapping("/getDetails")
     public R addVersion(@RequestBody ProcessTenant processTenant) {

+ 4 - 0
hx-service-api/service-flow-api/src/main/java/com/fjhx/entity/process/ProcessTenant.java

@@ -50,4 +50,8 @@ public class ProcessTenant implements Serializable {
      */
     private Integer currentVersion;
 
+    private String nodeObject;
+
+    private String lineObject;
+
 }

+ 2 - 0
hx-service/storage/src/main/java/com/fjhx/stock/service/impl/StockBackPlanServiceImpl.java

@@ -131,6 +131,7 @@ public class StockBackPlanServiceImpl extends ServiceImpl<StockBackPlanMapper, S
                 .in("swd.StockChangeType", 20, 23)
                 .eq("uu.IsDelete", 0)
                 .in("uu.DepartmentID", "A007", "A008", "A012")
+                .likeRight("m.Code", "01.")
                 .isNotNull("uu.JobNo");
 
         // 查询出库
@@ -187,6 +188,7 @@ public class StockBackPlanServiceImpl extends ServiceImpl<StockBackPlanMapper, S
         QueryWrapper<Object> backWrapper = Wrappers.query()
                 .ge("swd.CreatedTime", DateUtil.format(beginDate, "yyyy-MM-dd 9:30:00"))
                 .eq("swd.StockChangeType", 16)
+                .likeRight("m.Code", "01.")
                 .isNotNull("uu.JobNo");
         // 查询回仓
         List<Map<String, Object>> backList = baseMapper.getWater(backWrapper);