1.预配盘和前方需求相关

pom.xml

@@ -233,6 +233,11 @@
             <version>2.3.5</version>
         </dependency>
 
+       <!-- <dependency>
+            <groupId>com.github.jeffreyning</groupId>
+            <artifactId>mybatisplus-plus</artifactId>
+            <version>1.7.4-RELEASE</version>
+        </dependency>-->
     </dependencies>
 
     <build>

src/main/java/com/dsic/gj_erp/bean/pgd/DmPpxxb.java

@@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableField;
 import java.io.Serializable;
+
+import com.github.jeffreyning.mybatisplus.anno.MppMultiId;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -159,8 +161,8 @@ public class DmPpxxb implements Serializable {
     @TableField("YLZD3")
     private String ylzd3;
 
-    @TableId(value = "XWH", type = IdType.ASSIGN_UUID)
-    private Double xwh;
+    @MppMultiId(value = "XWH")
+    private String xwh;
 
     @TableField("YLZD9")
     private String ylzd9;
@@ -213,7 +215,8 @@ public class DmPpxxb implements Serializable {
     @TableField("LCM4")
     private String lcm4;
 
-    @TableField("FXWPH")
+
+    @MppMultiId("FXWPH")
     private String fxwph;
 
     @TableField("WPCC")

src/main/java/com/dsic/gj_erp/controller/jhgk/YppController.java

@@ -10,11 +10,14 @@ import com.dsic.gj_erp.mapper.pgd.DmPpxxbMapper;
 import com.dsic.gj_erp.service.jhgk.DmQfxqService;
 import com.dsic.gj_erp.service.pgd.DmPpxxbService;
 import lombok.AllArgsConstructor;
+import org.modelmapper.ModelMapper;
+import org.springframework.transaction.annotation.Transactional;
 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.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -33,18 +36,22 @@ public class YppController {
         String existsSql="select dc_ch,dc_pl,dc_fd from dm_ppxxb ";
         StringBuilder builder=new StringBuilder(existsSql);
         builder.append("where dc_ch=").append("'").append(qfxq.getDcCh()).append("'");
+        builder.append(" and dm_qfxq.dc_ch=").append("dm_ppxxb.dc_ch");
+        builder.append(" and dm_qfxq.dc_pl=").append("dm_ppxxb.dc_pl");
+        builder.append(" and dm_qfxq.dc_fd=").append("dm_ppxxb.dc_fd");
         if (StrUtil.isNotEmpty(qfxq.getDcPl())){
-            builder.append(" dc_pl=").append("'").append(qfxq.getDcPl()).append("'");
+            builder.append(" and dc_pl=").append("'").append(qfxq.getDcPl()).append("'");
         }
         if (StrUtil.isNotEmpty(qfxq.getDcFd())){
-            builder.append(" dc_fd=").append("'").append(qfxq.getDcFd()).append("'");
+            builder.append(" and dc_fd=").append("'").append(qfxq.getDcFd()).append("'");
         }
+
         builder.append(" group by dc_ch,dc_pl,dc_fd");
         List<DmQfxq> list = qfxqService.list(Wrappers.<DmQfxq>lambdaQuery()
                 .eq(DmQfxq::getDcCh, qfxq.getDcCh())
                 .eq(StrUtil.isNotEmpty(qfxq.getDcPl()),DmQfxq::getDcPl, qfxq.getDcPl())
                 .eq(StrUtil.isNotEmpty(qfxq.getDcFd()),DmQfxq::getDcFd, qfxq.getDcFd())
-                .eq(DmQfxq::getZt,"")
+                .eq(StrUtil.isNotEmpty(qfxq.getZt()),DmQfxq::getZt,qfxq.getZt())
                 .notExists(builder.toString())
         );
         return new ResultBean<>(list);
@@ -52,10 +59,16 @@ public class YppController {
 
     @PostMapping("getLjxx")
     public ResultBean<?> getLjxx(@RequestBody Map<String,Object> map){
-        List<DmYdjhLj> dmYdjhLj = ppxxbMapper.getDmYdjhLj(map);
+        List<DmPpxxb> dmYdjhLj = ppxxbMapper.getDmWlqd(map);
         return new ResultBean<>(dmYdjhLj);
     }
 
+    @PostMapping("getPpxx")
+    public ResultBean<?> getPpxx(@RequestBody Map<String,Object> map){
+        List<DmPpxxb> dmPpxxb = ppxxbMapper.getDmPpxxb(map);
+        return new ResultBean<>(dmPpxxb);
+    }
+
     @PostMapping("getList")
     public ResultBean<?> getList(@RequestBody DmPpxxb dmPpxxb){
         List<DmPpxxb> list = ppxxbService.list(Wrappers.<DmPpxxb>lambdaQuery()
@@ -74,4 +87,58 @@ public class YppController {
 
         return new ResultBean<>();
     }
+
+    @PostMapping("qtjc")
+    public ResultBean<?> qtjc(@RequestBody List<DmQfxq> list){
+        list.forEach(item->{
+            ModelMapper modelMapper = new ModelMapper();
+            Map map = modelMapper.map(item, Map.class);
+            List<DmPpxxb> dmYdjhLj = ppxxbMapper.getDmWlqd(map);
+            List<DmPpxxb> dmPpxxb = ppxxbMapper.getDmPpxxb(map);
+
+            if (dmPpxxb.size()==0){
+                throw new RuntimeException(item.getDcFd()+"分段未预配盘");
+            }
+
+            dmYdjhLj.forEach(_item->{
+                //todo 校验完工
+            });
+
+            dmPpxxb.forEach(_item->item.setZt("01"));
+            ppxxbService.updateBatchByMultiId(dmPpxxb);
+        });
+        return new ResultBean<>();
+    }
+
+    @PostMapping("zx")
+    @Transactional(rollbackFor = Exception.class)
+    public ResultBean<?> zx(@RequestBody List<DmQfxq> list){
+        List<DmPpxxb> printData=new ArrayList<>();
+        list.forEach(item->{
+            ModelMapper modelMapper = new ModelMapper();
+            Map map = modelMapper.map(item, Map.class);
+            List<DmPpxxb> dmPpxxb = ppxxbMapper.getDmPpxxb(map);
+            dmPpxxb.forEach(_item->{
+                item.setZt("04");
+            });
+            ppxxbService.updateBatchById(dmPpxxb);
+            printData.addAll(dmPpxxb);
+        });
+        return new ResultBean<>(printData);
+    }
+
+    @PostMapping("qr")
+    @Transactional(rollbackFor = Exception.class)
+    public ResultBean<?> qr(@RequestBody List<DmQfxq> list){
+        list.forEach(item->{
+            ModelMapper modelMapper = new ModelMapper();
+            Map map = modelMapper.map(item, Map.class);
+            List<DmPpxxb> dmPpxxb = ppxxbMapper.getDmPpxxb(map);
+            dmPpxxb.forEach(_item->{
+                item.setZt("05");
+            });
+            ppxxbService.updateBatchById(dmPpxxb);
+        });
+        return new ResultBean<>();
+    }
 }

src/main/java/com/dsic/gj_erp/controller/pgd/DmPpxxbController.java

@@ -46,7 +46,8 @@ public class DmPpxxbController {
     @PostMapping("saveDmppxxb")
     @Transactional(rollbackFor = Exception.class)
     public ResultBean<?> save(@RequestBody List<DmPpxxb> list){
-        ppxxbService.saveOrUpdateBatch(list);
+        list.forEach(item->item.setZt("00"));
+        ppxxbService.saveOrUpdateBatchByMultiId(list);
 
         return new ResultBean<>();
     }

src/main/java/com/dsic/gj_erp/mapper/pgd/DmPpxxbMapper.java

@@ -3,6 +3,7 @@ package com.dsic.gj_erp.mapper.pgd;
 import com.dsic.gj_erp.bean.jhgk.DmYdjhLj;
 import com.dsic.gj_erp.bean.pgd.DmPpxxb;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.github.jeffreyning.mybatisplus.base.MppBaseMapper;
 
 import java.util.List;
 import java.util.Map;
@@ -15,7 +16,9 @@ import java.util.Map;
  * @author xn
  * @since 2023-12-14
  */
-public interface DmPpxxbMapper extends BaseMapper<DmPpxxb> {
+public interface DmPpxxbMapper extends MppBaseMapper<DmPpxxb> {
 
-    List<DmYdjhLj> getDmYdjhLj(Map<String,Object> map);
+    List<DmPpxxb> getDmWlqd(Map<String,Object> map);
+
+    List<DmPpxxb> getDmPpxxb(Map<String,Object> map);
 }

src/main/java/com/dsic/gj_erp/service/pgd/DmPpxxbService.java

@@ -2,6 +2,7 @@ package com.dsic.gj_erp.service.pgd;
 
 import com.dsic.gj_erp.bean.pgd.DmPpxxb;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.github.jeffreyning.mybatisplus.service.IMppService;
 
 /**
  * <p>
@@ -11,6 +12,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @author xn
  * @since 2023-12-14
  */
-public interface DmPpxxbService extends IService<DmPpxxb> {
+public interface DmPpxxbService extends IMppService<DmPpxxb> {
 
 }

src/main/java/com/dsic/gj_erp/service/pgd/impl/DmPpxxbServiceImpl.java

@@ -3,7 +3,7 @@ package com.dsic.gj_erp.service.pgd.impl;
 import com.dsic.gj_erp.bean.pgd.DmPpxxb;
 import com.dsic.gj_erp.mapper.pgd.DmPpxxbMapper;
 import com.dsic.gj_erp.service.pgd.DmPpxxbService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.jeffreyning.mybatisplus.service.MppServiceImpl;
 import org.springframework.stereotype.Service;
 
 /**
@@ -15,6 +15,6 @@ import org.springframework.stereotype.Service;
  * @since 2023-12-14
  */
 @Service
-public class DmPpxxbServiceImpl extends ServiceImpl<DmPpxxbMapper, DmPpxxb> implements DmPpxxbService {
+public class DmPpxxbServiceImpl extends MppServiceImpl<DmPpxxbMapper, DmPpxxb> implements DmPpxxbService {
 
 }

src/main/resources/mappers/pgd/DmPpxxbMapper.xml

@@ -76,12 +76,21 @@
         ZXWPH, SL, JLDW, WPJB, WPFLM, ZDRY, XGRQ, DC_CH, DC_CM, DC_PL, DC_FD, DC_TH, DC_ZL, DC_TZ, DC_YJ, DC_YS, DC_PB, DC_LPH, DC_TPBH, DC_TPMC, JLDW1, WPMC, WPGG, WPXH, ABCLX, GZLX, YLZD1, LCM1, zt, drcs, tpxx, dzxqq, xzxqq, gylx, YLZD3, XWH, YLZD9, GYSBH, YHFLH, YLZD6, TQQXZL, LCM3, YLZD5, BZ, DEZL, LCM2, YXZZRQ, YLZD2, LCM5, YLZD8, XNJBS, DRRQ, LCM4, FXWPH, WPCC, FWPJB, JZL, XLCC, YLZD7, SJBCSL, YLZD4, GYLB, DRRY, WPH, YXQSRQ
     </sql>
 
-    <select id="getDmYdjhLj" resultType="com.dsic.gj_erp.bean.jhgk.DmYdjhLj">
+    <select id="getDmWlqd" resultType="com.dsic.gj_erp.bean.pgd.DmPpxxb">
         select
-            <include refid="Base_Column_List" />
+            wlqd.*
         from
-            dm_qfxq xq left join dm_ydjh_lj lj on xq.dc_ch =lj.czbh and xq.dc_pl =lj.pl  and xq.DC_FD =lj.fd
-        WHERE  xq.dc_ch =#{dcCh} and xq.dc_pl =#{dcPl} and xq.DC_FD ={dcFd}
+            dm_qfxq xq join dm_ydjh_lj lj on xq.dc_ch =lj.czbh and xq.dc_pl =lj.pl and xq.DC_FD =lj.fd
+            join dm_wlqd wlqd on lj.czbh=wlqd.dc_ch and lj.ljbh=wlqd.wph
+        WHERE  xq.dc_ch =#{dcCh} and xq.dc_pl =#{dcPl} and xq.DC_FD =#{dcFd}
+    </select>
+
+    <select id="getDmPpxxb" resultType="com.dsic.gj_erp.bean.pgd.DmPpxxb">
+        select
+            lj.*
+        from
+            dm_qfxq xq join dm_ppxxb lj on xq.dc_ch =lj.czbh and xq.dc_pl =lj.pl and xq.DC_FD =lj.fd
+        WHERE  xq.dc_ch =#{dcCh} and xq.dc_pl =#{dcPl} and xq.DC_FD =#{dcFd}
     </select>
 
 </mapper>