派工单修改

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

@@ -122,5 +122,8 @@ public class PgdDmjh implements Serializable {
     @TableId(value = "id", type = IdType.ASSIGN_UUID)
     private String id;
 
-
+    private  String scdw;
+    private  String scry;
+    private  String jsry;
+    private  String jsrq;
 }

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

@@ -126,4 +126,9 @@ public class PgdPkjh implements Serializable {
     private String id;
 
 
+    private  String scdw;
+    private  String scry;
+    private  String jsry;
+    private  String jsrq;
+
 }

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

@@ -110,5 +110,8 @@ public class PgdPwjh implements Serializable {
     @TableId(value = "id", type = IdType.ASSIGN_UUID)
     private String id;
 
-
+    private  String scdw;
+    private  String scry;
+    private  String jsry;
+    private  String jsrq;
 }

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

@@ -135,5 +135,9 @@ public class PgdQgjh implements Serializable {
     @TableId(value = "id", type = IdType.ASSIGN_UUID)
     private String id;
 
+    private  String scdw;
+    private  String scry;
+    private  String jsry;
+    private  String jsrq;
 
 }

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

@@ -118,6 +118,9 @@ public class PgdQmjh implements Serializable {
 
     @TableId(value = "id", type = IdType.ASSIGN_UUID)
     private String id;
-
+    private  String scdw;
+    private  String scry;
+    private  String jsry;
+    private  String jsrq;
 
 }

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

@@ -123,4 +123,11 @@ public class PgdSljh implements Serializable {
     private String id;
 
 
+    private  String dw;
+    private  String scdw;
+    private  String scry;
+    private  String jsry;
+    private  String jsrq;
+
+
 }

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

@@ -80,7 +80,21 @@ public class PgdPwjhController {
         return new ResultBean();
     }
 
+    @PostMapping("/savePwjhPg")
+    @ResponseBody
+    @AuthFunction
+    public ResultBean savePwjhPg(HttpServletRequest req, @RequestBody List<PgdPwjh>list) throws Exception, CustomException {
+        pgdPwjhService.savePwjhPg(list,req);
+        return new ResultBean();
+    }
 
+    @PostMapping("/savePwjhPgBack")
+    @ResponseBody
+    @AuthFunction
+    public ResultBean savePwjhPgBack(HttpServletRequest req, @RequestBody List<PgdPwjh>list) throws Exception, CustomException {
+        pgdPwjhService.savePwjhPgBack(list,req);
+        return new ResultBean();
+    }
 
 }
 

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

@@ -83,6 +83,21 @@ public class PgdQgjhController {
         return new ResultBean();
     }
 
+    @PostMapping("/saveQgjhPg")
+    @ResponseBody
+    @AuthFunction
+    public ResultBean saveQgjhPg(HttpServletRequest req, @RequestBody List<PgdQgjh>list) throws Exception, CustomException {
+        pgdQgjhService.saveQgjhPg(list,req);
+        return new ResultBean();
+    }
+    @PostMapping("/saveQgjhPgBack")
+    @ResponseBody
+    @AuthFunction
+    public ResultBean saveQgjhPgBack(HttpServletRequest req, @RequestBody List<PgdQgjh>list) throws Exception, CustomException {
+        pgdQgjhService.saveQgjhPgBack(list,req);
+        return new ResultBean();
+    }
+
 
 }
 

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

@@ -48,6 +48,25 @@ public class PgdSljhController {
 
     }
 
+
+
+
+    @PostMapping("/saveSljhPg")
+    @ResponseBody
+    @AuthFunction
+    public ResultBean saveSljhPg(HttpServletRequest req, @RequestBody List<PgdSljh> list) throws Exception, CustomException {
+        pgdSljhService.saveSljhPg(list,req);
+        return new ResultBean();
+    }
+
+    @PostMapping("/saveSljhPgBack")
+    @ResponseBody
+    @AuthFunction
+    public ResultBean saveSljhPgBack(HttpServletRequest req, @RequestBody List<PgdSljh> list) throws Exception, CustomException {
+        pgdSljhService.saveSljhPgBack(list,req);
+        return new ResultBean();
+    }
+
     @PostMapping("/saveSljhPgdXd")
     @ResponseBody
     @AuthFunction

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

@@ -6,10 +6,15 @@ 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.jcsj.DmCbxxp;
+import com.dsic.gj_erp.bean.jcsj.DmDwxxp;
+import com.dsic.gj_erp.bean.jcsj.EmSbjgry;
 import com.dsic.gj_erp.bean.pgd.PgdTzjh;
 import com.dsic.gj_erp.exception.CustomException;
 import com.dsic.gj_erp.service.jcsj.DmCbxxpService;
+import com.dsic.gj_erp.service.jcsj.EmSbjgryService;
+import com.dsic.gj_erp.service.jcsj.impl.DmDwxxpService;
 import com.dsic.gj_erp.service.pgd.PgdTzjhService;
+import com.dsic.gj_erp.service.sy.SYService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -36,6 +41,19 @@ public class PgdTzjhController {
     @Autowired
     DmCbxxpService dmCbxxpService;
 
+    @Autowired
+    EmSbjgryService emSbjgryService;
+
+    @Autowired
+    DmDwxxpService dwxxpService;
+
+
+    @Autowired
+    SYService syService;
+
+
+
+
 
     @PostMapping("/getTzjhPgd")
     @ResponseBody
@@ -85,7 +103,15 @@ public class PgdTzjhController {
     public ResultBean getPgdBase(HttpServletRequest req, @RequestBody Map map) throws Exception, CustomException {
         Map returnMap = new HashMap();
         List<DmCbxxp> cbbm = dmCbxxpService.list(new QueryWrapper<DmCbxxp>().orderBy(true, true, "wgbs","cbbm","len(cbbm)"));
+        // 班组人员
+        List<EmSbjgry> gxry = emSbjgryService.list();
+        List<Map> bmbm = syService.em_sbjbb_ZM("bmbm");
+        // 多为
+        List<DmDwxxp> dwxx = dwxxpService.list();
         returnMap.put("cbbm", cbbm);
+        returnMap.put("gxry", gxry);
+        returnMap.put("dwxx", dwxx);
+        returnMap.put("bmbm", bmbm);
 
         return new ResultBean(returnMap);
     }

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

@@ -17,6 +17,11 @@ import java.util.List;
  */
 public interface PgdPwjhService extends IService<PgdPwjh> {
 
+
+
+
+    void  savePwjhPg(List<PgdPwjh> pwjhs, HttpServletRequest request);
+    void  savePwjhPgBack(List<PgdPwjh> pwjhs, HttpServletRequest request);
     void  savePwPgdXd(List<PgdPwjh> pwjhs, HttpServletRequest request);
     void  savePwPgdFk(List<PgdPwjh> pwjhs, HttpServletRequest request);
     void  savePwFk(List<PgdPwjh> pwjhs, HttpServletRequest request);

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

@@ -17,6 +17,8 @@ import java.util.List;
  */
 public interface PgdQgjhService extends IService<PgdQgjh> {
 
+    void  saveQgjhPgBack(List<PgdQgjh> qgjhs, HttpServletRequest request);
+    void  saveQgjhPg(List<PgdQgjh> qgjhs, HttpServletRequest request);
     void  saveQgPgdXd(List<PgdQgjh> qgjhs, HttpServletRequest request);
     void  saveQgPgdFk(List<PgdQgjh> qgjhs, HttpServletRequest request);
     void  saveQgdFk(List<PgdQgjh> qgjhs, HttpServletRequest request);

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

@@ -19,6 +19,8 @@ public interface PgdSljhService extends IService<PgdSljh> {
 
 
     void  saveSljhPgdXd(List<PgdSljh> sljhs, HttpServletRequest request);
+    void  saveSljhPg(List<PgdSljh> sljhs, HttpServletRequest request);
+    void  saveSljhPgBack(List<PgdSljh> sljhs, HttpServletRequest request);
     void  saveSljhPgdFk(List<PgdSljh> sljhs, HttpServletRequest request);
     void  saveSljhFk(List<PgdSljh> sljhs, HttpServletRequest request);
     void  saveSljhPgdXdBack(List<PgdSljh> sljhs, HttpServletRequest request);

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

@@ -23,21 +23,62 @@ import java.util.List;
  */
 @Service
 public class PgdPwjhServiceImpl extends ServiceImpl<PgdPwjhMapper, PgdPwjh> implements PgdPwjhService {
-    @Override
+
     @Transactional(rollbackFor = Exception.class)
-    public void savePwPgdXd(List<PgdPwjh> pwjhs, HttpServletRequest request) {
+    @Override
+    public void savePwjhPg(List<PgdPwjh> sljhs, HttpServletRequest request) {
+
         List<PgdPwjh>ups= new ArrayList<>();
-        pwjhs.forEach(f->{
+        sljhs.forEach(f->{
             PgdPwjh e= new PgdPwjh();
             e.setXfry((String) request.getAttribute("yhms"));
             e.setXfrq(DateUtil.format(DateUtil.date(), "yyyy/MM/dd HH:mm:ss"));
             e.setZt("02");
+            e.setScdw(f.getScdw());
+            e.setScry(f.getScry());
+            e.setId(f.getId());
+            ups.add(e);
+        });
+        this.updateBatchById(ups);
+    }
+
+
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public void savePwjhPgBack(List<PgdPwjh> sljhs, HttpServletRequest request) {
+
+        List<PgdPwjh>ups= new ArrayList<>();
+        sljhs.forEach(f->{
+            PgdPwjh e= new PgdPwjh();
+            e.setXfry("");
+            e.setXfrq("");
+            e.setZt("01");
+            e.setScdw("");
+            e.setScry("");
             e.setId(f.getId());
             ups.add(e);
         });
         this.updateBatchById(ups);
     }
 
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void savePwPgdXd(List<PgdPwjh> pwjhs, HttpServletRequest request) {
+        List<PgdPwjh>ups= new ArrayList<>();
+        pwjhs.forEach(f->{
+            PgdPwjh e= new PgdPwjh();
+            e.setJsry((String) request.getAttribute("yhms"));
+            e.setJsrq(DateUtil.format(DateUtil.date(), "yyyy/MM/dd HH:mm:ss"));
+            e.setZt("03");
+            e.setId(f.getId());
+            ups.add(e);
+        });
+        this.updateBatchById(ups);
+    }
+
+
+
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void savePwPgdFk(List<PgdPwjh> pwjhs, HttpServletRequest request) {
@@ -46,7 +87,7 @@ public class PgdPwjhServiceImpl extends ServiceImpl<PgdPwjhMapper, PgdPwjh> impl
             PgdPwjh e= new PgdPwjh();
             e.setFkry((String) request.getAttribute("yhms"));
             e.setFkrq(DateUtil.format(DateUtil.date(), "yyyy/MM/dd HH:mm:ss"));
-            e.setZt("09");
+            e.setZt("04");
             e.setFkyy(f.getFkyy());
             e.setId(f.getId());
             ups.add(e);
@@ -60,9 +101,9 @@ public class PgdPwjhServiceImpl extends ServiceImpl<PgdPwjhMapper, PgdPwjh> impl
         List<PgdPwjh>ups= new ArrayList<>();
         pwjhs.forEach(f->{
             PgdPwjh e= new PgdPwjh();
-           e.setPwjgry(e.getPwjgry());
+            e.setFkry((String) request.getAttribute("yhms"));
-           e.setPwksrq(e.getPwksrq());
+            e.setFkrq(DateUtil.format(DateUtil.date(), "yyyy/MM/dd HH:mm:ss"));
-           e.setPwjsrq(e.getPwjsrq());
+            e.setZt("04");
             e.setId(f.getId());
             ups.add(e);
         });
@@ -75,10 +116,10 @@ public class PgdPwjhServiceImpl extends ServiceImpl<PgdPwjhMapper, PgdPwjh> impl
         List<PgdPwjh>ups= new ArrayList<>();
         pwjhs.forEach(f->{
             PgdPwjh e= new PgdPwjh();
-            e.setXfry((String) request.getAttribute("yhms"));
+            e.setJsrq("");
-            e.setXfrq(DateUtil.format(DateUtil.date(), "yyyy/MM/dd HH:mm:ss"));
+            e.setJsrq("");
-            if(f.getZt().equals("02")){
+            if(f.getZt().equals("03")){
-                e.setZt("01");
+                e.setZt("02");
             }
             e.setId(f.getId());
             ups.add(e);

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

@@ -24,45 +24,94 @@ import java.util.List;
  */
 @Service
 public class PgdQgjhServiceImpl extends ServiceImpl<PgdQgjhMapper, PgdQgjh> implements PgdQgjhService {
-    @Override
+
+
+
+
+
+
+
     @Transactional(rollbackFor = Exception.class)
-    public void saveQgPgdXd(List<PgdQgjh> qgjhs, HttpServletRequest request) {
+    @Override
+    public void saveQgjhPg(List<PgdQgjh> sljhs, HttpServletRequest request) {
+
         List<PgdQgjh>ups= new ArrayList<>();
-        qgjhs.forEach(f->{
+        sljhs.forEach(f->{
             PgdQgjh e= new PgdQgjh();
             e.setXfry((String) request.getAttribute("yhms"));
             e.setXfrq(DateUtil.format(DateUtil.date(), "yyyy/MM/dd HH:mm:ss"));
             e.setZt("02");
+            e.setScdw(f.getScdw());
+            e.setScry(f.getScry());
             e.setId(f.getId());
             ups.add(e);
         });
         this.updateBatchById(ups);
     }
 
+
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public void saveQgjhPgBack(List<PgdQgjh> sljhs, HttpServletRequest request) {
+
+        List<PgdQgjh>ups= new ArrayList<>();
+        sljhs.forEach(f->{
+            PgdQgjh e= new PgdQgjh();
+            e.setXfry("");
+            e.setXfrq("");
+            e.setZt("01");
+            e.setScdw("");
+            e.setScry("");
+            e.setId(f.getId());
+            ups.add(e);
+        });
+        this.updateBatchById(ups);
+    }
+
+
+
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void saveQgPgdFk(List<PgdQgjh> qgjhs, HttpServletRequest request) {
+    public void saveQgPgdXd(List<PgdQgjh> qgjhs, HttpServletRequest request) {
         List<PgdQgjh>ups= new ArrayList<>();
         qgjhs.forEach(f->{
             PgdQgjh e= new PgdQgjh();
-            e.setFkry((String) request.getAttribute("yhms"));
+            e.setJsry((String) request.getAttribute("yhms"));
-            e.setFkrq(DateUtil.format(DateUtil.date(), "yyyy/MM/dd HH:mm:ss"));
+            e.setJsrq(DateUtil.format(DateUtil.date(), "yyyy/MM/dd HH:mm:ss"));
-            e.setZt("09");
+            e.setZt("03");
-            e.setFkyy(f.getFkyy());
             e.setId(f.getId());
             ups.add(e);
         });
         this.updateBatchById(ups);
     }
 
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void saveQgPgdFk(List<PgdQgjh> qgjhs, HttpServletRequest request) {
+        List<PgdQgjh>ups= new ArrayList<>();
+//        qgjhs.forEach(f->{
+//            PgdQgjh e= new PgdQgjh();
+//            e.setFkry((String) request.getAttribute("yhms"));
+//            e.setFkrq(DateUtil.format(DateUtil.date(), "yyyy/MM/dd HH:mm:ss"));
+//            e.setZt("09");
+//            e.setFkyy(f.getFkyy());
+//            e.setId(f.getId());
+//            ups.add(e);
+//        });
+        this.updateBatchById(ups);
+    }
+
     @Override
     public void saveQgdFk(List<PgdQgjh> qgjhs, HttpServletRequest request) {
         List<PgdQgjh>ups= new ArrayList<>();
         qgjhs.forEach(f->{
             PgdQgjh e= new PgdQgjh();
-              e.setQgry(f.getQgry());
+//              e.setQgry(f.getQgry());
-             e.setQgksrq(f.getQgksrq());
+//             e.setQgksrq(f.getQgksrq());
-             e.setQgjsrq(f.getQgjsrq());
+//             e.setQgjsrq(f.getQgjsrq());
+            e.setFkry((String) request.getAttribute("yhms"));
+            e.setFkrq(DateUtil.format(DateUtil.date(), "yyyy/MM/dd HH:mm:ss"));
+            e.setZt("04");
             e.setId(f.getId());
             ups.add(e);
         });
@@ -75,10 +124,10 @@ public class PgdQgjhServiceImpl extends ServiceImpl<PgdQgjhMapper, PgdQgjh> impl
         List<PgdQgjh>ups= new ArrayList<>();
         qgjhs.forEach(f->{
             PgdQgjh e= new PgdQgjh();
-            e.setXfry((String) request.getAttribute("yhms"));
+            e.setJsrq("");
-            e.setXfrq(DateUtil.format(DateUtil.date(), "yyyy/MM/dd HH:mm:ss"));
+            e.setJsrq("");
-            if(f.getZt().equals("02")){
+            if(f.getZt().equals("03")){
-                e.setZt("01");
+                e.setZt("02");
             }
             e.setId(f.getId());
             ups.add(e);

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

@@ -36,9 +36,10 @@ public class PgdSljhServiceImpl extends ServiceImpl<PgdSljhMapper, PgdSljh> impl
 
     private final RedisTemplate<String,Object> redisTemplate;
 
+
     @Transactional(rollbackFor = Exception.class)
     @Override
-    public void saveSljhPgdXd(List<PgdSljh> sljhs, HttpServletRequest request) {
+    public void saveSljhPg(List<PgdSljh> sljhs, HttpServletRequest request) {
 
         List<PgdSljh>ups= new ArrayList<>();
         sljhs.forEach(f->{
@@ -46,6 +47,46 @@ public class PgdSljhServiceImpl extends ServiceImpl<PgdSljhMapper, PgdSljh> impl
             e.setXfry((String) request.getAttribute("yhms"));
             e.setXfrq(DateUtil.format(DateUtil.date(), "yyyy/MM/dd HH:mm:ss"));
             e.setZt("02");
+            e.setDw(f.getDw());
+            e.setScdw(f.getScdw());
+            e.setScry(f.getScry());
+            e.setId(f.getId());
+            ups.add(e);
+        });
+        this.updateBatchById(ups);
+    }
+
+
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public void saveSljhPgBack(List<PgdSljh> sljhs, HttpServletRequest request) {
+
+        List<PgdSljh>ups= new ArrayList<>();
+        sljhs.forEach(f->{
+            PgdSljh e= new PgdSljh();
+            e.setXfry("");
+            e.setXfrq("");
+            e.setZt("01");
+            e.setDw("");
+            e.setScdw("");
+            e.setScry("");
+            e.setId(f.getId());
+            ups.add(e);
+        });
+        this.updateBatchById(ups);
+    }
+
+
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public void saveSljhPgdXd(List<PgdSljh> sljhs, HttpServletRequest request) {
+
+        List<PgdSljh>ups= new ArrayList<>();
+        sljhs.forEach(f->{
+            PgdSljh e= new PgdSljh();
+            e.setJsry((String) request.getAttribute("yhms"));
+            e.setJsrq(DateUtil.format(DateUtil.date(), "yyyy/MM/dd HH:mm:ss"));
+            e.setZt("03");
             e.setId(f.getId());
             ups.add(e);
         });
@@ -61,7 +102,7 @@ public class PgdSljhServiceImpl extends ServiceImpl<PgdSljhMapper, PgdSljh> impl
             PgdSljh e= new PgdSljh();
             e.setFkry((String) request.getAttribute("yhms"));
             e.setFkrq(DateUtil.format(DateUtil.date(), "yyyy/MM/dd HH:mm:ss"));
-            e.setZt("09");
+            e.setZt("04");
             e.setFkyy(f.getFkyy());
             e.setId(f.getId());
             ups.add(e);
@@ -74,9 +115,9 @@ public class PgdSljhServiceImpl extends ServiceImpl<PgdSljhMapper, PgdSljh> impl
         List<PgdSljh>ups= new ArrayList<>();
         sljhs.forEach(f->{
             PgdSljh e= new PgdSljh();
-            e.setSlry(f.getSlry());
+            e.setFkrq(f.getFkrq());
-            e.setSlksrq(f.getSlksrq());
+            e.setFkry(f.getFkry());
-            e.setSjjsrq(f.getSjjsrq());
+            e.setZt("04");
             e.setId(f.getId());
             ups.add(e);
         });
@@ -90,11 +131,9 @@ public class PgdSljhServiceImpl extends ServiceImpl<PgdSljhMapper, PgdSljh> impl
         List<PgdSljh>ups= new ArrayList<>();
         sljhs.forEach(f->{
             PgdSljh e= new PgdSljh();
-            e.setXfry((String) request.getAttribute("yhms"));
+            e.setJsry("");
-            e.setXfrq(DateUtil.format(DateUtil.date(), "yyyy/MM/dd HH:mm:ss"));
+            e.setJsry("");
-            if(f.getZt().equals("02")){
+            e.setZt("02");
-                e.setZt("01");
-            }
             e.setId(f.getId());
             ups.add(e);
         });