From ed533a8ebb352c2968b21017d698c9ad5734088f Mon Sep 17 00:00:00 2001 From: xhj Date: Sun, 21 Jul 2024 11:07:29 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B4=BE=E5=B7=A5=E5=8D=95=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/dsic/gj_erp/bean/jhgk/DmYdjhLj.java | 23 ++++++++++++++++--- .../com/dsic/gj_erp/bean/pgd/PgdPwjh.java | 2 ++ .../com/dsic/gj_erp/bean/pgd/PgdQgjh.java | 2 +- .../com/dsic/gj_erp/bean/pgd/PgdSljh.java | 2 +- .../controller/pgd/PgdDmjhController.java | 20 +++++++++++++--- .../controller/pgd/PgdPkjhController.java | 12 +++++++--- .../controller/pgd/PgdQmjhController.java | 12 +++++++++- .../gj_erp/service/pgd/PgdDmjhService.java | 1 + .../gj_erp/service/pgd/PgdPkjhService.java | 1 + .../gj_erp/service/pgd/PgdQmjhService.java | 1 + .../service/pgd/impl/PgdDmjhServiceImpl.java | 18 ++++++++++++++- .../service/pgd/impl/PgdPkjhServiceImpl.java | 18 ++++++++++++++- .../service/pgd/impl/PgdQmjhServiceImpl.java | 19 +++++++++++++-- 13 files changed, 115 insertions(+), 16 deletions(-) diff --git a/src/main/java/com/dsic/gj_erp/bean/jhgk/DmYdjhLj.java b/src/main/java/com/dsic/gj_erp/bean/jhgk/DmYdjhLj.java index 5ce86c7..652925e 100644 --- a/src/main/java/com/dsic/gj_erp/bean/jhgk/DmYdjhLj.java +++ b/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; + + } diff --git a/src/main/java/com/dsic/gj_erp/bean/pgd/PgdPwjh.java b/src/main/java/com/dsic/gj_erp/bean/pgd/PgdPwjh.java index e92a6ac..1304dc3 100644 --- a/src/main/java/com/dsic/gj_erp/bean/pgd/PgdPwjh.java +++ b/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; } diff --git a/src/main/java/com/dsic/gj_erp/bean/pgd/PgdQgjh.java b/src/main/java/com/dsic/gj_erp/bean/pgd/PgdQgjh.java index 55675ce..9fabac8 100644 --- a/src/main/java/com/dsic/gj_erp/bean/pgd/PgdQgjh.java +++ b/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; } diff --git a/src/main/java/com/dsic/gj_erp/bean/pgd/PgdSljh.java b/src/main/java/com/dsic/gj_erp/bean/pgd/PgdSljh.java index f1e8543..0e28c4c 100644 --- a/src/main/java/com/dsic/gj_erp/bean/pgd/PgdSljh.java +++ b/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; } diff --git a/src/main/java/com/dsic/gj_erp/controller/pgd/PgdDmjhController.java b/src/main/java/com/dsic/gj_erp/controller/pgd/PgdDmjhController.java index 8b26c66..b3df65b 100644 --- a/src/main/java/com/dsic/gj_erp/controller/pgd/PgdDmjhController.java +++ b/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 qw =new QueryWrapper<>(); + QueryWrapper 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 Listlist) throws Exception, CustomException { + pgdDmjhService.saveDmPgdJs(list,req); + return new ResultBean(); + } + } diff --git a/src/main/java/com/dsic/gj_erp/controller/pgd/PgdPkjhController.java b/src/main/java/com/dsic/gj_erp/controller/pgd/PgdPkjhController.java index ee9414c..bdae25b 100644 --- a/src/main/java/com/dsic/gj_erp/controller/pgd/PgdPkjhController.java +++ b/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 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 Listlist) throws Exception, CustomException { + pgdPkjhService.savePkPgdJs(list,req); + return new ResultBean(); + } } diff --git a/src/main/java/com/dsic/gj_erp/controller/pgd/PgdQmjhController.java b/src/main/java/com/dsic/gj_erp/controller/pgd/PgdQmjhController.java index fcdd931..10bc489 100644 --- a/src/main/java/com/dsic/gj_erp/controller/pgd/PgdQmjhController.java +++ b/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 list) throws Exception, CustomException { + pgdQmjhService.saveQmPgdJs(list,req); + return new ResultBean(); + } + + @PostMapping("/saveQmPgdXd") @ResponseBody @AuthFunction diff --git a/src/main/java/com/dsic/gj_erp/service/pgd/PgdDmjhService.java b/src/main/java/com/dsic/gj_erp/service/pgd/PgdDmjhService.java index d5d8420..e8d1567 100644 --- a/src/main/java/com/dsic/gj_erp/service/pgd/PgdDmjhService.java +++ b/src/main/java/com/dsic/gj_erp/service/pgd/PgdDmjhService.java @@ -20,6 +20,7 @@ import java.util.List; public interface PgdDmjhService extends IService { void saveDmPgdXd(List dmjhs, HttpServletRequest request); + void saveDmPgdJs(List dmjhs, HttpServletRequest request); void saveDmPgdFk(List dmjhs, HttpServletRequest request); void saveDmPgdXdBack(List dmjhs, HttpServletRequest request); void saveDmFk(List dmjhs, HttpServletRequest request); diff --git a/src/main/java/com/dsic/gj_erp/service/pgd/PgdPkjhService.java b/src/main/java/com/dsic/gj_erp/service/pgd/PgdPkjhService.java index f0d488a..5f701cd 100644 --- a/src/main/java/com/dsic/gj_erp/service/pgd/PgdPkjhService.java +++ b/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 { + void savePkPgdJs(List pkjhs, HttpServletRequest request); void savePkPgdXd(List pkjhs, HttpServletRequest request); void savePkPgdFk(List pkjhs, HttpServletRequest request); void savePkFk(List pkjhs, HttpServletRequest request); diff --git a/src/main/java/com/dsic/gj_erp/service/pgd/PgdQmjhService.java b/src/main/java/com/dsic/gj_erp/service/pgd/PgdQmjhService.java index 626f50f..71efea5 100644 --- a/src/main/java/com/dsic/gj_erp/service/pgd/PgdQmjhService.java +++ b/src/main/java/com/dsic/gj_erp/service/pgd/PgdQmjhService.java @@ -20,6 +20,7 @@ import java.util.Map; */ public interface PgdQmjhService extends IService { + void saveQmPgdJs(List qmjhs, HttpServletRequest request); void saveQmPgdXd(List qmjhs, HttpServletRequest request); void saveQmPgdFk(List qmjhs, HttpServletRequest request); void saveQmFk(List qmjhs, HttpServletRequest request); diff --git a/src/main/java/com/dsic/gj_erp/service/pgd/impl/PgdDmjhServiceImpl.java b/src/main/java/com/dsic/gj_erp/service/pgd/impl/PgdDmjhServiceImpl.java index 5e74687..a5f10c7 100644 --- a/src/main/java/com/dsic/gj_erp/service/pgd/impl/PgdDmjhServiceImpl.java +++ b/src/main/java/com/dsic/gj_erp/service/pgd/impl/PgdDmjhServiceImpl.java @@ -38,6 +38,8 @@ public class PgdDmjhServiceImpl extends ServiceImpl 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 impl dmYdjhLjService.updateBatchById(ups); } + @Override + public void saveDmPgdJs(List dmjhs, HttpServletRequest request) { + Listups= 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 dmjhs, HttpServletRequest request) { Listups= new ArrayList<>(); @@ -52,7 +68,7 @@ public class PgdDmjhServiceImpl extends ServiceImpl 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); diff --git a/src/main/java/com/dsic/gj_erp/service/pgd/impl/PgdPkjhServiceImpl.java b/src/main/java/com/dsic/gj_erp/service/pgd/impl/PgdPkjhServiceImpl.java index 3adfd07..0efdb4a 100644 --- a/src/main/java/com/dsic/gj_erp/service/pgd/impl/PgdPkjhServiceImpl.java +++ b/src/main/java/com/dsic/gj_erp/service/pgd/impl/PgdPkjhServiceImpl.java @@ -30,6 +30,20 @@ public class PgdPkjhServiceImpl extends ServiceImpl impl @Autowired DmYdjhLjService dmYdjhLjService; + @Override + public void savePkPgdJs(List pkjhs, HttpServletRequest request) { + Listups= 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 pkjhs, HttpServletRequest request) { Listups= new ArrayList<>(); @@ -37,6 +51,8 @@ public class PgdPkjhServiceImpl extends ServiceImpl 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 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); diff --git a/src/main/java/com/dsic/gj_erp/service/pgd/impl/PgdQmjhServiceImpl.java b/src/main/java/com/dsic/gj_erp/service/pgd/impl/PgdQmjhServiceImpl.java index aa93986..f85465a 100644 --- a/src/main/java/com/dsic/gj_erp/service/pgd/impl/PgdQmjhServiceImpl.java +++ b/src/main/java/com/dsic/gj_erp/service/pgd/impl/PgdQmjhServiceImpl.java @@ -38,6 +38,20 @@ public class PgdQmjhServiceImpl extends ServiceImpl impl @Autowired DmYdjhLjService dmYdjhLjService; + @Override + public void saveQmPgdJs(List qmjhs, HttpServletRequest request) { + Listups= 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 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 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); });