From be8fdba775a562a85b401e15cfdf3db349e66bd7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=93=B2=E5=A5=87?= <13840175730@139.com> Date: Mon, 4 Dec 2023 17:07:08 +0800 Subject: [PATCH] =?UTF-8?q?1.=E5=A2=9E=E5=8A=A0=E6=91=86=E6=94=BE=E4=BD=8D?= =?UTF-8?q?=E7=BD=AE=E7=9B=B8=E5=85=B3=E5=8A=9F=E8=83=BD=202.=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E9=87=87=E8=B4=AD=E8=AE=A1=E5=88=92=E5=88=B0=E8=B4=A7?= =?UTF-8?q?=E6=83=85=E5=86=B5=E6=9F=A5=E8=AF=A2=203.=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E9=A2=84=E9=85=8D=E7=9B=98=E7=9B=B8=E5=85=B3=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/dsic/gj_erp/bean/jcsj/DmDwxxp.java | 23 ++++ .../controller/jcsj/DmDwxxpController.java | 52 ++++++++ .../controller/jcsj/EmSbjbbController.java | 7 + .../controller/jhgk/DmSygdMxController.java | 6 + .../gj_erp/dao/jcsj/EmSbjbbRepository.java | 3 + .../gj_erp/mapper/jcsj/DmDwxxpMapper.java | 7 + .../gj_erp/mapper/jhgk/DmSygdMxMapper.java | 3 + .../gj_erp/service/jcsj/EmSbjbbService.java | 2 + .../service/jcsj/impl/DmDwxxpService.java | 21 +++ .../service/jcsj/impl/EmSbjbbServiceImpl.java | 5 + .../gj_erp/service/jhgk/DmSygdMxService.java | 2 + .../jhgk/impl/DmSygdMxServiceImpl.java | 7 + .../resources/mappers/jhgk/DmSygdMxMapper.xml | 124 ++++++++++++++++++ 13 files changed, 262 insertions(+) create mode 100644 src/main/java/com/dsic/gj_erp/bean/jcsj/DmDwxxp.java create mode 100644 src/main/java/com/dsic/gj_erp/controller/jcsj/DmDwxxpController.java create mode 100644 src/main/java/com/dsic/gj_erp/mapper/jcsj/DmDwxxpMapper.java create mode 100644 src/main/java/com/dsic/gj_erp/service/jcsj/impl/DmDwxxpService.java diff --git a/src/main/java/com/dsic/gj_erp/bean/jcsj/DmDwxxp.java b/src/main/java/com/dsic/gj_erp/bean/jcsj/DmDwxxp.java new file mode 100644 index 0000000..3e5cdd5 --- /dev/null +++ b/src/main/java/com/dsic/gj_erp/bean/jcsj/DmDwxxp.java @@ -0,0 +1,23 @@ +package com.dsic.gj_erp.bean.jcsj; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.github.jeffreyning.mybatisplus.anno.MppMultiId; +import lombok.Getter; +import lombok.Setter; + +import java.io.Serializable; + +/** + * 垛位信息表 + */ +@Getter +@Setter +@TableName("dm_dwxxp") +public class DmDwxxp implements Serializable { + + @MppMultiId + private String dwh;//垛位号 + + @MppMultiId + private String qy;//区域 +} diff --git a/src/main/java/com/dsic/gj_erp/controller/jcsj/DmDwxxpController.java b/src/main/java/com/dsic/gj_erp/controller/jcsj/DmDwxxpController.java new file mode 100644 index 0000000..7dd2d6a --- /dev/null +++ b/src/main/java/com/dsic/gj_erp/controller/jcsj/DmDwxxpController.java @@ -0,0 +1,52 @@ +package com.dsic.gj_erp.controller.jcsj; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.dsic.gj_erp.bean.ResultBean; +import com.dsic.gj_erp.bean.jcsj.DmDwxxp; +import com.dsic.gj_erp.service.jcsj.impl.DmDwxxpService; +import lombok.AllArgsConstructor; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; +import java.util.Map; + +@RestController +@RequestMapping("dwxx") +@AllArgsConstructor +public class DmDwxxpController { + + private final DmDwxxpService dwxxpService; + + @PostMapping("addOrEdit") + public ResultBean add(@RequestBody Map> map){ + try { + dwxxpService.saveOrEdit(map.get("add")); + dwxxpService.saveOrEdit(map.get("edit")); + }catch (Exception e){ + throw new RuntimeException("同一个区域存在相同垛位号,禁止保存"); + } + if (map.get("remove").size()>0){ + map.get("remove").forEach(dwxxpService::deleteByMultiId); + } + + return new ResultBean<>(); + } + + @PostMapping("remove") + public ResultBean remove(@RequestBody DmDwxxp dwxxp){ + dwxxpService.remove(dwxxp); + return new ResultBean<>(); + } + + @PostMapping("list") + public ResultBean list(@RequestBody DmDwxxp dwxxp){ + List list = dwxxpService.list(Wrappers.lambdaQuery() + .eq(StrUtil.isNotEmpty(dwxxp.getQy()), DmDwxxp::getQy, dwxxp.getQy()) + ); + return new ResultBean<>(list); + } +} diff --git a/src/main/java/com/dsic/gj_erp/controller/jcsj/EmSbjbbController.java b/src/main/java/com/dsic/gj_erp/controller/jcsj/EmSbjbbController.java index d4ff71d..2370c15 100644 --- a/src/main/java/com/dsic/gj_erp/controller/jcsj/EmSbjbbController.java +++ b/src/main/java/com/dsic/gj_erp/controller/jcsj/EmSbjbbController.java @@ -74,6 +74,13 @@ public class EmSbjbbController { return new ResultBean(emSbjbbs); } + @ApiOperation(value = "所有供货商") + @PostMapping(value = "/getGhs") + public ResultBean getGhs() { + List emSbjbbs= emSbjbbService.getGhs(); + return new ResultBean(emSbjbbs); + } + @ApiOperation(value = "设备分类") @PostMapping(value = "/getSBLX") public ResultBean getSBLX() { diff --git a/src/main/java/com/dsic/gj_erp/controller/jhgk/DmSygdMxController.java b/src/main/java/com/dsic/gj_erp/controller/jhgk/DmSygdMxController.java index 626cc7c..20a4ea9 100644 --- a/src/main/java/com/dsic/gj_erp/controller/jhgk/DmSygdMxController.java +++ b/src/main/java/com/dsic/gj_erp/controller/jhgk/DmSygdMxController.java @@ -14,6 +14,7 @@ import com.dsic.gj_erp.service.jcsj.EmSbcnpService; import com.dsic.gj_erp.service.jhgk.DmSygdMxService; import com.dsic.gj_erp.service.sy.SYService; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -40,6 +41,11 @@ public class DmSygdMxController { @Autowired private EmSbcnpService emSbcnpService; + @PostMapping("cgjhdhqk") + public ResultBean cgjhdhqk(@RequestBody Map map){ + return new ResultBean<>(service.cgjhdhqk(map)); + } + @RequestMapping("/getList") @AuthFunction public ResultBean getList(@RequestBody DmSygdMx sygd){ diff --git a/src/main/java/com/dsic/gj_erp/dao/jcsj/EmSbjbbRepository.java b/src/main/java/com/dsic/gj_erp/dao/jcsj/EmSbjbbRepository.java index 0a89c16..efda05b 100644 --- a/src/main/java/com/dsic/gj_erp/dao/jcsj/EmSbjbbRepository.java +++ b/src/main/java/com/dsic/gj_erp/dao/jcsj/EmSbjbbRepository.java @@ -19,4 +19,7 @@ public interface EmSbjbbRepository extends JpaRepository { @Query(nativeQuery = true,value = "SELECT szcs,sbbh,sbmc FROM EM_SBJBB where sbzt not in('04','05') or sbzt is null") List BMMCBM(); + + @Query(nativeQuery = true,value = "select ghsbm,ghsqc from MSGHSJBP") + List ghs(); } diff --git a/src/main/java/com/dsic/gj_erp/mapper/jcsj/DmDwxxpMapper.java b/src/main/java/com/dsic/gj_erp/mapper/jcsj/DmDwxxpMapper.java new file mode 100644 index 0000000..0fb5f85 --- /dev/null +++ b/src/main/java/com/dsic/gj_erp/mapper/jcsj/DmDwxxpMapper.java @@ -0,0 +1,7 @@ +package com.dsic.gj_erp.mapper.jcsj; + +import com.dsic.gj_erp.bean.jcsj.DmDwxxp; +import com.github.jeffreyning.mybatisplus.base.MppBaseMapper; + +public interface DmDwxxpMapper extends MppBaseMapper { +} diff --git a/src/main/java/com/dsic/gj_erp/mapper/jhgk/DmSygdMxMapper.java b/src/main/java/com/dsic/gj_erp/mapper/jhgk/DmSygdMxMapper.java index 9fc0b4e..2f56e81 100644 --- a/src/main/java/com/dsic/gj_erp/mapper/jhgk/DmSygdMxMapper.java +++ b/src/main/java/com/dsic/gj_erp/mapper/jhgk/DmSygdMxMapper.java @@ -10,6 +10,7 @@ import com.dsic.gj_erp.bean.jhgk.dto.Pldto; import org.apache.ibatis.annotations.Param; import java.util.List; +import java.util.Map; /** *

@@ -28,4 +29,6 @@ public interface DmSygdMxMapper extends BaseMapper { int setParent(); List getkw(@Param("begin") String begin, @Param("end") String end); List getPl(@Param("begin") String begin,@Param("end") String end); + + List cgjhdhqk(Map map); } diff --git a/src/main/java/com/dsic/gj_erp/service/jcsj/EmSbjbbService.java b/src/main/java/com/dsic/gj_erp/service/jcsj/EmSbjbbService.java index f130674..af593db 100644 --- a/src/main/java/com/dsic/gj_erp/service/jcsj/EmSbjbbService.java +++ b/src/main/java/com/dsic/gj_erp/service/jcsj/EmSbjbbService.java @@ -31,6 +31,8 @@ public interface EmSbjbbService extends IService { List getGYS(); + List getGhs(); + List getSBLX(); Map> getBMMCBM(); diff --git a/src/main/java/com/dsic/gj_erp/service/jcsj/impl/DmDwxxpService.java b/src/main/java/com/dsic/gj_erp/service/jcsj/impl/DmDwxxpService.java new file mode 100644 index 0000000..819e2d8 --- /dev/null +++ b/src/main/java/com/dsic/gj_erp/service/jcsj/impl/DmDwxxpService.java @@ -0,0 +1,21 @@ +package com.dsic.gj_erp.service.jcsj.impl; + +import com.dsic.gj_erp.bean.jcsj.DmDwxxp; +import com.dsic.gj_erp.mapper.jcsj.DmDwxxpMapper; +import com.github.jeffreyning.mybatisplus.service.MppServiceImpl; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; + +@Service +public class DmDwxxpService extends MppServiceImpl { + + @Transactional(rollbackFor = Exception.class) + public void saveOrEdit(List list){ + this.saveOrUpdateBatchByMultiId(list); + } + public void remove(DmDwxxp dwxxp){ + baseMapper.deleteByMultiId(dwxxp); + } +} diff --git a/src/main/java/com/dsic/gj_erp/service/jcsj/impl/EmSbjbbServiceImpl.java b/src/main/java/com/dsic/gj_erp/service/jcsj/impl/EmSbjbbServiceImpl.java index c461698..347d776 100644 --- a/src/main/java/com/dsic/gj_erp/service/jcsj/impl/EmSbjbbServiceImpl.java +++ b/src/main/java/com/dsic/gj_erp/service/jcsj/impl/EmSbjbbServiceImpl.java @@ -89,6 +89,11 @@ public class EmSbjbbServiceImpl extends ServiceImpl impl return emSbjbbs; } + public List getGhs() { + List emSbjbbs=emSbjbbRepository.ghs(); + return emSbjbbs; + } + @Override public List getSBLX() { List emSbjbbs=emSbjbbRepository.sblx(); diff --git a/src/main/java/com/dsic/gj_erp/service/jhgk/DmSygdMxService.java b/src/main/java/com/dsic/gj_erp/service/jhgk/DmSygdMxService.java index d8b99db..ec42720 100644 --- a/src/main/java/com/dsic/gj_erp/service/jhgk/DmSygdMxService.java +++ b/src/main/java/com/dsic/gj_erp/service/jhgk/DmSygdMxService.java @@ -26,4 +26,6 @@ public interface DmSygdMxService extends IService { List getTZList(List list); List getDhList(List list); ResultBean tqSygd(); + + Object cgjhdhqk(Map map); } diff --git a/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmSygdMxServiceImpl.java b/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmSygdMxServiceImpl.java index 3c5e40e..4242806 100644 --- a/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmSygdMxServiceImpl.java +++ b/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmSygdMxServiceImpl.java @@ -58,6 +58,13 @@ public class DmSygdMxServiceImpl extends ServiceImpl i @Resource private DmSygdMxLjServiceImpl ljService; + /** + * 采购计划到货情况 + */ + public Object cgjhdhqk(Map map){ + return baseMapper.cgjhdhqk(map); + } + /** * 三月滚动需求期排产 * 滚动需求期信息，提取相应的BOM数据，后合并到套料图级别 diff --git a/src/main/resources/mappers/jhgk/DmSygdMxMapper.xml b/src/main/resources/mappers/jhgk/DmSygdMxMapper.xml index b8f166d..b1136de 100644 --- a/src/main/resources/mappers/jhgk/DmSygdMxMapper.xml +++ b/src/main/resources/mappers/jhgk/DmSygdMxMapper.xml @@ -347,4 +347,128 @@ ,dm_sygd_mx.PL + + +