1.增加月度计划下发前校验套料图下发情况、物料情况是否满足施工进度要求,不满足时进行提醒,并且在下发时进行二次确认才可下发

src/main/java/com/dsic/gj_erp/bean/kc/ImCkwpkwp.java

@@ -0,0 +1,32 @@
+package com.dsic.gj_erp.bean.kc;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.github.jeffreyning.mybatisplus.anno.MppMultiId;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 库存信息
+ */
+@Getter
+@Setter
+@TableName("IM_CKWPKWP")
+public class ImCkwpkwp {
+    @MppMultiId
+    private String ckh;
+    @MppMultiId
+    private String wph;
+    @MppMultiId
+    private String kwh;//垛位
+    @MppMultiId
+    private String nbsbm;
+
+    private String cfcs1;//层数
+
+    private String dcCh;
+    private String dcFd;
+
+    private String qxkcl;//物品数量
+    private String wpzt;//ky:可用;dy:代用
+
+}

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

@@ -1,23 +1,33 @@
 package com.dsic.gj_erp.controller.jhgk;
 
 
+import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.dsic.gj_erp.annotation.AuthFunction;
 import com.dsic.gj_erp.bean.ResultBean;
+import com.dsic.gj_erp.bean.jcsj.DmCzplpNew;
 import com.dsic.gj_erp.bean.jhgk.DmYdjh;
+import com.dsic.gj_erp.bean.kc.ImCkwpkwp;
+import com.dsic.gj_erp.service.jcsj.DmCzplpNewService;
+import com.dsic.gj_erp.service.jcsj.DmCzplpService;
 import com.dsic.gj_erp.service.jhgk.DmYdjhService;
+import com.dsic.gj_erp.service.kc.ImCkwpkwpService;
+import org.mapstruct.factory.Mappers;
 import org.springframework.beans.factory.annotation.Autowired;
 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;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 /**
  * <p>
@@ -33,6 +43,11 @@ public class DmYdjhController {
 
     @Autowired
     private DmYdjhService service;
+    @Autowired
+    private ImCkwpkwpService kcService;
+
+    @Autowired
+    private DmCzplpNewService czplpNewService;
 
     @RequestMapping("/getList")
     @AuthFunction
@@ -44,7 +59,34 @@ public class DmYdjhController {
                 .le(StrUtil.isNotEmpty(map.get("yf")), "jssj", DateUtil.endOfMonth(DateUtil.parseDate(map.get("yf"))).toString("yyyy/MM/dd"))
                 .orderByAsc("jssj,dc_ch,dc_pl,zl,lqlb")
         );
-        return new ResultBean(list);
+
+        Map<String, List<DmYdjh>> collect = list.stream().collect(Collectors.groupingBy(DmYdjh::getDcCh));
+        List<Map<String, Object>> resultMap=new ArrayList<>();
+        //验证数据获取方法,后续可以都在这里进行获取
+        collect.forEach((key,val)->{
+            List<ImCkwpkwp> bcKcxx = kcService.getBcKcxx(key);
+            List<DmCzplpNew> czplpNewList = czplpNewService.list(Wrappers.<DmCzplpNew>lambdaQuery()
+                    .eq(DmCzplpNew::getDcCh, key)
+            );
+            val.forEach(item->{
+                Map<String, Object> itemMap = BeanUtil.beanToMap(item);
+                resultMap.add(itemMap);
+                bcKcxx.forEach(kc->{
+                    if (item.getDcCh().equals(kc.getDcCh())&&item.getDcFd().equals(kc.getDcFd())){
+                        itemMap.put("kc",kc);
+                    }
+                });
+                czplpNewList.forEach(czplpNew->{
+                    if (item.getDcCh().equals(czplpNew.getDcCh())&&item.getDcPl().equals(czplpNew.getDcPl())){
+                        itemMap.put("czplpNew",czplpNew);
+                    }
+                });
+            });
+
+
+        });
+
+        return new ResultBean(resultMap);
     }
 
 

src/main/java/com/dsic/gj_erp/mapper/kc/ImCkwpkwpMapper.java

@@ -0,0 +1,7 @@
+package com.dsic.gj_erp.mapper.kc;
+
+import com.dsic.gj_erp.bean.kc.ImCkwpkwp;
+import com.github.jeffreyning.mybatisplus.base.MppBaseMapper;
+
+public interface ImCkwpkwpMapper extends MppBaseMapper<ImCkwpkwp> {
+}

src/main/java/com/dsic/gj_erp/service/kc/ImCkwpkwpService.java

@@ -0,0 +1,31 @@
+package com.dsic.gj_erp.service.kc;
+
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.dsic.gj_erp.bean.kc.ImCkwpkwp;
+import com.dsic.gj_erp.mapper.kc.ImCkwpkwpMapper;
+import com.github.jeffreyning.mybatisplus.service.MppServiceImpl;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class ImCkwpkwpService extends MppServiceImpl<ImCkwpkwpMapper, ImCkwpkwp> {
+
+    /**
+     * 根据船只,分段获取板材库存信息
+     */
+    public List<ImCkwpkwp> getBcKcxx(String dcCh){
+        return this.getByDcch(dcCh,"01");
+    }
+
+    /**
+     * 根据仓库号,船只,分段获取板材/型材库存信息
+     */
+    public List<ImCkwpkwp> getByDcch(String dcCh,String ckh){
+        return this.list(Wrappers.<ImCkwpkwp>lambdaQuery()
+                .eq(ImCkwpkwp::getCkh,ckh)
+                .eq(ImCkwpkwp::getDcCh,dcCh)
+                .eq(ImCkwpkwp::getWpzt,"KY")
+        );
+    }
+}

src/main/resources/mappers/kc/ImCkwpkwp.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.kc.ImCkwpkwpMapper">
+
+</mapper>