From 11265140709446740c42f2791a9aba31d78d8f09 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=91=A3=E5=93=B2=E5=A5=87?= <13840175730@139.com>
Date: Tue, 25 Feb 2025 16:13:20 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=AD=A3=E6=89=B9=E9=87=8F=E4=B8=8A?=
 =?UTF-8?q?=E6=96=99=E9=A2=84=E5=A4=84=E7=90=86=E5=9E=9B=E4=BD=8D=E5=B1=82?=
 =?UTF-8?q?=E6=95=B0=E8=AE=A1=E7=AE=97=E9=94=99=E8=AF=AF=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=202.=E5=A2=9E=E5=8A=A0=E5=88=87=E5=89=B2=E5=90=8E?=
 =?UTF-8?q?=E6=91=86=E6=94=BE=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/zyjh/GetXXXController.java     | 35 +++++++++++++++++++
 .../controller/zyjh/ZyjhController.java       | 11 ++++++
 .../service/jcsj/impl/DmDwxxpService.java     |  8 +++++
 .../resources/mappers/jcsj/DmDwxxpMapper.xml  |  5 +++
 4 files changed, 59 insertions(+)
 create mode 100644 src/main/java/com/dsic/gj_erp/controller/zyjh/GetXXXController.java
 create mode 100644 src/main/resources/mappers/jcsj/DmDwxxpMapper.xml

diff --git a/src/main/java/com/dsic/gj_erp/controller/zyjh/GetXXXController.java b/src/main/java/com/dsic/gj_erp/controller/zyjh/GetXXXController.java
new file mode 100644
index 0000000..4d2b7fa
--- /dev/null
+++ b/src/main/java/com/dsic/gj_erp/controller/zyjh/GetXXXController.java
@@ -0,0 +1,35 @@
+package com.dsic.gj_erp.controller.zyjh;
+
+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.jhgk.DmYdjhLj;
+import com.dsic.gj_erp.service.jcsj.impl.DmDwxxpService;
+import com.dsic.gj_erp.service.jhgk.DmYdjhLjService;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+@RestController
+@RequestMapping("zyjh")
+@AllArgsConstructor
+public class GetXXXController {
+
+    private final DmDwxxpService dmDwxxpService;
+    private final DmYdjhLjService ydjhLjService;
+
+    @PostMapping("getYdjhlj")
+    public ResultBean<?> getYdjhlj(@RequestBody DmYdjhLj lj){
+        List<DmYdjhLj> list = ydjhLjService.list(Wrappers.<DmYdjhLj>lambdaQuery()
+                .eq(DmYdjhLj::getCzbh, lj.getCzbh())
+                .eq(StrUtil.isNotEmpty(lj.getPl()), DmYdjhLj::getPl, lj.getPl())
+        );
+        return new ResultBean<>(list);
+    }
+
+    @GetMapping("getBFangDwxx")
+    public ResultBean<?> getBFangDwxx(){
+        return new ResultBean<>(dmDwxxpService.getDwxxForSelect());
+    }
+}
diff --git a/src/main/java/com/dsic/gj_erp/controller/zyjh/ZyjhController.java b/src/main/java/com/dsic/gj_erp/controller/zyjh/ZyjhController.java
index ad349d3..42c9a5a 100644
--- a/src/main/java/com/dsic/gj_erp/controller/zyjh/ZyjhController.java
+++ b/src/main/java/com/dsic/gj_erp/controller/zyjh/ZyjhController.java
@@ -59,6 +59,17 @@ public class ZyjhController {
 
     private final MpDhsjServcie mpDhsjServcie;
 
+    /**
+     * 零件摆放
+     * @param list
+     * @return
+     */
+    @PostMapping("ljbf")
+    public ResultBean<?> ljbf(@RequestBody List<DmYdjhLj> list){
+
+        return new ResultBean<>();
+    }
+
     @GetMapping("getBzryByBz")
     public ResultBean<?> getBzryByBz(String zyq, String zt){
         return new ResultBean<>(zyjhService.getBzryByBz(zyq,zt));
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
index 819e2d8..c1651ca 100644
--- 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
@@ -7,10 +7,17 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 @Service
 public class DmDwxxpService extends MppServiceImpl<DmDwxxpMapper, DmDwxxp> {
 
+    public Map<String,List<DmDwxxp>> getDwxxForSelect(){
+        List<DmDwxxp> list = this.list();
+        return list.stream().collect(Collectors.groupingBy(DmDwxxp::getQy));
+    }
+
     @Transactional(rollbackFor = Exception.class)
     public void saveOrEdit(List<DmDwxxp> list){
         this.saveOrUpdateBatchByMultiId(list);
@@ -18,4 +25,5 @@ public class DmDwxxpService extends MppServiceImpl<DmDwxxpMapper, DmDwxxp> {
     public void remove(DmDwxxp dwxxp){
         baseMapper.deleteByMultiId(dwxxp);
     }
+
 }
diff --git a/src/main/resources/mappers/jcsj/DmDwxxpMapper.xml b/src/main/resources/mappers/jcsj/DmDwxxpMapper.xml
new file mode 100644
index 0000000..68696b6
--- /dev/null
+++ b/src/main/resources/mappers/jcsj/DmDwxxpMapper.xml
@@ -0,0 +1,5 @@
+<?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.jcsj.DmDwxxpMapper">
+
+</mapper>