xiaoning
/
gj_erp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修正

Browse Source
master
xhj 1 year ago
parent 6a26e8a18d
commit c1108ce904
29 changed files with 561 additions and 112 deletions
Show Stats Download Patch File Download Diff File

14
src/main/java/com/dsic/gj_erp/bean/jhgk/DmYdjhLj.java
Unescape View File

@ -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;
}

10
src/main/java/com/dsic/gj_erp/controller/pgd/PgdDmjhController.java
Unescape View File

@ -71,8 +71,16 @@ public class PgdDmjhController {
@ResponseBody
@AuthFunction
public ResultBean saveDmPgdFk(HttpServletRequest req, @RequestBody List<PgdDmjh>list) throws Exception, CustomException {
pgdDmjhService.saveDmPgdFk(list,req); ;
pgdDmjhService.saveDmPgdFk(list,req);
return new ResultBean();
}
@PostMapping("/saveDmFk")
@ResponseBody
@AuthFunction
public ResultBean saveDmFk(HttpServletRequest req, @RequestBody List<PgdDmjh>list) throws Exception, CustomException {
pgdDmjhService.saveDmFk(list,req);
return new ResultBean();
}
}

29
src/main/java/com/dsic/gj_erp/controller/pgd/PgdPkjhController.java
Unescape View File

@ -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<PgdPkjh> 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")),"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<PgdPkjh> list) throws Exception, CustomException {
public ResultBean savePkPgdXd(HttpServletRequest req, @RequestBody List<DmYdjhLj> 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 List<PgdPkjh>list) throws Exception, CustomException {
public ResultBean savePkPgdXdBack(HttpServletRequest req, @RequestBody List<DmYdjhLj>list) 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 List<PgdPkjh>list) throws Exception, CustomException {
public ResultBean savePkPgdFk(HttpServletRequest req, @RequestBody List<DmYdjhLj>list) throws Exception, CustomException {
pgdPkjhService.savePkPgdFk(list,req); ;
return new ResultBean();
}
@PostMapping("/savePkFk")
@ResponseBody
@AuthFunction
public ResultBean savePkFk(HttpServletRequest req, @RequestBody List<DmYdjhLj>list) throws Exception, CustomException {
pgdPkjhService.savePkFk(list,req);
return new ResultBean();
}
}

10
src/main/java/com/dsic/gj_erp/controller/pgd/PgdPwjhController.java
Unescape View File

@ -72,5 +72,15 @@ public class PgdPwjhController {
return new ResultBean();
}
@PostMapping("/savePwFk")
@ResponseBody
@AuthFunction
public ResultBean savePwFk(HttpServletRequest req, @RequestBody List<PgdPwjh>list) throws Exception, CustomException {
pgdPwjhService.savePwFk(list,req);
return new ResultBean();
}
}

10
src/main/java/com/dsic/gj_erp/controller/pgd/PgdQgjhController.java
Unescape View File

@ -74,5 +74,15 @@ public class PgdQgjhController {
pgdQgjhService.saveQgPgdFk(list,req);
return new ResultBean();
}
@PostMapping("/saveQgdFk")
@ResponseBody
@AuthFunction
public ResultBean saveQgdFk(HttpServletRequest req, @RequestBody List<PgdQgjh>list) throws Exception, CustomException {
pgdQgjhService.saveQgdFk(list,req);
return new ResultBean();
}
}

55
src/main/java/com/dsic/gj_erp/controller/pgd/PgdQmjhController.java
Unescape View File

@ -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<PgdQmjh> 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")),"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<PgdQmjh> list) throws Exception, CustomException {
public ResultBean saveQmPgdXd(HttpServletRequest req, @RequestBody List<DmYdjhLj> 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 List<PgdQmjh>list) throws Exception, CustomException {
public ResultBean saveQmPgdXdBack(HttpServletRequest req, @RequestBody List<DmYdjhLj>list) 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 List<PgdQmjh>list) throws Exception, CustomException {
public ResultBean saveQmPgdFk(HttpServletRequest req, @RequestBody List<DmYdjhLj>list) throws Exception, CustomException {
pgdQmjhService.saveQmPgdFk(list,req) ;
return new ResultBean();
}
@PostMapping("/saveQmFk")
@ResponseBody
@AuthFunction
public ResultBean saveQmFk(HttpServletRequest req, @RequestBody List<DmYdjhLj>list) 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<Qmqz> 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();
}
}

8
src/main/java/com/dsic/gj_erp/controller/pgd/PgdSljhController.java
Unescape View File

@ -74,5 +74,13 @@ public class PgdSljhController {
return new ResultBean();
}
@PostMapping("/saveSljhFk")
@ResponseBody
@AuthFunction
public ResultBean saveSljhFk(HttpServletRequest req, @RequestBody List<PgdSljh>list) throws Exception, CustomException {
pgdSljhService.saveSljhFk(list,req);
return new ResultBean();
}
}

7
src/main/java/com/dsic/gj_erp/mapper/pgd/PgdQmjhMapper.java
Unescape View File

@ -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;
/**
* <p>
@ -13,4 +17,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
*/
public interface PgdQmjhMapper extends BaseMapper<PgdQmjh> {
List<Qmqz>selectQmByQgAndJh(Map map);
}

46
src/main/java/com/dsic/gj_erp/mapper/pgd/PgdQmjhMapper.xml
Unescape View File

@ -1,46 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.dsic.gj_erp.mapper.pgd.PgdQmjhMapper">
<!-- 通用查询映射结果 -->
<resultMap id="BaseResultMap" type="com.dsic.gj_erp.bean.pgd.PgdQmjh">
<id column="id" property="id" />
<result column="czbh" property="czbh" />
<result column="pl" property="pl" />
<result column="fd" property="fd" />
<result column="kw" property="kw" />
<result column="zl" property="zl" />
<result column="tlth" property="tlth" />
<result column="ptblx" property="ptblx" />
<result column="ljbh" property="ljbh" />
<result column="ljmc" property="ljmc" />
<result column="ljgg" property="ljgg" />
<result column="ljcz" property="ljcz" />
<result column="wpfl" property="wpfl" />
<result column="jldw" property="jldw" />
<result column="sl" property="sl" />
<result column="qjgjhrq" property="qjgjhrq" />
<result column="qfxqrqxz" property="qfxqrqxz" />
<result column="qfxqrqdz" property="qfxqrqdz" />
<result column="gylx" property="gylx" />
<result column="qjgfzry" property="qjgfzry" />
<result column="qsbbh" property="qsbbh" />
<result column="qjgry" property="qjgry" />
<result column="qjgksrq" property="qjgksrq" />
<result column="qjgjsrq" property="qjgjsrq" />
<result column="zt" property="zt" />
<result column="bzry" property="bzry" />
<result column="bzrq" property="bzrq" />
<result column="xfry" property="xfry" />
<result column="xfrq" property="xfrq" />
<result column="fkry" property="fkry" />
<result column="fkrq" property="fkrq" />
<result column="fkyy" property="fkyy" />
</resultMap>
<!-- 通用查询结果列 -->
<sql id="Base_Column_List">
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
</sql>
</mapper>

6
src/main/java/com/dsic/gj_erp/service/pgd/PgdDmjhService.java
Unescape View File

@ -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<PgdDmjh> {
void saveDmPgdXd(List<PgdDmjh> dmjhs, HttpServletRequest request);
void saveDmPgdFk(List<PgdDmjh> dmjhs, HttpServletRequest request);
void saveDmPgdXdBack(List<PgdDmjh> dmjhs, HttpServletRequest request);
void saveDmFk(List<PgdDmjh> dmjhs, HttpServletRequest request);
}

8
src/main/java/com/dsic/gj_erp/service/pgd/PgdPkjhService.java
Unescape View File

@ -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<PgdPkjh> {
void savePkPgdXd(List<PgdPkjh> pkjhs, HttpServletRequest request);
void savePkPgdFk(List<PgdPkjh> pkjhs, HttpServletRequest request);
void savePkPgdXdBack(List<PgdPkjh> pkjhs, HttpServletRequest request);
void savePkPgdXd(List<DmYdjhLj> pkjhs, HttpServletRequest request);
void savePkPgdFk(List<DmYdjhLj> pkjhs, HttpServletRequest request);
void savePkFk(List<DmYdjhLj> pkjhs, HttpServletRequest request);
void savePkPgdXdBack(List<DmYdjhLj> pkjhs, HttpServletRequest request);
}

1
src/main/java/com/dsic/gj_erp/service/pgd/PgdPwjhService.java
Unescape View File

@ -19,6 +19,7 @@ public interface PgdPwjhService extends IService<PgdPwjh> {
void savePwPgdXd(List<PgdPwjh> pwjhs, HttpServletRequest request);
void savePwPgdFk(List<PgdPwjh> pwjhs, HttpServletRequest request);
void savePwFk(List<PgdPwjh> pwjhs, HttpServletRequest request);
void savePwPgdXdBack(List<PgdPwjh> pwjhs, HttpServletRequest request);
}

1
src/main/java/com/dsic/gj_erp/service/pgd/PgdQgjhService.java
Unescape View File

@ -19,6 +19,7 @@ public interface PgdQgjhService extends IService<PgdQgjh> {
void saveQgPgdXd(List<PgdQgjh> qgjhs, HttpServletRequest request);
void saveQgPgdFk(List<PgdQgjh> qgjhs, HttpServletRequest request);
void saveQgdFk(List<PgdQgjh> qgjhs, HttpServletRequest request);
void saveQgPgdXdBack(List<PgdQgjh> qgjhs, HttpServletRequest request);
void qgToQm(List<PgdQgjh> qgjhs, HttpServletRequest request);
void qgToPk(List<PgdQgjh> qgjhs, HttpServletRequest request);

13
src/main/java/com/dsic/gj_erp/service/pgd/PgdQmjhService.java
Unescape View File

@ -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;
/**
* <p>
@ -17,8 +20,12 @@ import java.util.List;
*/
public interface PgdQmjhService extends IService<PgdQmjh> {
void saveQmPgdXd(List<PgdQmjh> qmjhs, HttpServletRequest request);
void saveQmPgdFk(List<PgdQmjh> qmjhs, HttpServletRequest request);
void saveQmPgdXdBack(List<PgdQmjh> qmjhs, HttpServletRequest request);
void saveQmPgdXd(List<DmYdjhLj> qmjhs, HttpServletRequest request);
void saveQmPgdFk(List<DmYdjhLj> qmjhs, HttpServletRequest request);
void saveQmFk(List<DmYdjhLj> qmjhs, HttpServletRequest request);
void saveQmPgdXdBack(List<DmYdjhLj> qmjhs, HttpServletRequest request);
List<Qmqz> selectQmByQgAndJh(Map map);
void insertQmList(Map map ,HttpServletRequest request);
void removeQmList(Map map,HttpServletRequest request);
}

1
src/main/java/com/dsic/gj_erp/service/pgd/PgdSljhService.java
Unescape View File

@ -20,6 +20,7 @@ public interface PgdSljhService extends IService<PgdSljh> {
void saveSljhPgdXd(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);

53
src/main/java/com/dsic/gj_erp/service/pgd/impl/PgdDmjhServiceImpl.java
Unescape View File

@ -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<PgdDmjhMapper, PgdDmjh> implements PgdDmjhService {
@Override
public void saveDmPgdXd(List<PgdDmjh> dmjhs, HttpServletRequest request) {
List<PgdDmjh>ups= 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<PgdDmjh> dmjhs, HttpServletRequest request) {
List<PgdDmjh>ups= 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<PgdDmjh> dmjhs, HttpServletRequest request) {
List<PgdDmjh>ups= 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<PgdDmjh> dmjhs, HttpServletRequest request) {
List<PgdDmjh>ups= 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);
}
}

68
src/main/java/com/dsic/gj_erp/service/pgd/impl/PgdPkjhServiceImpl.java
Unescape View File

@ -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<PgdPkjhMapper, PgdPkjh> implements PgdPkjhService {
@Autowired
DmYdjhLjService dmYdjhLjService;
@Override
public void savePkPgdXd(List<DmYdjhLj> pkjhs, HttpServletRequest request) {
List<DmYdjhLj>ups= 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<PgdPkjh> pkjhs, HttpServletRequest request) {
List<PgdPkjh>ups= new ArrayList<>();
public void savePkPgdFk(List<DmYdjhLj> pkjhs, HttpServletRequest request) {
List<DmYdjhLj>ups= 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<PgdPkjh> pkjhs, HttpServletRequest request) {
List<PgdPkjh>ups= new ArrayList<>();
public void savePkFk(List<DmYdjhLj> pkjhs, HttpServletRequest request) {
List<DmYdjhLj>ups= 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<PgdPkjh> pkjhs, HttpServletRequest request) {
List<PgdPkjh>ups= new ArrayList<>();
public void savePkPgdXdBack(List<DmYdjhLj> pkjhs, HttpServletRequest request) {
List<DmYdjhLj>ups= 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);
}
}

15
src/main/java/com/dsic/gj_erp/service/pgd/impl/PgdPwjhServiceImpl.java
Unescape View File

@ -54,6 +54,21 @@ public class PgdPwjhServiceImpl extends ServiceImpl<PgdPwjhMapper, PgdPwjh> impl
this.updateBatchById(ups);
}
@Override
public void savePwFk(List<PgdPwjh> pwjhs, HttpServletRequest request) {
List<PgdPwjh>ups= 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<PgdPwjh> pwjhs, HttpServletRequest request) {

14
src/main/java/com/dsic/gj_erp/service/pgd/impl/PgdQgjhServiceImpl.java
Unescape View File

@ -55,6 +55,20 @@ public class PgdQgjhServiceImpl extends ServiceImpl<PgdQgjhMapper, PgdQgjh> impl
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.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<PgdQgjh> qgjhs, HttpServletRequest request) {

137
src/main/java/com/dsic/gj_erp/service/pgd/impl/PgdQmjhServiceImpl.java
Unescape View File

@ -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;
/**
* <p>
@ -24,52 +31,136 @@ import java.util.List;
*/
@Service
public class PgdQmjhServiceImpl extends ServiceImpl<PgdQmjhMapper, PgdQmjh> implements PgdQmjhService {
@Autowired
PgdQmjhMapper qmjhMapper;
@Autowired
DmYdjhLjService dmYdjhLjService;
@Override
@Transactional(rollbackFor = Exception.class)
public void saveQmPgdXd(List<PgdQmjh> qmjhs, HttpServletRequest request) {
List<PgdQmjh>ups= new ArrayList<>();
public void saveQmPgdXd(List<DmYdjhLj> qmjhs, HttpServletRequest request) {
List<DmYdjhLj>ups= 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<PgdQmjh> qmjhs, HttpServletRequest request) {
List<PgdQmjh>ups= new ArrayList<>();
public void saveQmPgdFk(List<DmYdjhLj> qmjhs, HttpServletRequest request) {
List<DmYdjhLj>ups= 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<DmYdjhLj> qmjhs, HttpServletRequest request) {
List<DmYdjhLj>ups= 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<PgdQmjh> qmjhs, HttpServletRequest request) {
List<PgdQmjh>ups= new ArrayList<>();
public void saveQmPgdXdBack(List<DmYdjhLj> qmjhs, HttpServletRequest request) {
List<DmYdjhLj>ups= 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<Qmqz> 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<Qmqz> list =(ArrayList)map.get("list");
String lx =(String)map.get("lx");
String str= JSON.toJSONString(list);
list= JSONObject.parseArray(str, Qmqz.class);
List<DmYdjhLj> 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<Qmqz> list =(ArrayList)map.get("list");
String lx =(String)map.get("lx");
String str= JSON.toJSONString(list);
list= JSONObject.parseArray(str, Qmqz.class);
List<DmYdjhLj> 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);
}
}

14
src/main/java/com/dsic/gj_erp/service/pgd/impl/PgdSljhServiceImpl.java
Unescape View File

@ -57,6 +57,20 @@ public class PgdSljhServiceImpl extends ServiceImpl<PgdSljhMapper, PgdSljh> impl
this.updateBatchById(ups);
}
@Override
public void saveSljhFk(List<PgdSljh> sljhs, HttpServletRequest request) {
List<PgdSljh>ups= 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<PgdSljh> sljhs, HttpServletRequest request) {

0
src/main/java/com/dsic/gj_erp/mapper/pgd/PgdDhMapper.xml → src/main/resources/mappers/pgd/PgdDhMapper.xml
Unescape View File

0
src/main/java/com/dsic/gj_erp/mapper/pgd/PgdDmjhMapper.xml → src/main/resources/mappers/pgd/PgdDmjhMapper.xml
Unescape View File

0
src/main/java/com/dsic/gj_erp/mapper/pgd/PgdPkjhMapper.xml → src/main/resources/mappers/pgd/PgdPkjhMapper.xml
Unescape View File

0
src/main/java/com/dsic/gj_erp/mapper/pgd/PgdPwjhMapper.xml → src/main/resources/mappers/pgd/PgdPwjhMapper.xml
Unescape View File

0
src/main/java/com/dsic/gj_erp/mapper/pgd/PgdQgjhMapper.xml → src/main/resources/mappers/pgd/PgdQgjhMapper.xml
Unescape View File

153
src/main/resources/mappers/pgd/PgdQmjhMapper.xml
Unescape View File

@ -0,0 +1,153 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.dsic.gj_erp.mapper.pgd.PgdQmjhMapper">
<!-- 通用查询映射结果 -->
<resultMap id="BaseResultMap" type="com.dsic.gj_erp.bean.pgd.PgdQmjh">
<id column="id" property="id" />
<result column="czbh" property="czbh" />
<result column="pl" property="pl" />
<result column="fd" property="fd" />
<result column="kw" property="kw" />
<result column="zl" property="zl" />
<result column="tlth" property="tlth" />
<result column="ptblx" property="ptblx" />
<result column="ljbh" property="ljbh" />
<result column="ljmc" property="ljmc" />
<result column="ljgg" property="ljgg" />
<result column="ljcz" property="ljcz" />
<result column="wpfl" property="wpfl" />
<result column="jldw" property="jldw" />
<result column="sl" property="sl" />
<result column="qjgjhrq" property="qjgjhrq" />
<result column="qfxqrqxz" property="qfxqrqxz" />
<result column="qfxqrqdz" property="qfxqrqdz" />
<result column="gylx" property="gylx" />
<result column="qjgfzry" property="qjgfzry" />
<result column="qsbbh" property="qsbbh" />
<result column="qjgry" property="qjgry" />
<result column="qjgksrq" property="qjgksrq" />
<result column="qjgjsrq" property="qjgjsrq" />
<result column="zt" property="zt" />
<result column="bzry" property="bzry" />
<result column="bzrq" property="bzrq" />
<result column="xfry" property="xfry" />
<result column="xfrq" property="xfrq" />
<result column="fkry" property="fkry" />
<result column="fkrq" property="fkrq" />
<result column="fkyy" property="fkyy" />
</resultMap>
<!-- 通用查询结果列 -->
<sql id="Base_Column_List">
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
</sql>
<select id="selectQmByQgAndJh" resultType="com.dsic.gj_erp.bean.pgd.Qmqz" parameterType="map">
SELECT
dm_ydjh_lj.czbh as lczbh,
dm_ydjh_lj.pl as lpl ,
dm_ydjh_lj.fd as lfd,
dm_ydjh_lj.kw as lkw,
dm_ydjh_lj.zl as lzl,
dm_ydjh_lj.tlth as ltlth,
dm_ydjh_lj.ptblx as lptblx,
dm_ydjh_lj.ljbh as ljbh,
dm_ydjh_lj.ljmc as lljmc,
dm_ydjh_lj.ljgg as lljgg,
dm_ydjh_lj.ljcz as lljcz,
dm_ydjh_lj.wpfl as lwpfl,
dm_ydjh_lj.jldw as ljldw,
dm_ydjh_lj.sl as lsl,
dm_ydjh_lj.qfxqrqxz as lqfxqrqxz,
dm_ydjh_lj.qfxqrqdz as lqfxqrqdz,
dm_ydjh_lj.gylx as gylx,
dm_ydjh_lj.id,
pgd_qgjh.czbh,
pgd_qgjh.pl,
pgd_qgjh.fd,
pgd_qgjh.zl,
pgd_qgjh.lqlb,
pgd_qgjh.kw,
pgd_qgjh.tlth,
pgd_qgjh.wpgg,
pgd_qgjh.wpcz,
pgd_qgjh.wpzl,
pgd_qgjh.qgjhrq,
pgd_qgjh.qfxqrqxz,
pgd_qgjh.qfxqrqdz,
pgd_qgjh.pwjhwgrq,
pgd_qgjh.qgfzry,
pgd_qgjh.hxsbbh,
pgd_qgjh.hxcd,
pgd_qgjh.hxkccd,
pgd_qgjh.qgsbbh,
pgd_qgjh.qgcd,
pgd_qgjh.qgkccd,
pgd_qgjh.hxry,
pgd_qgjh.hxksrq,
pgd_qgjh.hxjsrq,
pgd_qgjh.qgry,
pgd_qgjh.qgksrq,
pgd_qgjh.qgjsrq,
pgd_qgjh.zt,
pgd_qgjh.bzry,
pgd_qgjh.bzrq,
pgd_qgjh.xfry,
pgd_qgjh.xfrq,
pgd_qgjh.fkry,
pgd_qgjh.fkrq,
pgd_qgjh.fkyy
FROM
pgd_qgjh LEFT JOIN dm_ydjh_lj on pgd_qgjh.czbh=dm_ydjh_lj.czbh and pgd_qgjh.pl= dm_ydjh_lj.pl and pgd_qgjh.tlth =dm_ydjh_lj.tlth
where 1=1
<if test=" dcch!=null and dcch!=''">
and dm_ydjh_lj.czbh=#{dcch}
</if>
<if test=" pl!=null and pl!=''">
and dm_ydjh_lj.pl=#{pl}
</if>
<if test=" tlth!=null and tlth!=''">
and dm_ydjh_lj.tlth=#{tlth}
</if>
<if test="lx=='q'.toString()">
and isnull(dm_ydjh_lj.qdr,'')=''
<if test=" q!=null and q!=''">
and ISNULL(dm_ydjh_lj.qbs,'')='Y'
</if>
</if>
<if test="lx=='d'.toString()">
and isnull(dm_ydjh_lj.dmdr,'')=''
<if test=" d!=null and d!=''">
and ISNULL(dm_ydjh_lj.dmbs,'')='Y'
</if>
</if>
<if test="lx=='p'.toString()">
and isnull(dm_ydjh_lj.pkdr,'')=''
<if test=" p!=null and p!=''">
and ISNULL(dm_ydjh_lj.p,'')='Y'
</if>
</if>
</select>
</mapper>

0
src/main/java/com/dsic/gj_erp/mapper/pgd/PgdSljhMapper.xml → src/main/resources/mappers/pgd/PgdSljhMapper.xml
Unescape View File

0
src/main/java/com/dsic/gj_erp/mapper/pgd/PgdTzjhMapper.xml → src/main/resources/mappers/pgd/PgdTzjhMapper.xml
Unescape View File

Write Preview
Loading…
Cancel
Save