From c1108ce904a6b8458b912da9cbee36f122fe4978 Mon Sep 17 00:00:00 2001 From: xhj Date: Mon, 18 Dec 2023 09:55:44 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/dsic/gj_erp/bean/jhgk/DmYdjhLj.java | 14 +- .../controller/pgd/PgdDmjhController.java | 10 +- .../controller/pgd/PgdPkjhController.java | 29 +++- .../controller/pgd/PgdPwjhController.java | 10 ++ .../controller/pgd/PgdQgjhController.java | 10 ++ .../controller/pgd/PgdQmjhController.java | 55 ++++++- .../controller/pgd/PgdSljhController.java | 8 + .../dsic/gj_erp/mapper/pgd/PgdQmjhMapper.java | 7 + .../dsic/gj_erp/mapper/pgd/PgdQmjhMapper.xml | 46 ------ .../gj_erp/service/pgd/PgdDmjhService.java | 6 + .../gj_erp/service/pgd/PgdPkjhService.java | 8 +- .../gj_erp/service/pgd/PgdPwjhService.java | 1 + .../gj_erp/service/pgd/PgdQgjhService.java | 1 + .../gj_erp/service/pgd/PgdQmjhService.java | 13 +- .../gj_erp/service/pgd/PgdSljhService.java | 1 + .../service/pgd/impl/PgdDmjhServiceImpl.java | 53 ++++++ .../service/pgd/impl/PgdPkjhServiceImpl.java | 68 +++++--- .../service/pgd/impl/PgdPwjhServiceImpl.java | 15 ++ .../service/pgd/impl/PgdQgjhServiceImpl.java | 14 ++ .../service/pgd/impl/PgdQmjhServiceImpl.java | 137 +++++++++++++--- .../service/pgd/impl/PgdSljhServiceImpl.java | 14 ++ .../mappers}/pgd/PgdDhMapper.xml | 0 .../mappers}/pgd/PgdDmjhMapper.xml | 0 .../mappers}/pgd/PgdPkjhMapper.xml | 0 .../mappers}/pgd/PgdPwjhMapper.xml | 0 .../mappers}/pgd/PgdQgjhMapper.xml | 0 .../resources/mappers/pgd/PgdQmjhMapper.xml | 153 ++++++++++++++++++ .../mappers}/pgd/PgdSljhMapper.xml | 0 .../mappers}/pgd/PgdTzjhMapper.xml | 0 29 files changed, 561 insertions(+), 112 deletions(-) delete mode 100644 src/main/java/com/dsic/gj_erp/mapper/pgd/PgdQmjhMapper.xml rename src/main/{java/com/dsic/gj_erp/mapper => resources/mappers}/pgd/PgdDhMapper.xml (100%) rename src/main/{java/com/dsic/gj_erp/mapper => resources/mappers}/pgd/PgdDmjhMapper.xml (100%) rename src/main/{java/com/dsic/gj_erp/mapper => resources/mappers}/pgd/PgdPkjhMapper.xml (100%) rename src/main/{java/com/dsic/gj_erp/mapper => resources/mappers}/pgd/PgdPwjhMapper.xml (100%) rename src/main/{java/com/dsic/gj_erp/mapper => resources/mappers}/pgd/PgdQgjhMapper.xml (100%) create mode 100644 src/main/resources/mappers/pgd/PgdQmjhMapper.xml rename src/main/{java/com/dsic/gj_erp/mapper => resources/mappers}/pgd/PgdSljhMapper.xml (100%) rename src/main/{java/com/dsic/gj_erp/mapper => resources/mappers}/pgd/PgdTzjhMapper.xml (100%) 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 7aaee77..5ce86c7 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 @@ -42,7 +42,7 @@ public class DmYdjhLj implements Serializable { @ApiModelProperty(value = "套料图号") private String tlth; - @ApiModelProperty(value = "套料图号") + @ApiModelProperty(value = "配套表类型") private String ptblx; @ApiModelProperty(value = "零件编号") @@ -214,4 +214,16 @@ public class DmYdjhLj implements Serializable { private String id; + private String qbs; + + private String pkbs; + private String dmbs; + + private String qdr; + + private String pkdr; + private String dmdr; + + + } 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 711f1bd..7a20a03 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 @@ -71,8 +71,16 @@ public class PgdDmjhController { @ResponseBody @AuthFunction public ResultBean saveDmPgdFk(HttpServletRequest req, @RequestBody Listlist) throws Exception, CustomException { - pgdDmjhService.saveDmPgdFk(list,req); ; + pgdDmjhService.saveDmPgdFk(list,req); return new ResultBean(); } + @PostMapping("/saveDmFk") + @ResponseBody + @AuthFunction + public ResultBean saveDmFk(HttpServletRequest req, @RequestBody Listlist) throws Exception, CustomException { + pgdDmjhService.saveDmFk(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 4454975..eb74af2 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 @@ -5,9 +5,11 @@ import cn.hutool.core.util.StrUtil; 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.PgdPkjh; import com.dsic.gj_erp.bean.pgd.PgdPkjh; import com.dsic.gj_erp.exception.CustomException; +import com.dsic.gj_erp.service.jhgk.DmYdjhLjService; import com.dsic.gj_erp.service.pgd.PgdPkjhService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -30,27 +32,32 @@ public class PgdPkjhController { @Autowired PgdPkjhService pgdPkjhService; + @Autowired + DmYdjhLjService dmYdjhLjService; + @PostMapping("/getPkPgd") @ResponseBody public ResultBean getQmPgd(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")),"pkZt",(String)map.get("zt")); + + qw.eq("pkdr","Y"); qw.orderBy(true,true,"czbh","pl","fd"); - return new ResultBean(pgdPkjhService.list(qw)); + return new ResultBean(dmYdjhLjService.list(qw)); } @PostMapping("/savePkPgdXd") @ResponseBody @AuthFunction - public ResultBean savePkPgdXd(HttpServletRequest req, @RequestBody List list) throws Exception, CustomException { + public ResultBean savePkPgdXd(HttpServletRequest req, @RequestBody List list) throws Exception, CustomException { pgdPkjhService.savePkPgdXd(list,req); return new ResultBean(); } @@ -58,7 +65,7 @@ public class PgdPkjhController { @PostMapping("/savePkPgdXdBack") @ResponseBody @AuthFunction - public ResultBean savePkPgdXdBack(HttpServletRequest req, @RequestBody Listlist) throws Exception, CustomException { + public ResultBean savePkPgdXdBack(HttpServletRequest req, @RequestBody Listlist) throws Exception, CustomException { pgdPkjhService.savePkPgdXdBack(list,req); return new ResultBean(); } @@ -68,9 +75,19 @@ public class PgdPkjhController { @PostMapping("/savePkPgdFk") @ResponseBody @AuthFunction - public ResultBean savePkPgdFk(HttpServletRequest req, @RequestBody Listlist) throws Exception, CustomException { + public ResultBean savePkPgdFk(HttpServletRequest req, @RequestBody Listlist) throws Exception, CustomException { pgdPkjhService.savePkPgdFk(list,req); ; return new ResultBean(); } + + @PostMapping("/savePkFk") + @ResponseBody + @AuthFunction + public ResultBean savePkFk(HttpServletRequest req, @RequestBody Listlist) throws Exception, CustomException { + pgdPkjhService.savePkFk(list,req); + return new ResultBean(); + } + + } diff --git a/src/main/java/com/dsic/gj_erp/controller/pgd/PgdPwjhController.java b/src/main/java/com/dsic/gj_erp/controller/pgd/PgdPwjhController.java index 1c34558..54155bd 100644 --- a/src/main/java/com/dsic/gj_erp/controller/pgd/PgdPwjhController.java +++ b/src/main/java/com/dsic/gj_erp/controller/pgd/PgdPwjhController.java @@ -72,5 +72,15 @@ public class PgdPwjhController { return new ResultBean(); } + @PostMapping("/savePwFk") + @ResponseBody + @AuthFunction + public ResultBean savePwFk(HttpServletRequest req, @RequestBody Listlist) throws Exception, CustomException { + pgdPwjhService.savePwFk(list,req); + return new ResultBean(); + } + + + } diff --git a/src/main/java/com/dsic/gj_erp/controller/pgd/PgdQgjhController.java b/src/main/java/com/dsic/gj_erp/controller/pgd/PgdQgjhController.java index 3af4ece..deac16f 100644 --- a/src/main/java/com/dsic/gj_erp/controller/pgd/PgdQgjhController.java +++ b/src/main/java/com/dsic/gj_erp/controller/pgd/PgdQgjhController.java @@ -74,5 +74,15 @@ public class PgdQgjhController { pgdQgjhService.saveQgPgdFk(list,req); return new ResultBean(); } + + @PostMapping("/saveQgdFk") + @ResponseBody + @AuthFunction + public ResultBean saveQgdFk(HttpServletRequest req, @RequestBody Listlist) throws Exception, CustomException { + pgdQgjhService.saveQgdFk(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 ae7bf16..26e62b0 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 @@ -5,9 +5,12 @@ import cn.hutool.core.util.StrUtil; 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.PgdQmjh; import com.dsic.gj_erp.bean.pgd.PgdQmjh; +import com.dsic.gj_erp.bean.pgd.Qmqz; import com.dsic.gj_erp.exception.CustomException; +import com.dsic.gj_erp.service.jhgk.DmYdjhLjService; import com.dsic.gj_erp.service.pgd.PgdQmjhService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -30,27 +33,31 @@ public class PgdQmjhController { @Autowired PgdQmjhService pgdQmjhService; + @Autowired + DmYdjhLjService dmYdjhLjService; + @PostMapping("/getQmPgd") @ResponseBody public ResultBean getQmPgd(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")),"qjgZt",(String)map.get("zt")); + qw.eq("qdr","Y"); qw.orderBy(true,true,"czbh","pl","fd"); - return new ResultBean(pgdQmjhService.list(qw)); + return new ResultBean(dmYdjhLjService.list(qw)); } @PostMapping("/saveQmPgdXd") @ResponseBody @AuthFunction - public ResultBean saveQmPgdXd(HttpServletRequest req, @RequestBody List list) throws Exception, CustomException { + public ResultBean saveQmPgdXd(HttpServletRequest req, @RequestBody List list) throws Exception, CustomException { pgdQmjhService.saveQmPgdXd(list,req); return new ResultBean(); } @@ -58,7 +65,7 @@ public class PgdQmjhController { @PostMapping("/saveQmPgdXdBack") @ResponseBody @AuthFunction - public ResultBean saveQmPgdXdBack(HttpServletRequest req, @RequestBody Listlist) throws Exception, CustomException { + public ResultBean saveQmPgdXdBack(HttpServletRequest req, @RequestBody Listlist) throws Exception, CustomException { pgdQmjhService.saveQmPgdXdBack(list,req); return new ResultBean(); } @@ -68,9 +75,45 @@ public class PgdQmjhController { @PostMapping("/saveQmPgdFk") @ResponseBody @AuthFunction - public ResultBean saveQmPgdFk(HttpServletRequest req, @RequestBody Listlist) throws Exception, CustomException { + public ResultBean saveQmPgdFk(HttpServletRequest req, @RequestBody Listlist) throws Exception, CustomException { pgdQmjhService.saveQmPgdFk(list,req) ; return new ResultBean(); } + + @PostMapping("/saveQmFk") + @ResponseBody + @AuthFunction + public ResultBean saveQmFk(HttpServletRequest req, @RequestBody Listlist) throws Exception, CustomException { + pgdQmjhService.saveQmFk(list,req) ; + return new ResultBean(); + } + + @PostMapping("/selectQmByQgAndJh") + @ResponseBody + public ResultBean selectQmByQgAndJh(HttpServletRequest req, @RequestBody Map map) throws Exception, CustomException { + List qmqzs = pgdQmjhService.selectQmByQgAndJh(map); + return new ResultBean(qmqzs); + } + + @PostMapping("/insertQmList") + @ResponseBody + public ResultBean insertQmList(HttpServletRequest req, @RequestBody Map map) throws Exception, CustomException { + pgdQmjhService.insertQmList(map,req); + return new ResultBean(); + } + @PostMapping("/removeQmList") + @ResponseBody + public ResultBean removeQmList(HttpServletRequest req, @RequestBody Map map) throws Exception, CustomException { + pgdQmjhService.removeQmList(map,req); + return new ResultBean(); + } + + + + + + + + } diff --git a/src/main/java/com/dsic/gj_erp/controller/pgd/PgdSljhController.java b/src/main/java/com/dsic/gj_erp/controller/pgd/PgdSljhController.java index eb195cc..d8edd04 100644 --- a/src/main/java/com/dsic/gj_erp/controller/pgd/PgdSljhController.java +++ b/src/main/java/com/dsic/gj_erp/controller/pgd/PgdSljhController.java @@ -74,5 +74,13 @@ public class PgdSljhController { return new ResultBean(); } + @PostMapping("/saveSljhFk") + @ResponseBody + @AuthFunction + public ResultBean saveSljhFk(HttpServletRequest req, @RequestBody Listlist) throws Exception, CustomException { + pgdSljhService.saveSljhFk(list,req); + return new ResultBean(); + } + } diff --git a/src/main/java/com/dsic/gj_erp/mapper/pgd/PgdQmjhMapper.java b/src/main/java/com/dsic/gj_erp/mapper/pgd/PgdQmjhMapper.java index 66e6738..dd8ca22 100644 --- a/src/main/java/com/dsic/gj_erp/mapper/pgd/PgdQmjhMapper.java +++ b/src/main/java/com/dsic/gj_erp/mapper/pgd/PgdQmjhMapper.java @@ -2,6 +2,10 @@ package com.dsic.gj_erp.mapper.pgd; import com.dsic.gj_erp.bean.pgd.PgdQmjh; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.dsic.gj_erp.bean.pgd.Qmqz; + +import java.util.List; +import java.util.Map; /** *

@@ -13,4 +17,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; */ public interface PgdQmjhMapper extends BaseMapper { + + ListselectQmByQgAndJh(Map map); + } diff --git a/src/main/java/com/dsic/gj_erp/mapper/pgd/PgdQmjhMapper.xml b/src/main/java/com/dsic/gj_erp/mapper/pgd/PgdQmjhMapper.xml deleted file mode 100644 index d8e42e9..0000000 --- a/src/main/java/com/dsic/gj_erp/mapper/pgd/PgdQmjhMapper.xml +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - czbh, pl, fd, kw, zl, tlth, ptblx, ljbh, ljmc, ljgg, ljcz, wpfl, jldw, sl, qjgjhrq, qfxqrqxz, qfxqrqdz, gylx, qjgfzry, qsbbh, qjgry, qjgksrq, qjgjsrq, zt, bzry, bzrq, xfry, xfrq, fkry, fkrq, fkyy, id - - - 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 82c4f59..6da0667 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 @@ -1,8 +1,10 @@ package com.dsic.gj_erp.service.pgd; +import com.dsic.gj_erp.bean.jhgk.DmYdjhLj; import com.dsic.gj_erp.bean.pgd.PgdDmjh; import com.baomidou.mybatisplus.extension.service.IService; import com.dsic.gj_erp.bean.pgd.PgdPkjh; +import com.dsic.gj_erp.bean.pgd.Qmqz; import javax.servlet.http.HttpServletRequest; import java.util.List; @@ -20,5 +22,9 @@ public interface PgdDmjhService extends IService { void saveDmPgdXd(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 44999d2..f0d488a 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 @@ -1,5 +1,6 @@ package com.dsic.gj_erp.service.pgd; +import com.dsic.gj_erp.bean.jhgk.DmYdjhLj; import com.dsic.gj_erp.bean.pgd.PgdPkjh; import com.baomidou.mybatisplus.extension.service.IService; import com.dsic.gj_erp.bean.pgd.PgdQmjh; @@ -16,8 +17,9 @@ import java.util.List; * @since 2023-11-13 */ public interface PgdPkjhService extends IService { - void savePkPgdXd(List pkjhs, HttpServletRequest request); - void savePkPgdFk(List pkjhs, HttpServletRequest request); - void savePkPgdXdBack(List pkjhs, HttpServletRequest request); + void savePkPgdXd(List pkjhs, HttpServletRequest request); + void savePkPgdFk(List pkjhs, HttpServletRequest request); + void savePkFk(List pkjhs, HttpServletRequest request); + void savePkPgdXdBack(List pkjhs, HttpServletRequest request); } diff --git a/src/main/java/com/dsic/gj_erp/service/pgd/PgdPwjhService.java b/src/main/java/com/dsic/gj_erp/service/pgd/PgdPwjhService.java index 7179ac6..e5f8cb0 100644 --- a/src/main/java/com/dsic/gj_erp/service/pgd/PgdPwjhService.java +++ b/src/main/java/com/dsic/gj_erp/service/pgd/PgdPwjhService.java @@ -19,6 +19,7 @@ public interface PgdPwjhService extends IService { void savePwPgdXd(List pwjhs, HttpServletRequest request); void savePwPgdFk(List pwjhs, HttpServletRequest request); + void savePwFk(List pwjhs, HttpServletRequest request); void savePwPgdXdBack(List pwjhs, HttpServletRequest request); } diff --git a/src/main/java/com/dsic/gj_erp/service/pgd/PgdQgjhService.java b/src/main/java/com/dsic/gj_erp/service/pgd/PgdQgjhService.java index f59a97f..8ec6d30 100644 --- a/src/main/java/com/dsic/gj_erp/service/pgd/PgdQgjhService.java +++ b/src/main/java/com/dsic/gj_erp/service/pgd/PgdQgjhService.java @@ -19,6 +19,7 @@ public interface PgdQgjhService extends IService { void saveQgPgdXd(List qgjhs, HttpServletRequest request); void saveQgPgdFk(List qgjhs, HttpServletRequest request); + void saveQgdFk(List qgjhs, HttpServletRequest request); void saveQgPgdXdBack(List qgjhs, HttpServletRequest request); void qgToQm(List qgjhs, HttpServletRequest request); void qgToPk(List qgjhs, 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 71180d5..626f50f 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 @@ -1,11 +1,14 @@ package com.dsic.gj_erp.service.pgd; +import com.dsic.gj_erp.bean.jhgk.DmYdjhLj; import com.dsic.gj_erp.bean.pgd.PgdPwjh; import com.dsic.gj_erp.bean.pgd.PgdQmjh; import com.baomidou.mybatisplus.extension.service.IService; +import com.dsic.gj_erp.bean.pgd.Qmqz; import javax.servlet.http.HttpServletRequest; import java.util.List; +import java.util.Map; /** *

@@ -17,8 +20,12 @@ import java.util.List; */ public interface PgdQmjhService extends IService { - void saveQmPgdXd(List qmjhs, HttpServletRequest request); - void saveQmPgdFk(List qmjhs, HttpServletRequest request); - void saveQmPgdXdBack(List qmjhs, HttpServletRequest request); + void saveQmPgdXd(List qmjhs, HttpServletRequest request); + void saveQmPgdFk(List qmjhs, HttpServletRequest request); + void saveQmFk(List qmjhs, HttpServletRequest request); + void saveQmPgdXdBack(List qmjhs, HttpServletRequest request); + List selectQmByQgAndJh(Map map); + void insertQmList(Map map ,HttpServletRequest request); + void removeQmList(Map map,HttpServletRequest request); } diff --git a/src/main/java/com/dsic/gj_erp/service/pgd/PgdSljhService.java b/src/main/java/com/dsic/gj_erp/service/pgd/PgdSljhService.java index a71280d..769153b 100644 --- a/src/main/java/com/dsic/gj_erp/service/pgd/PgdSljhService.java +++ b/src/main/java/com/dsic/gj_erp/service/pgd/PgdSljhService.java @@ -20,6 +20,7 @@ public interface PgdSljhService extends IService { void saveSljhPgdXd(List sljhs, HttpServletRequest request); void saveSljhPgdFk(List sljhs, HttpServletRequest request); + void saveSljhFk(List sljhs, HttpServletRequest request); void saveSljhPgdXdBack(List sljhs, 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 655ba89..154d228 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 @@ -1,12 +1,17 @@ package com.dsic.gj_erp.service.pgd.impl; +import cn.hutool.core.date.DateUtil; import com.dsic.gj_erp.bean.pgd.PgdDmjh; +import com.dsic.gj_erp.bean.pgd.PgdPkjh; +import com.dsic.gj_erp.bean.pgd.PgdPwjh; +import com.dsic.gj_erp.bean.pgd.PgdQgjh; import com.dsic.gj_erp.mapper.pgd.PgdDmjhMapper; import com.dsic.gj_erp.service.pgd.PgdDmjhService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; import javax.servlet.http.HttpServletRequest; +import java.util.ArrayList; import java.util.List; /** @@ -21,13 +26,61 @@ import java.util.List; public class PgdDmjhServiceImpl extends ServiceImpl implements PgdDmjhService { @Override public void saveDmPgdXd(List dmjhs, HttpServletRequest request) { + Listups= new ArrayList<>(); + dmjhs.forEach(f->{ + PgdDmjh e= new PgdDmjh(); + e.setXfry((String) request.getAttribute("yhms")); + e.setXfrq(DateUtil.format(DateUtil.date(), "yyyy/MM/dd HH:mm:ss")); + e.setZt("02"); + e.setId(f.getId()); + ups.add(e); + }); + this.updateBatchById(ups); } @Override public void saveDmPgdFk(List dmjhs, HttpServletRequest request) { + Listups= new ArrayList<>(); + dmjhs.forEach(f->{ + PgdDmjh e= new PgdDmjh(); + 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 saveDmPgdXdBack(List dmjhs, HttpServletRequest request) { + + Listups= new ArrayList<>(); + dmjhs.forEach(f->{ + PgdDmjh e= new PgdDmjh(); + e.setXfry((String) request.getAttribute("yhms")); + e.setXfrq(DateUtil.format(DateUtil.date(), "yyyy/MM/dd HH:mm:ss")); + if(f.getZt().equals("02")){ + e.setZt("01"); + } + e.setId(f.getId()); + ups.add(e); + }); + this.updateBatchById(ups); + } + + @Override + public void saveDmFk(List dmjhs, HttpServletRequest request) { + Listups= new ArrayList<>(); + dmjhs.forEach(f->{ + PgdDmjh e= new PgdDmjh(); + e.setDmry(e.getDmry()); + e.setDmksrq(e.getDmksrq()); + e.setDmjsrq(e.getDmjsrq()); + e.setId(f.getId()); + ups.add(e); + }); + this.updateBatchById(ups); } } 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 eddf3c5..3adfd07 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 @@ -1,12 +1,15 @@ package com.dsic.gj_erp.service.pgd.impl; import cn.hutool.core.date.DateUtil; +import com.dsic.gj_erp.bean.jhgk.DmYdjhLj; import com.dsic.gj_erp.bean.pgd.PgdPkjh; import com.dsic.gj_erp.bean.pgd.PgdQgjh; import com.dsic.gj_erp.bean.pgd.PgdQmjh; import com.dsic.gj_erp.mapper.pgd.PgdPkjhMapper; +import com.dsic.gj_erp.service.jhgk.DmYdjhLjService; import com.dsic.gj_erp.service.pgd.PgdPkjhService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import javax.servlet.http.HttpServletRequest; @@ -23,48 +26,67 @@ import java.util.List; */ @Service public class PgdPkjhServiceImpl extends ServiceImpl implements PgdPkjhService { + + @Autowired + DmYdjhLjService dmYdjhLjService; + + @Override + public void savePkPgdXd(List pkjhs, HttpServletRequest request) { + Listups= new ArrayList<>(); + pkjhs.forEach(f->{ + DmYdjhLj e= new DmYdjhLj(); + e.setPkXfry((String) request.getAttribute("yhms")); + e.setPkXfrq(DateUtil.format(DateUtil.date(), "yyyy/MM/dd HH:mm:ss")); + e.setPkZt("02"); + e.setId(f.getId()); + ups.add(e); + }); + dmYdjhLjService.updateBatchById(ups); + } + @Override - public void savePkPgdXd(List pkjhs, HttpServletRequest request) { - Listups= new ArrayList<>(); + public void savePkPgdFk(List pkjhs, HttpServletRequest request) { + Listups= new ArrayList<>(); pkjhs.forEach(f->{ - PgdPkjh e= new PgdPkjh(); - e.setXfry((String) request.getAttribute("yhms")); - e.setXfrq(DateUtil.format(DateUtil.date(), "yyyy/MM/dd HH:mm:ss")); - e.setZt("02"); + 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.setPkFkyy(f.getPkFkyy()); e.setId(f.getId()); ups.add(e); }); - this.updateBatchById(ups); + dmYdjhLjService.updateBatchById(ups); } @Override - public void savePkPgdFk(List pkjhs, HttpServletRequest request) { - Listups= new ArrayList<>(); + public void savePkFk(List pkjhs, HttpServletRequest request) { + + Listups= new ArrayList<>(); pkjhs.forEach(f->{ - PgdPkjh e= new PgdPkjh(); - 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()); + DmYdjhLj e= new DmYdjhLj(); + e.setPkry(e.getPkry()); + e.setPkksrq(e.getPkksrq()); + e.setPkjsrq(e.getPkjsrq()); e.setId(f.getId()); ups.add(e); }); - this.updateBatchById(ups); + dmYdjhLjService.updateBatchById(ups); } @Override - public void savePkPgdXdBack(List pkjhs, HttpServletRequest request) { - Listups= new ArrayList<>(); + public void savePkPgdXdBack(List pkjhs, HttpServletRequest request) { + Listups= new ArrayList<>(); pkjhs.forEach(f->{ - PgdPkjh e= new PgdPkjh(); - e.setXfry((String) request.getAttribute("yhms")); - e.setXfrq(DateUtil.format(DateUtil.date(), "yyyy/MM/dd HH:mm:ss")); - if(f.getZt().equals("02")){ - e.setZt("01"); + DmYdjhLj e= new DmYdjhLj(); + e.setPkXfry((String) request.getAttribute("yhms")); + e.setPkXfrq(DateUtil.format(DateUtil.date(), "yyyy/MM/dd HH:mm:ss")); + if(f.getPkZt().equals("02")){ + e.setPkZt("01"); } e.setId(f.getId()); ups.add(e); }); - this.updateBatchById(ups); + dmYdjhLjService.updateBatchById(ups); } } diff --git a/src/main/java/com/dsic/gj_erp/service/pgd/impl/PgdPwjhServiceImpl.java b/src/main/java/com/dsic/gj_erp/service/pgd/impl/PgdPwjhServiceImpl.java index 172e526..7e3afcd 100644 --- a/src/main/java/com/dsic/gj_erp/service/pgd/impl/PgdPwjhServiceImpl.java +++ b/src/main/java/com/dsic/gj_erp/service/pgd/impl/PgdPwjhServiceImpl.java @@ -54,6 +54,21 @@ public class PgdPwjhServiceImpl extends ServiceImpl impl this.updateBatchById(ups); } + @Override + public void savePwFk(List pwjhs, HttpServletRequest request) { + + Listups= new ArrayList<>(); + pwjhs.forEach(f->{ + PgdPwjh e= new PgdPwjh(); + e.setPwjgry(e.getPwjgry()); + e.setPwksrq(e.getPwksrq()); + e.setPwjsrq(e.getPwjsrq()); + e.setId(f.getId()); + ups.add(e); + }); + this.updateBatchById(ups); + } + @Override @Transactional(rollbackFor = Exception.class) public void savePwPgdXdBack(List pwjhs, HttpServletRequest request) { diff --git a/src/main/java/com/dsic/gj_erp/service/pgd/impl/PgdQgjhServiceImpl.java b/src/main/java/com/dsic/gj_erp/service/pgd/impl/PgdQgjhServiceImpl.java index 1d4d3e0..d3c9bfc 100644 --- a/src/main/java/com/dsic/gj_erp/service/pgd/impl/PgdQgjhServiceImpl.java +++ b/src/main/java/com/dsic/gj_erp/service/pgd/impl/PgdQgjhServiceImpl.java @@ -55,6 +55,20 @@ public class PgdQgjhServiceImpl extends ServiceImpl impl this.updateBatchById(ups); } + @Override + public void saveQgdFk(List qgjhs, HttpServletRequest request) { + Listups= new ArrayList<>(); + qgjhs.forEach(f->{ + PgdQgjh e= new PgdQgjh(); + e.setQgry(f.getQgry()); + e.setQgksrq(f.getQgksrq()); + e.setQgjsrq(f.getQgjsrq()); + e.setId(f.getId()); + ups.add(e); + }); + this.updateBatchById(ups); + } + @Override @Transactional(rollbackFor = Exception.class) public void saveQgPgdXdBack(List qgjhs, HttpServletRequest request) { 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 5ce1398..aa93986 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 @@ -1,18 +1,25 @@ package com.dsic.gj_erp.service.pgd.impl; import cn.hutool.core.date.DateUtil; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; +import com.dsic.gj_erp.bean.jhgk.DmYdjhLj; import com.dsic.gj_erp.bean.pgd.PgdPkjh; import com.dsic.gj_erp.bean.pgd.PgdQgjh; import com.dsic.gj_erp.bean.pgd.PgdQmjh; +import com.dsic.gj_erp.bean.pgd.Qmqz; import com.dsic.gj_erp.mapper.pgd.PgdQmjhMapper; +import com.dsic.gj_erp.service.jhgk.DmYdjhLjService; import com.dsic.gj_erp.service.pgd.PgdQmjhService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletRequest; import java.util.ArrayList; import java.util.List; +import java.util.Map; /** *

@@ -24,52 +31,136 @@ import java.util.List; */ @Service public class PgdQmjhServiceImpl extends ServiceImpl implements PgdQmjhService { + + @Autowired + PgdQmjhMapper qmjhMapper; + + @Autowired + DmYdjhLjService dmYdjhLjService; + + @Override @Transactional(rollbackFor = Exception.class) - public void saveQmPgdXd(List qmjhs, HttpServletRequest request) { - Listups= new ArrayList<>(); + public void saveQmPgdXd(List qmjhs, HttpServletRequest request) { + Listups= new ArrayList<>(); qmjhs.forEach(f->{ - PgdQmjh e= new PgdQmjh(); - e.setXfry((String) request.getAttribute("yhms")); - e.setXfrq(DateUtil.format(DateUtil.date(), "yyyy/MM/dd HH:mm:ss")); - e.setZt("02"); + DmYdjhLj e= new DmYdjhLj(); + e.setQjgXfry((String) request.getAttribute("yhms")); + e.setQjgXfrq(DateUtil.format(DateUtil.date(), "yyyy/MM/dd HH:mm:ss")); + e.setQjgZt("02"); e.setId(f.getId()); ups.add(e); }); - this.updateBatchById(ups); + dmYdjhLjService.updateBatchById(ups); } @Override @Transactional(rollbackFor = Exception.class) - public void saveQmPgdFk(List qmjhs, HttpServletRequest request) { - Listups= new ArrayList<>(); + public void saveQmPgdFk(List qmjhs, HttpServletRequest request) { + Listups= new ArrayList<>(); qmjhs.forEach(f->{ - PgdQmjh e= new PgdQmjh(); - 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()); + 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.setId(f.getId()); ups.add(e); }); - this.updateBatchById(ups); + dmYdjhLjService.updateBatchById(ups); } @Override + public void saveQmFk(List qmjhs, HttpServletRequest request) { + Listups= new ArrayList<>(); + qmjhs.forEach(f->{ + DmYdjhLj e= new DmYdjhLj(); + e.setQjgry(e.getQjgry()); + e.setQjgksrq(e.getQjgksrq()); + e.setQjgjsrq(e.getQjgjsrq()); + e.setId(f.getId()); + ups.add(e); + }); + dmYdjhLjService.updateBatchById(ups); + } + @Override @Transactional(rollbackFor = Exception.class) - public void saveQmPgdXdBack(List qmjhs, HttpServletRequest request) { - Listups= new ArrayList<>(); + public void saveQmPgdXdBack(List qmjhs, HttpServletRequest request) { + Listups= new ArrayList<>(); qmjhs.forEach(f->{ - PgdQmjh e= new PgdQmjh(); - e.setXfry((String) request.getAttribute("yhms")); - e.setXfrq(DateUtil.format(DateUtil.date(), "yyyy/MM/dd HH:mm:ss")); - if(f.getZt().equals("02")){ - e.setZt("01"); + DmYdjhLj e= new DmYdjhLj(); + e.setQjgXfry((String) request.getAttribute("yhms")); + e.setQjgXfrq(DateUtil.format(DateUtil.date(), "yyyy/MM/dd HH:mm:ss")); + if(f.getQjgZt().equals("02")){ + e.setQjgZt("01"); } e.setId(f.getId()); ups.add(e); }); - this.updateBatchById(ups); + dmYdjhLjService.updateBatchById(ups); + } + + @Override + public List selectQmByQgAndJh(Map map) { + + if((Boolean) map.get("qbs")){ + map.put("q","1"); + } + if((Boolean) map.get("pkbs")){ + map.put("p","1"); + } + if((Boolean) map.get("dmbs")){ + map.put("d","1"); + } + return qmjhMapper.selectQmByQgAndJh(map); + } + + @Override + public void insertQmList(Map map, HttpServletRequest request) { + + List list =(ArrayList)map.get("list"); + String lx =(String)map.get("lx"); + String str= JSON.toJSONString(list); + list= JSONObject.parseArray(str, Qmqz.class); + List us =new ArrayList<>(); + for(Qmqz qmqz:list){ + DmYdjhLj ydjhLj=new DmYdjhLj(); + ydjhLj.setId(qmqz.getId()); + if(lx.equals("q")){ + ydjhLj.setQdr("Y"); + }else if (lx.equals("d")){ + ydjhLj.setDmdr("Y"); + }else if (lx.equals("p")){ + ydjhLj.setPkdr("Y"); + } + + us.add(ydjhLj); + } + dmYdjhLjService.updateBatchById(us); + + } + + @Override + public void removeQmList(Map map, HttpServletRequest request) { + List list =(ArrayList)map.get("list"); + String lx =(String)map.get("lx"); + String str= JSON.toJSONString(list); + list= JSONObject.parseArray(str, Qmqz.class); + List us =new ArrayList<>(); + for(Qmqz qmqz:list){ + DmYdjhLj ydjhLj=new DmYdjhLj(); + ydjhLj.setId(qmqz.getId()); + if(lx.equals("q")){ + ydjhLj.setQdr(""); + }else if (lx.equals("d")){ + ydjhLj.setDmdr(""); + }else if (lx.equals("p")){ + ydjhLj.setPkdr(""); + } + + us.add(ydjhLj); + } + dmYdjhLjService.updateBatchById(us); } } diff --git a/src/main/java/com/dsic/gj_erp/service/pgd/impl/PgdSljhServiceImpl.java b/src/main/java/com/dsic/gj_erp/service/pgd/impl/PgdSljhServiceImpl.java index 8231927..bafd261 100644 --- a/src/main/java/com/dsic/gj_erp/service/pgd/impl/PgdSljhServiceImpl.java +++ b/src/main/java/com/dsic/gj_erp/service/pgd/impl/PgdSljhServiceImpl.java @@ -57,6 +57,20 @@ public class PgdSljhServiceImpl extends ServiceImpl impl this.updateBatchById(ups); } + @Override + public void saveSljhFk(List sljhs, HttpServletRequest request) { + Listups= new ArrayList<>(); + sljhs.forEach(f->{ + PgdSljh e= new PgdSljh(); + e.setSlry(f.getSlry()); + e.setSlksrq(f.getSlksrq()); + e.setSjjsrq(f.getSjjsrq()); + e.setId(f.getId()); + ups.add(e); + }); + this.updateBatchById(ups); + } + @Override @Transactional(rollbackFor = Exception.class) public void saveSljhPgdXdBack(List sljhs, HttpServletRequest request) { diff --git a/src/main/java/com/dsic/gj_erp/mapper/pgd/PgdDhMapper.xml b/src/main/resources/mappers/pgd/PgdDhMapper.xml similarity index 100% rename from src/main/java/com/dsic/gj_erp/mapper/pgd/PgdDhMapper.xml rename to src/main/resources/mappers/pgd/PgdDhMapper.xml diff --git a/src/main/java/com/dsic/gj_erp/mapper/pgd/PgdDmjhMapper.xml b/src/main/resources/mappers/pgd/PgdDmjhMapper.xml similarity index 100% rename from src/main/java/com/dsic/gj_erp/mapper/pgd/PgdDmjhMapper.xml rename to src/main/resources/mappers/pgd/PgdDmjhMapper.xml diff --git a/src/main/java/com/dsic/gj_erp/mapper/pgd/PgdPkjhMapper.xml b/src/main/resources/mappers/pgd/PgdPkjhMapper.xml similarity index 100% rename from src/main/java/com/dsic/gj_erp/mapper/pgd/PgdPkjhMapper.xml rename to src/main/resources/mappers/pgd/PgdPkjhMapper.xml diff --git a/src/main/java/com/dsic/gj_erp/mapper/pgd/PgdPwjhMapper.xml b/src/main/resources/mappers/pgd/PgdPwjhMapper.xml similarity index 100% rename from src/main/java/com/dsic/gj_erp/mapper/pgd/PgdPwjhMapper.xml rename to src/main/resources/mappers/pgd/PgdPwjhMapper.xml diff --git a/src/main/java/com/dsic/gj_erp/mapper/pgd/PgdQgjhMapper.xml b/src/main/resources/mappers/pgd/PgdQgjhMapper.xml similarity index 100% rename from src/main/java/com/dsic/gj_erp/mapper/pgd/PgdQgjhMapper.xml rename to src/main/resources/mappers/pgd/PgdQgjhMapper.xml diff --git a/src/main/resources/mappers/pgd/PgdQmjhMapper.xml b/src/main/resources/mappers/pgd/PgdQmjhMapper.xml new file mode 100644 index 0000000..d2a21d7 --- /dev/null +++ b/src/main/resources/mappers/pgd/PgdQmjhMapper.xml @@ -0,0 +1,153 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + czbh, pl, fd, kw, zl, tlth, ptblx, ljbh, ljmc, ljgg, ljcz, wpfl, jldw, sl, qjgjhrq, qfxqrqxz, qfxqrqdz, gylx, qjgfzry, qsbbh, qjgry, qjgksrq, qjgjsrq, zt, bzry, bzrq, xfry, xfrq, fkry, fkrq, fkyy, id + + + + + diff --git a/src/main/java/com/dsic/gj_erp/mapper/pgd/PgdSljhMapper.xml b/src/main/resources/mappers/pgd/PgdSljhMapper.xml similarity index 100% rename from src/main/java/com/dsic/gj_erp/mapper/pgd/PgdSljhMapper.xml rename to src/main/resources/mappers/pgd/PgdSljhMapper.xml diff --git a/src/main/java/com/dsic/gj_erp/mapper/pgd/PgdTzjhMapper.xml b/src/main/resources/mappers/pgd/PgdTzjhMapper.xml similarity index 100% rename from src/main/java/com/dsic/gj_erp/mapper/pgd/PgdTzjhMapper.xml rename to src/main/resources/mappers/pgd/PgdTzjhMapper.xml