diff --git a/src/main/java/com/dsic/gj_erp/controller/zyjh/ZyjhController.java b/src/main/java/com/dsic/gj_erp/controller/zyjh/ZyjhController.java
index b006c3b..b517312 100644
--- a/src/main/java/com/dsic/gj_erp/controller/zyjh/ZyjhController.java
+++ b/src/main/java/com/dsic/gj_erp/controller/zyjh/ZyjhController.java
@@ -1,16 +1,15 @@
 package com.dsic.gj_erp.controller.zyjh;
 
 import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.ObjUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.dsic.gj_erp.bean.ResultBean;
 import com.dsic.gj_erp.bean.jhgk.DmYdjh;
 import com.dsic.gj_erp.bean.zyjh.YcldwInfo;
-import com.dsic.gj_erp.controller.zyjh.dto.DaoDuo;
-import com.dsic.gj_erp.controller.zyjh.dto.ShangLiao;
-import com.dsic.gj_erp.controller.zyjh.dto.SljhSearch;
-import com.dsic.gj_erp.exception.CustomException;
+import com.dsic.gj_erp.controller.zyjh.dto.*;
+import com.dsic.gj_erp.exception.ServiceException;
 import com.dsic.gj_erp.service.zyjh.YcldwInfoService;
 import com.dsic.gj_erp.service.zyjh.YcldwService;
 import com.dsic.gj_erp.service.zyjh.ZyjhService;
@@ -19,6 +18,7 @@ import lombok.AllArgsConstructor;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
+import java.lang.reflect.Field;
 import java.util.List;
 
 @RestController
@@ -34,6 +34,44 @@ public class ZyjhController {
 
     private final WsHandler wsHandler;
 
+    /**
+     * 作业计划执行,派工&反馈
+     */
+    @PostMapping("zx")
+    public ResultBean<?> zx(@RequestBody PgDto dto) {
+        List<DmYdjh> list=dto.getList();
+        try {
+            Field field=DmYdjh.class.getField(dto.getField());
+            if (ObjUtil.isNotEmpty(field)){
+                field.setAccessible(true);
+                String date=DateUtil.date().toString("yyyy/MM/dd");
+                for(DmYdjh dmYdjh:list){
+                    field.set(dmYdjh,date);
+                }
+            }
+            zyjhService.updateBatchById(list);
+            return new ResultBean<>();
+        } catch (NoSuchFieldException | IllegalAccessException e) {
+            throw new ServiceException(10001,"属性字段不存在");
+        }
+    }
+
+    /**
+     * 派工单查询
+     */
+    @PostMapping("pgd")
+    public ResultBean<?> pgd(@RequestBody PgdSearch search){
+        List<DmYdjh> list = zyjhService.list(Wrappers.<DmYdjh>query()
+                //执行查询
+                .eq(StrUtil.isNotEmpty(search.getField()),search.getField(),search.getUser())
+                .le(StrUtil.isNotEmpty(search.getJhrqField()),search.getJhrqField(), DateUtil.date().toString("yyyy/MM/dd"))
+                //跟踪查询
+                .eq(StrUtil.isNotEmpty(search.getXqrq()),"xqrq",search.getXqrq())
+        );
+        return new ResultBean<>(list);
+    }
+
+
     /**
      * 获取上料计划,所有派工单数据整合到月度计划中统一管理,
      * 单独的派工单页面需要进行调整,从月度计划中获取对应工序数据
@@ -62,11 +100,14 @@ public class ZyjhController {
         return new ResultBean<>(ycldwService.ycldwList());
     }
 
+    /**
+     * 上料
+     */
     @PostMapping("sl")
     @Transactional(rollbackFor = Exception.class)
-    public ResultBean<?> sl(@RequestBody ShangLiao sl) throws CustomException {
+    public ResultBean<?> sl(@RequestBody ShangLiao sl) {
         if (!sl.checkCkwp()){
-            //throw new CustomException(10009,"物品库存不存在,或库存信息错误");
+            throw new ServiceException(10009,"物品库存不存在,或库存信息错误");
         }
 
         //更新预处理垛位信息
diff --git a/src/main/java/com/dsic/gj_erp/controller/zyjh/dto/PgDto.java b/src/main/java/com/dsic/gj_erp/controller/zyjh/dto/PgDto.java
new file mode 100644
index 0000000..37585d8
--- /dev/null
+++ b/src/main/java/com/dsic/gj_erp/controller/zyjh/dto/PgDto.java
@@ -0,0 +1,14 @@
+package com.dsic.gj_erp.controller.zyjh.dto;
+
+import com.dsic.gj_erp.bean.jhgk.DmYdjh;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.List;
+
+@Getter
+@Setter
+public class PgDto {
+    private String field;
+    private List<DmYdjh> list;
+}
diff --git a/src/main/java/com/dsic/gj_erp/controller/zyjh/dto/PgdSearch.java b/src/main/java/com/dsic/gj_erp/controller/zyjh/dto/PgdSearch.java
new file mode 100644
index 0000000..51b3b33
--- /dev/null
+++ b/src/main/java/com/dsic/gj_erp/controller/zyjh/dto/PgdSearch.java
@@ -0,0 +1,17 @@
+package com.dsic.gj_erp.controller.zyjh.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class PgdSearch {
+
+    //执行查询
+    private String field;
+    private String user;
+    private String jhrqField;
+
+    //跟踪查询条件
+    private String xqrq;
+}