派工单修改

src/main/java/com/dsic/gj_erp/bean/jhgk/DmYdjhLj.java

@@ -213,17 +213,34 @@ public class DmYdjhLj implements Serializable {
     @TableId(value = "id", type = IdType.ASSIGN_UUID)
     private String id;
 
-
+    // 加工表示
     private String qbs;
-
     private String pkbs;
     private String dmbs;
 
-    private String qdr;
 
+    // 导入标识
+    private String qdr;
     private String pkdr;
     private String dmdr;
 
 
+    private  String dscdw;
+    private  String dscry;
+    private  String djsry;
+    private  String djsrq;
+
+
+    private  String qscdw;
+    private  String qscry;
+    private  String qjsry;
+    private  String qjsrq;
+
+    private  String pscdw;
+    private  String pscry;
+    private  String pjsry;
+    private  String pjsrq;
+
+
 
 }

src/main/java/com/dsic/gj_erp/bean/pgd/PgdPwjh.java

@@ -114,4 +114,6 @@ public class PgdPwjh implements Serializable {
     private  String scry;
     private  String jsry;
     private  String jsrq;
+
+    private String  pwlsh;
 }

src/main/java/com/dsic/gj_erp/bean/pgd/PgdQgjh.java

@@ -139,5 +139,5 @@ public class PgdQgjh implements Serializable {
     private  String scry;
     private  String jsry;
     private  String jsrq;
-
+    private String  qglsh;
 }

src/main/java/com/dsic/gj_erp/bean/pgd/PgdSljh.java

@@ -129,5 +129,5 @@ public class PgdSljh implements Serializable {
     private  String jsry;
     private  String jsrq;
 
-
+    private String  sllsh;
 }

src/main/java/com/dsic/gj_erp/controller/pgd/PgdDmjhController.java

@@ -9,6 +9,7 @@ import com.dsic.gj_erp.bean.jhgk.DmYdjhLj;
 import com.dsic.gj_erp.bean.pgd.PgdDmjh;
 import com.dsic.gj_erp.bean.pgd.PgdDmjh;
 import com.dsic.gj_erp.exception.CustomException;
+import com.dsic.gj_erp.service.jhgk.DmYdjhLjService;
 import com.dsic.gj_erp.service.pgd.PgdDmjhService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -33,20 +34,25 @@ public class PgdDmjhController {
     @Autowired
     PgdDmjhService pgdDmjhService;
 
+    @Autowired
+    DmYdjhLjService dmYdjhLjService;
+
 
 
     @PostMapping("/getDmPgd")
     @ResponseBody
     public ResultBean getDmPgd(HttpServletRequest req, @RequestBody Map map) throws Exception, CustomException {
-        QueryWrapper<PgdDmjh> qw =new QueryWrapper<>();
+        QueryWrapper<DmYdjhLj> qw =new QueryWrapper<>();
 
 
         qw.eq(StrUtil.isNotEmpty((String)map.get("dcch")),"czbh",(String)map.get("dcch"));
         qw.eq(StrUtil.isNotEmpty((String)map.get("pl")),"pl",(String)map.get("pl"));
         qw.eq(StrUtil.isNotEmpty((String)map.get("fd")),"fd",(String)map.get("fd"));
-        qw.eq(StrUtil.isNotEmpty((String)map.get("zt")),"zt",(String)map.get("zt"));
+        qw.eq(StrUtil.isNotEmpty((String)map.get("zt")),"dm_zt",(String)map.get("zt"));
+
+        qw.eq("dmbs","Y");
         qw.orderBy(true,true,"czbh","pl","fd");
-        return new ResultBean(pgdDmjhService.list(qw));
+        return new ResultBean(dmYdjhLjService.list(qw));
 
     }
 
@@ -83,5 +89,13 @@ public class PgdDmjhController {
         return new ResultBean();
     }
 
+    @PostMapping("/saveDmPgdJs")
+    @ResponseBody
+    @AuthFunction
+    public ResultBean saveDmPgdJs(HttpServletRequest req, @RequestBody List<DmYdjhLj>list) throws Exception, CustomException {
+        pgdDmjhService.saveDmPgdJs(list,req);
+        return new ResultBean();
+    }
+
 }
 

src/main/java/com/dsic/gj_erp/controller/pgd/PgdPkjhController.java

@@ -39,7 +39,7 @@ public class PgdPkjhController {
 
     @PostMapping("/getPkPgd")
     @ResponseBody
-    public ResultBean getQmPgd(HttpServletRequest req, @RequestBody Map map) throws Exception, CustomException {
+    public ResultBean getPkPgd(HttpServletRequest req, @RequestBody Map map) throws Exception, CustomException {
         QueryWrapper<DmYdjhLj> qw =new QueryWrapper<>();
 
 
@@ -48,7 +48,7 @@ public class PgdPkjhController {
         qw.eq(StrUtil.isNotEmpty((String)map.get("fd")),"fd",(String)map.get("fd"));
         qw.eq(StrUtil.isNotEmpty((String)map.get("zt")),"pk_zt",(String)map.get("zt"));
 
-        qw.eq("pkdr","Y");
+        qw.eq("pkbs","Y");
         qw.orderBy(true,true,"czbh","pl","fd");
         return new ResultBean(dmYdjhLjService.list(qw));
 
@@ -87,7 +87,13 @@ public class PgdPkjhController {
         pgdPkjhService.savePkFk(list,req);
         return new ResultBean();
     }
-
+    @PostMapping("/savePkPgdJs")
+    @ResponseBody
+    @AuthFunction
+    public ResultBean savePkPgdJs(HttpServletRequest req, @RequestBody List<DmYdjhLj>list) throws Exception, CustomException {
+        pgdPkjhService.savePkPgdJs(list,req);
+        return new ResultBean();
+    }
 
 }
 

src/main/java/com/dsic/gj_erp/controller/pgd/PgdQmjhController.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.dsic.gj_erp.annotation.AuthFunction;
 import com.dsic.gj_erp.bean.ResultBean;
 import com.dsic.gj_erp.bean.jhgk.DmYdjhLj;
+import com.dsic.gj_erp.bean.pgd.PgdQgjh;
 import com.dsic.gj_erp.bean.pgd.PgdQmjh;
 import com.dsic.gj_erp.bean.pgd.PgdQmjh;
 import com.dsic.gj_erp.bean.pgd.Qmqz;
@@ -48,12 +49,21 @@ public class PgdQmjhController {
         qw.eq(StrUtil.isNotEmpty((String)map.get("pl")),"pl",(String)map.get("pl"));
         qw.eq(StrUtil.isNotEmpty((String)map.get("fd")),"fd",(String)map.get("fd"));
         qw.eq(StrUtil.isNotEmpty((String)map.get("zt")),"qjg_zt",(String)map.get("zt"));
-        qw.eq("qdr","Y");
+        qw.eq("qbs","Y");
         qw.orderBy(true,true,"czbh","pl","fd");
         return new ResultBean(dmYdjhLjService.list(qw));
 
     }
 
+    @PostMapping("/saveQmPgdJs")
+    @ResponseBody
+    @AuthFunction
+    public ResultBean saveQmPgdJs(HttpServletRequest req, @RequestBody List<DmYdjhLj> list) throws Exception, CustomException {
+        pgdQmjhService.saveQmPgdJs(list,req);
+        return new ResultBean();
+    }
+
+
     @PostMapping("/saveQmPgdXd")
     @ResponseBody
     @AuthFunction

src/main/java/com/dsic/gj_erp/service/pgd/PgdDmjhService.java

@@ -20,6 +20,7 @@ import java.util.List;
 public interface PgdDmjhService extends IService<PgdDmjh> {
 
     void  saveDmPgdXd(List<DmYdjhLj> dmjhs, HttpServletRequest request);
+    void  saveDmPgdJs(List<DmYdjhLj> dmjhs, HttpServletRequest request);
     void  saveDmPgdFk(List<DmYdjhLj> dmjhs, HttpServletRequest request);
     void  saveDmPgdXdBack(List<DmYdjhLj> dmjhs, HttpServletRequest request);
     void  saveDmFk(List<DmYdjhLj> dmjhs, HttpServletRequest request);

src/main/java/com/dsic/gj_erp/service/pgd/PgdPkjhService.java

@@ -17,6 +17,7 @@ import java.util.List;
  * @since 2023-11-13
  */
 public interface PgdPkjhService extends IService<PgdPkjh> {
+    void  savePkPgdJs(List<DmYdjhLj> pkjhs, HttpServletRequest request);
     void  savePkPgdXd(List<DmYdjhLj> pkjhs, HttpServletRequest request);
     void  savePkPgdFk(List<DmYdjhLj> pkjhs, HttpServletRequest request);
     void  savePkFk(List<DmYdjhLj> pkjhs, HttpServletRequest request);

src/main/java/com/dsic/gj_erp/service/pgd/PgdQmjhService.java

@@ -20,6 +20,7 @@ import java.util.Map;
  */
 public interface PgdQmjhService extends IService<PgdQmjh> {
 
+    void  saveQmPgdJs(List<DmYdjhLj> qmjhs, HttpServletRequest request);
     void  saveQmPgdXd(List<DmYdjhLj> qmjhs, HttpServletRequest request);
     void  saveQmPgdFk(List<DmYdjhLj> qmjhs, HttpServletRequest request);
     void  saveQmFk(List<DmYdjhLj> qmjhs, HttpServletRequest request);

src/main/java/com/dsic/gj_erp/service/pgd/impl/PgdDmjhServiceImpl.java

@@ -38,6 +38,8 @@ public class PgdDmjhServiceImpl extends ServiceImpl<PgdDmjhMapper, PgdDmjh> impl
             DmYdjhLj e= new DmYdjhLj();
             e.setDmXfry((String) request.getAttribute("yhms"));
             e.setDmXfrq(DateUtil.format(DateUtil.date(), "yyyy/MM/dd HH:mm:ss"));
+            e.setDscdw(f.getDscdw());
+            e.setDscry(f.getDscry());
             e.setDmZt("02");
             e.setId(f.getId());
             ups.add(e);
@@ -45,6 +47,20 @@ public class PgdDmjhServiceImpl extends ServiceImpl<PgdDmjhMapper, PgdDmjh> impl
         dmYdjhLjService.updateBatchById(ups);
     }
 
+    @Override
+    public void saveDmPgdJs(List<DmYdjhLj> dmjhs, HttpServletRequest request) {
+        List<DmYdjhLj>ups= new ArrayList<>();
+        dmjhs.forEach(f->{
+            DmYdjhLj e= new DmYdjhLj();
+            e.setDjsry((String) request.getAttribute("yhms"));
+            e.setDjsrq(DateUtil.format(DateUtil.date(), "yyyy/MM/dd HH:mm:ss"));
+            e.setDmZt("03");
+            e.setId(f.getId());
+            ups.add(e);
+        });
+        dmYdjhLjService.updateBatchById(ups);
+    }
+
     @Override
     public void saveDmPgdFk(List<DmYdjhLj> dmjhs, HttpServletRequest request) {
         List<DmYdjhLj>ups= new ArrayList<>();
@@ -52,7 +68,7 @@ public class PgdDmjhServiceImpl extends ServiceImpl<PgdDmjhMapper, PgdDmjh> impl
             DmYdjhLj e= new DmYdjhLj();
             e.setDmFkry((String) request.getAttribute("yhms"));
             e.setDmFkrq(DateUtil.format(DateUtil.date(), "yyyy/MM/dd HH:mm:ss"));
-            e.setDmZt("09");
+            e.setDmZt("04");
             e.setDmFkyy(f.getDmFkyy());
             e.setId(f.getId());
             ups.add(e);

src/main/java/com/dsic/gj_erp/service/pgd/impl/PgdPkjhServiceImpl.java

@@ -30,6 +30,20 @@ public class PgdPkjhServiceImpl extends ServiceImpl<PgdPkjhMapper, PgdPkjh> impl
     @Autowired
     DmYdjhLjService dmYdjhLjService;
 
+    @Override
+    public void savePkPgdJs(List<DmYdjhLj> pkjhs, HttpServletRequest request) {
+        List<DmYdjhLj>ups= new ArrayList<>();
+        pkjhs.forEach(f->{
+            DmYdjhLj e= new DmYdjhLj();
+            e.setPjsry((String) request.getAttribute("yhms"));
+            e.setPjsrq(DateUtil.format(DateUtil.date(), "yyyy/MM/dd HH:mm:ss"));
+            e.setPkZt("03");
+            e.setId(f.getId());
+            ups.add(e);
+        });
+        dmYdjhLjService.updateBatchById(ups);
+    }
+
     @Override
     public void savePkPgdXd(List<DmYdjhLj> pkjhs, HttpServletRequest request) {
         List<DmYdjhLj>ups= new ArrayList<>();
@@ -37,6 +51,8 @@ public class PgdPkjhServiceImpl extends ServiceImpl<PgdPkjhMapper, PgdPkjh> impl
             DmYdjhLj e= new DmYdjhLj();
             e.setPkXfry((String) request.getAttribute("yhms"));
             e.setPkXfrq(DateUtil.format(DateUtil.date(), "yyyy/MM/dd HH:mm:ss"));
+            e.setPscdw(f.getPscdw());
+            e.setPscry(f.getPscry());
             e.setPkZt("02");
             e.setId(f.getId());
             ups.add(e);
@@ -51,7 +67,7 @@ public class PgdPkjhServiceImpl extends ServiceImpl<PgdPkjhMapper, PgdPkjh> impl
             DmYdjhLj e= new DmYdjhLj();
             e.setPkFkry((String) request.getAttribute("yhms"));
             e.setPkFkrq(DateUtil.format(DateUtil.date(), "yyyy/MM/dd HH:mm:ss"));
-            e.setPkZt("09");
+            e.setPkZt("04");
             e.setPkFkyy(f.getPkFkyy());
             e.setId(f.getId());
             ups.add(e);

src/main/java/com/dsic/gj_erp/service/pgd/impl/PgdQmjhServiceImpl.java

@@ -38,6 +38,20 @@ public class PgdQmjhServiceImpl extends ServiceImpl<PgdQmjhMapper, PgdQmjh> impl
     @Autowired
     DmYdjhLjService dmYdjhLjService;
 
+    @Override
+    public void saveQmPgdJs(List<DmYdjhLj> qmjhs, HttpServletRequest request) {
+        List<DmYdjhLj>ups= new ArrayList<>();
+        qmjhs.forEach(f->{
+            DmYdjhLj e= new DmYdjhLj();
+            e.setQjsry((String) request.getAttribute("yhms"));
+            e.setQjsrq(DateUtil.format(DateUtil.date(), "yyyy/MM/dd HH:mm:ss"));
+            e.setQjgZt("03");
+            e.setId(f.getId());
+            ups.add(e);
+        });
+        dmYdjhLjService.updateBatchById(ups);
+
+    }
 
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -47,6 +61,8 @@ public class PgdQmjhServiceImpl extends ServiceImpl<PgdQmjhMapper, PgdQmjh> impl
             DmYdjhLj e= new DmYdjhLj();
             e.setQjgXfry((String) request.getAttribute("yhms"));
             e.setQjgXfrq(DateUtil.format(DateUtil.date(), "yyyy/MM/dd HH:mm:ss"));
+            e.setQscdw(f.getQscdw());
+            e.setQscry(f.getQscry());
             e.setQjgZt("02");
             e.setId(f.getId());
             ups.add(e);
@@ -62,8 +78,7 @@ public class PgdQmjhServiceImpl extends ServiceImpl<PgdQmjhMapper, PgdQmjh> impl
             DmYdjhLj e= new DmYdjhLj();
             e.setQjgFkry((String) request.getAttribute("yhms"));
             e.setQjgFkrq(DateUtil.format(DateUtil.date(), "yyyy/MM/dd HH:mm:ss"));
-            e.setQjgZt("09");
-            e.setQjgFkyy(f.getQjgFkyy());
+            e.setQjgZt("04");
             e.setId(f.getId());
             ups.add(e);
         });