1.增加炉批号确认记录

2.修正看板月度计划情况数据显示问题

src/main/java/com/dsic/gj_erp/bean/jhgk/DmYdjh.java

@@ -367,6 +367,9 @@ public class DmYdjh implements Serializable {
 
     private String  kcbs;  // 库存标识
 
+    private String lphqrry;
+    private String lphqrrq;
+
 
     @TableField(exist = false)
     private Long bs;
@@ -383,7 +386,6 @@ public class DmYdjh implements Serializable {
     @TableField(exist = false)
     private Long qgCount;
 
-
     public String getUniqueData(){
         return StrUtil.format("{}_{}_{}_{}",this.dcCh,this.dcPl,this.dcFd,this.tzbh);
     }

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

@@ -1,19 +1,23 @@
 package com.dsic.gj_erp.controller.pgd;
 
 
+import cn.hutool.core.date.DateUtil;
 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.DmYdjh;
 import com.dsic.gj_erp.bean.pgd.PgdQgjh;
 import com.dsic.gj_erp.exception.CustomException;
 import com.dsic.gj_erp.service.pgd.PgdQgjhService;
+import com.dsic.gj_erp.service.zyjh.ZyjhService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -27,10 +31,29 @@ import java.util.Map;
 @RequestMapping("/pgdQgjh")
 public class PgdQgjhController {
     
-    
     @Autowired
     PgdQgjhService pgdQgjhService;
 
+    @Autowired
+    ZyjhService zyjhService;
+
+    @PostMapping("comLph")
+    @AuthFunction
+    public ResultBean comLph(HttpServletRequest req, @RequestBody List<DmYdjh> list) throws Exception, CustomException {
+        String yhdm = (String) req.getAttribute("yhdm");
+        String date= DateUtil.date().toString("yyyy/MM/dd");
+        List<DmYdjh> collect = list.stream().map(item -> {
+            DmYdjh dmYdjh = new DmYdjh();
+            dmYdjh.setId(item.getId());
+            dmYdjh.setLphqrry(yhdm);
+            dmYdjh.setLphqrrq(date);
+            return dmYdjh;
+        }).collect(Collectors.toList());
+
+        zyjhService.updateBatchById(collect);
+
+        return new ResultBean();
+    }
     
     
     @PostMapping("/getQgPgd")

src/main/java/com/dsic/gj_erp/mapper/KbanMapper.java

@@ -38,6 +38,7 @@ public interface KbanMapper {
     String qfxq(String from, String to);
 
     List<Map<String, Object>> qfxqDetail(String from, String to);
+    List<Map<String, Object>> qfxqDetail1(String from, String to);
 
     List<Map<String, Object>> qfxqWcqk(String from, String to);
 

src/main/java/com/dsic/gj_erp/service/KbanService.java

@@ -97,8 +97,17 @@ public class KbanService {
         DateTime date = DateUtil.date();
         String from = DateUtil.beginOfMonth(date).toString("yyyy/MM/dd");
         String to = DateUtil.endOfMonth(date).toString("yyyy/MM/dd");
-        String xq=kbanMapper.qfxq(from,to);
+        BigDecimal xq=kbanMapper.xqzl(from, to);;
         List<Map<String,Object>> list=kbanMapper.qfxqDetail(from,to);
+        List<Map<String,Object>> list1=kbanMapper.qfxqDetail1(from,to);
+
+        for (Map<String,Object> map:list){
+            for (Map<String,Object> map1:list1){
+                if(map.get("dcCh").equals(map1.get("dcCh"))){
+                    map.put("pcsl",map1.get("pcsl"));
+                }
+            }
+        }
 
         Map<String,Object> map=new HashMap<>();
         map.put("xq", xq);

src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmSygdMxServiceImpl.java

@@ -119,11 +119,21 @@ public class DmSygdMxServiceImpl extends ServiceImpl<DmSygdMxMapper, DmSygdMx> i
             );
             if (dmYdjh != null){
                 dmYdjh.setId(dmYdjh.getId());
+
+                //计划日期
                 dmYdjh.setJssj(item.getJssj());
                 dmYdjh.setSljhrq(item.getSlrq());
                 dmYdjh.setPwjhrq(item.getPwrq());
                 dmYdjh.setHxjhrq(item.getHxrq());
                 dmYdjh.setQgjhrq(item.getQgrq());
+
+                //重量
+                dmYdjh.setBclqzl(item.getBclqzl());
+                dmYdjh.setBcshzl(item.getBcshzl());
+                dmYdjh.setBcylzl(item.getBcylzl());
+                dmYdjh.setBcljtlzl(item.getBcljtlzl());
+
+                //比对数据
                 dmYdjh.setXzglxq(dmYdjh.getJssj());
                 if (StrUtil.isAllNotEmpty(dmYdjh.getXzglxq(),dmYdjh.getJssj())){
                     //状态 2拖期 1提前 3追加

src/main/resources/mappers/kban/KbanMapper.xml

@@ -115,10 +115,18 @@
     </select>
 
     <select id="qfxqDetail" resultType="java.util.Map">
+        SELECT DISTINCT
+            SUM(isnull(b.bclqzl,0)/10000) over(PARTITION by dcch) zl,dcch dcCh
+        from dm_sygdxq a left join
+                 (SELECT DISTINCT dcch,pl,tzbh,bclqzl from dm_bom ) b
+                 on a.DC_CH =b.dcch and a.DC_PL =b.pl
+        where a.xzglxq BETWEEN #{from} and #{to} and isnull(dcch,'')!=''
+    </select>
+
+    <select id="qfxqDetail1" resultType="java.util.Map">
         SELECT
             DISTINCT dc_ch dcCh,
-            sum(case when isnull(dc_pl,'')!='' then 1 else 0 end) OVER(PARTITION by dc_ch) pcsl ,
+                     sum(case when isnull(dc_pl,'')!='' then 1 else 0 end) OVER(PARTITION by dc_ch) pcsl
-            sum(dzjz) OVER(PARTITION by dc_ch) zl
         from
             dm_sygdxq
         where
@@ -213,8 +221,8 @@
         dc_ch dcCh,sum(t) total
         from (
         SELECT DC_CH , DC_PL ,1 t
-        from dm_zrcjh
+        from dm_sygd_mx
-        where gjks BETWEEN #{from} and #{to} group by DC_CH,DC_PL ) a group by dc_ch
+        where jssj BETWEEN #{from} and #{to} group by DC_CH,DC_PL ) a group by dc_ch
     </select>
 
     <!-- 图纸数量 -->
@@ -230,8 +238,12 @@
     </select>
 
     <select id="xqzl" resultType="BigDecimal">
-        SELECT SUM(isnull(b.bclqzl,0)/1000) from dm_zrcjh a left join dm_bom b on a.DC_CH =b.dcch
+        SELECT
-        and a.DC_PL =b.pl and a.DC_FD =b.fd where a.jssj_xz BETWEEN #{from} and #{to}
+            SUM(isnull(b.bclqzl,0)/10000)
+        from dm_sygdxq a left join
+                 (SELECT DISTINCT dcch,pl,tzbh,bclqzl from dm_bom ) b
+                 on a.DC_CH =b.dcch and a.DC_PL =b.pl
+        where a.xzglxq BETWEEN #{from} and #{to}
     </select>
 
     <select id="dhzl" resultType="BigDecimal">