1.修正看板数据

2.二跨T型材腹板对应四区,二跨T型材面板对应三区
3.在作业计划查询页面增加作业区变更肝功能
4.报工设备信息修正
5.启用作业区报工页面登录限制

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

@@ -614,6 +614,14 @@ public class PgdSljhController {
                         dmYdjh.setZyq1("三区");
                         dmYdjh.setYkw(byId.getKw());
                         dmYdjh.setKw(slKc.getSLDW());
+
+                        //作业区默认值修正
+                        //二跨T型材腹板对应四区
+                        //二跨T型材面板对应三区 上面已处理 这里只做记录
+                        if("11".equals(slKc.getSLDW())){
+                            dmYdjh.setZyq("FP4Q");
+                            dmYdjh.setZyq1("四区");
+                        }
                     }
 
                     if("4".equals(slKc.getSLDW())|| "15".equals(slKc.getSLDW())
@@ -623,13 +631,7 @@ public class PgdSljhController {
                         dmYdjh.setYkw(byId.getKw());
                         dmYdjh.setKw(slKc.getSLDW());
                     }
-
                 }
-
-
-
-
-
                 ups.add(dmYdjh);
             }
             ups1.add(imCkwpkwp);

src/main/java/com/dsic/gj_erp/mapper/jcsj/DmBomMapper.java

@@ -24,4 +24,5 @@ public interface DmBomMapper extends BaseMapper<DmBom> {
 
     int insertFile(@Param("filepath")String filepath,@Param("yhdm") String yhdm);
 
+    List<DmBom> getBomUni(String dcCh,String dcPl);
 }

src/main/java/com/dsic/gj_erp/service/jcsj/DmBomService.java

@@ -26,4 +26,5 @@ public interface DmBomService extends IService<DmBom> {
 
     void copyListBom(HttpServletRequest req, Map map);
 
+    List<DmBom> getBomUni(String dcCh,String dcPl);
 }

src/main/java/com/dsic/gj_erp/service/jcsj/impl/DmBomServiceImpl.java

@@ -15,6 +15,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
@@ -122,4 +123,9 @@ public class DmBomServiceImpl extends ServiceImpl<DmBomMapper, DmBom> implements
         this.saveBatch(list,1000);
         //this.saveBatch()
     }
+
+    @Override
+    public List<DmBom> getBomUni(String dcCh, String dcPl) {
+        return baseMapper.getBomUni(dcCh,dcPl);
+    }
 }

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

@@ -225,11 +225,6 @@ public class DmSygdMxServiceImpl extends ServiceImpl<DmSygdMxMapper, DmSygdMx> i
                         &&dmYdjh.getTzbh().equals(item.getTzbh())
                 ){
                     dmYdjh.setId(dmYdjh.getId());
-                    //二跨T型材腹板默认四区切割,这里修正一下
-                    if (dmYdjh.getTzbh().contains("N2T")){
-                        dmYdjh.setZyq1("四区");
-                        dmYdjh.setZyq("FP4Q");
-                    }
 
                     this.updateYdjh(dmYdjh,item);
 

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

@@ -37,10 +37,25 @@ public class YdjhImportService {
     private final DmSygdMxService sygdMxService;
 
     public List<YdjhImport> listByFileName(String fileName) {
-        return importService.list(Wrappers.<YdjhImport>lambdaQuery()
+        List<YdjhImport> list = importService.list(Wrappers.<YdjhImport>lambdaQuery()
-                .eq(StrUtil.isNotEmpty(fileName),YdjhImport::getFileName, fileName)
+                .eq(StrUtil.isNotEmpty(fileName), YdjhImport::getFileName, fileName)
                 .orderByAsc(YdjhImport::getId)
         );
+        //修正个产线数量
+        //todo 需根据于庆胜最新格式开发
+//        list.stream().filter(item->StrUtil.isNotEmpty(item.getDcPl()))
+//                .forEach(item->{
+//                    List<DmBom> bomList = bomService.getBomUni(item.getDcCh(),item.getDcPl());
+//                    if (StrUtil.isNotEmpty(item.getSl())){
+//                        item.setBs1(bomList.size()+"");
+//                    }
+//
+//                    if (StrUtil.isNotEmpty(item.getEkskks())){
+//
+//                    }
+//
+//                });
+        return list;
     }
 
     public List<YdjhImport> list(String begin, String end) {

src/main/resources/mappers/jcsj/DmBomMapper.xml

@@ -277,5 +277,9 @@
             dm_bom.type = 'b' and dm_bom.dcch=#{dcCh} and dm_bom.pl=#{dcPl}
     </select>
 
+    <select id="getBomUni" resultType="com.dsic.gj_erp.bean.jcsj.DmBom">
+        SELECT DISTINCT dcch ,pl,tzbh  from dm_bom WHERE dcch =#{dcCh} and pl =#{dcPl} and type='b'
+    </select>
+
 
 </mapper>

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

@@ -12,7 +12,7 @@
         from
             dm_ydjh
         WHERE
-            jssj BETWEEN #{from} and #{to} and lx='b' and zt>=11
+            jssj BETWEEN #{from} and #{to} and lx='b' and ylbs='N' and zt>=11
         group by
             MONTH(CAST(jssj AS DATE))
         order by
@@ -22,7 +22,7 @@
     <select id="getEveryKw" resultType="java.util.Map">
         SELECT
             zt,SUBSTRING(tzbh,6,1) kw
-        from dm_ydjh WHERE zt>=11 and jssj BETWEEN #{from} and #{to} and lx='b'
+        from dm_ydjh WHERE zt>=11 and jssj BETWEEN #{from} and #{to} and lx='b' and ylbs='N'
     </select>
 
     <select id="getZjjhByUserCode" resultType="com.dsic.gj_erp.bean.jhgk.DmYdjh">
@@ -32,7 +32,7 @@
             dm_ydjh
         WHERE
             (slfkry =#{userCode} or pwfkry =#{userCode} or llfkry =#{userCode} or qgfkry =#{userCode} or hxfkry =#{userCode})
-            and jssj between #{from} and #{to} and lx='b'
+            and jssj between #{from} and #{to} and lx='b' and ylbs='N'
     </select>
 
     <select id="getSb" resultType="java.util.Map">
@@ -44,7 +44,7 @@
         from
             dm_ydjh
         WHERE
-            zt>=42 and lx='b' and (hxfkrq=#{day} or qgfkrq=#{day})
+            zt>=42 and lx='b' and ylbs='N' and (hxfkrq=#{day} or qgfkrq=#{day})
         group by
             hxsb ,qgsb,zt
     </select>
@@ -55,7 +55,7 @@
         from
             dm_ydjh
         <where>
-            zt>=42 and lx='b' and (hxsb=#{code} or qgsb=#{code})
+            zt>=42 and lx='b' and ylbs='N' and (hxsb=#{code} or qgsb=#{code})
         </where>
     </select>
 
@@ -66,7 +66,7 @@
         from
             dm_ydjh
         WHERE
-            jssj BETWEEN #{from} and #{to} and lx='b'
+            jssj BETWEEN #{from} and #{to} and lx='b' and ylbs='N'
         group by
             dc_ch ,dc_pl ,qgfkrq
         order by dc_ch ,dc_pl
@@ -83,7 +83,7 @@
         from
             dm_ydjh
         WHERE
-            zt>=2 and jssj BETWEEN #{from} and #{to} and lx='b'
+            zt>=2 and jssj BETWEEN #{from} and #{to} and lx='b' and ylbs='N'
             <choose>
                 <when test="zyq==2">
                     and (SUBSTRING(tzbh,6,1)=1 or SUBSTRING(tzbh,6,1)=3)
@@ -114,7 +114,7 @@
         from
             dm_ydjh
         WHERE
-          lx='b' and (slfkrq = #{today} or hxfkrq = #{today} or qgfkrq = #{today})
+          lx='b' and ylbs='N' and (slfkrq = #{today} or hxfkrq = #{today} or qgfkrq = #{today})
     </select>
 
     <select id="qfxq" resultType="java.lang.String">
@@ -145,7 +145,7 @@
               from
                   dm_sygd_mx xq left join dm_ydjh ydjh on xq.dc_ch =ydjh.dc_ch and xq.dc_pl =ydjh.dc_pl and xq.tzbh =ydjh.tzbh
               where
-                  xq.jssj BETWEEN #{from} and #{to} and ydjh.lx='b'
+                  xq.jssj BETWEEN #{from} and #{to} and ydjh.lx='b' and ydjh.ylbs='N'
           ) a where a.jhzl!=0
     </select>
 
@@ -157,7 +157,7 @@
         from
             dm_ydjh
         WHERE
-            jssj BETWEEN #{from} and #{to} and lx='b'
+            jssj BETWEEN #{from} and #{to} and lx='b' and ylbs='N'
     </select>
 
     <select id="zyjhzx" resultType="java.util.Map">
@@ -169,28 +169,28 @@
         from
         dm_ydjh
         WHERE
-        zt >=21 and jssj BETWEEN #{from} and #{to} and lx='b'
+        zt >=21 and jssj BETWEEN #{from} and #{to} and lx='b' and ylbs='N'
         UNION ALL
         SELECT
         '二区' as zyq,tzbh,zt,DATEPART(DD,qgfkrq) as day
         from
         dm_ydjh
         WHERE
-        zt >=62 and jssj BETWEEN #{from} and #{to} and zyq1='二区' and lx='b'
+        zt >=62 and jssj BETWEEN #{from} and #{to} and zyq1='二区' and lx='b' and ylbs='N'
         UNION ALL
         SELECT
         '三区',tzbh,zt,DATEPART(DD,qgfkrq) as day
         from
         dm_ydjh
         WHERE
-        zt >=62 and jssj BETWEEN #{from} and #{to} and zyq1='三区' and lx='b'
+        zt >=62 and jssj BETWEEN #{from} and #{to} and zyq1='三区' and lx='b' and ylbs='N'
         UNION ALL
         SELECT
         '四区',tzbh,zt,DATEPART(DD,qgfkrq) as day
         from
         dm_ydjh
         WHERE
-        zt >=62 and jssj BETWEEN #{from} and #{to} and zyq1='四区' and lx='b'
+        zt >=62 and jssj BETWEEN #{from} and #{to} and zyq1='四区' and lx='b' and ylbs='N'
         ) a
         where isnull(a.day,'')!=''
     </select>
@@ -203,7 +203,7 @@
         from
             dm_ydjh
         WHERE
-            jssj BETWEEN #{from} and #{to} and lx='b'
+            jssj BETWEEN #{from} and #{to} and lx='b' and ylbs='N'
     </select>
 
     <select id="xbgtt" resultType="java.util.Map">
@@ -211,7 +211,7 @@
         DISTINCT a.dc_ch dcCh,a.yf,sum(a.zl/1000) over(PARTITION by a.dc_ch,a.yf) zl ,
         sum(CONVERT(decimal,b.bclqzl)/1000) over(PARTITION by b.dc_ch,MONTH(CAST(b.jssj AS DATE))) jhzl
         from dm_xbjh a left join dm_ydjh b on a.dc_ch =b.dc_ch and
-        CONVERT(int,a.yf)=MONTH(CAST(b.jssj AS DATE)) WHERE a.nf=#{nf} and a.version=#{version}
+        CONVERT(int,a.yf)=MONTH(CAST(b.jssj AS DATE)) WHERE a.nf=#{nf} and a.version=#{version} and b.lx='b' and b.ylbs='N'
         order by a.dc_ch, a.yf
     </select>
 
@@ -255,7 +255,7 @@
     </select>
 
     <select id="jhzl" resultType="BigDecimal">
-        SELECT SUM(isnull(bclqzl,0)/1000) FROM dm_ydjh WHERE jssj BETWEEN #{from} and #{to} and lx='b'
+        SELECT SUM(isnull(bclqzl,0)/1000) FROM dm_ydjh WHERE jssj BETWEEN #{from} and #{to} and lx='b' and ylbs='N'
     </select>
 
     <select id="wczl" resultType="BigDecimal">
@@ -264,6 +264,6 @@
         FROM
             dm_ydjh
         WHERE
-            jssj BETWEEN #{from} and #{to} and lx='b'
+            jssj BETWEEN #{from} and #{to} and lx='b' and ylbs='N'
     </select>
 </mapper>