Merge remote-tracking branch 'origin/master'

src/main/java/com/dsic/gj_erp/controller/kban/KbanController.java

@@ -19,6 +19,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.*;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.stream.Collectors;
 
 
 @RestController
@@ -30,6 +32,14 @@ public class KbanController {
     private final DmBzryService cqService;
     private final KbanService kbanService;
 
+    /**
+     * 获取所有未处理批次信息
+     */
+    @GetMapping("wcl")
+    public ResultBean<?> getWcl(){
+        return new ResultBean<>(zyjhService.getWcl());
+    }
+
     /**
      * 看板线表计划相关数据
      */
@@ -166,9 +176,13 @@ public class KbanController {
         List<DmBzry> ryList=cqService.list(Wrappers.<DmBzry>lambdaQuery()
                 .isNotNull(DmBzry::getUserCode).isNotNull(DmBzry::getZt).ne(DmBzry::getZt,""));
 
+        List<DmBzry> collect = ryList.stream().filter(item -> "01".equals(item.getZt())).collect(Collectors.toList());
+
         Map<String,Object> map=new HashMap<>();
         map.put("total",ryList.size());
         map.put("rows",ryList);
+        map.put("bb", collect.size());
+        map.put("eb",ryList.size()-collect.size());
         return new ResultBean<>(map);
     }
 }

src/main/java/com/dsic/gj_erp/controller/zyjh/ZyjhController.java

@@ -223,7 +223,7 @@ public class ZyjhController {
             date=search.getSljhrq();
         }
         List<DmYdjh> list = zyjhService.list(Wrappers.<DmYdjh>lambdaQuery()
-                .le(DmYdjh::getSljhrq, date)
+//                .le(DmYdjh::getSljhrq, date)
                 .eq(StrUtil.isNotEmpty(search.getZt()),DmYdjh::getZt, search.getZt())
                 .eq(StrUtil.isNotEmpty(search.getDcch()),DmYdjh::getDcCh, search.getDcch())
                 .eq(StrUtil.isNotEmpty(search.getDcPl()),DmYdjh::getDcPl, search.getDcPl())

src/main/java/com/dsic/gj_erp/mapper/jhgk/DmYdjhMapper.java

@@ -13,7 +13,7 @@ import java.util.Map;
 
 /**
  * <p>
- *  Mapper 接口
+ * Mapper 接口
  * </p>
  *
  * @author xn
@@ -21,37 +21,48 @@ import java.util.Map;
  */
 public interface DmYdjhMapper extends BaseMapper<DmYdjh> {
 
-   List<DmSygdMx> getSygdmx(String nextMonth);
-//   List<PgdTzjh> getTzjh(@Param("begin") String begin, @Param("end") String end);
-   List<PgdTzjh> getTzjh(@Param("list")List<String> list,@Param("bzry") String bzry, @Param("bzrq") String bzrq);
-   List<PgdDh> getDhjh(@Param("begin") String begin, @Param("end") String end);
-   List<PgdSljh>  getSljh(@Param("list")List<String> list,@Param("bzry") String bzry, @Param("bzrq") String bzrq);
-   List<PgdPwjh>  getPwjh(@Param("list")List<String> list,@Param("bzry") String bzry, @Param("bzrq") String bzrq);
-   List<PgdQgjh>  getQgjh(@Param("list")List<String> list,@Param("bzry") String bzry, @Param("bzrq") String bzrq);
-   int  xfbc(List<String> ids);
-   int  tqlj(List<String> ids);
+    List<DmSygdMx> getSygdmx(String nextMonth);
 
+    //   List<PgdTzjh> getTzjh(@Param("begin") String begin, @Param("end") String end);
+    List<PgdTzjh> getTzjh(@Param("list") List<String> list, @Param("bzry") String bzry, @Param("bzrq") String bzrq);
 
+    List<PgdDh> getDhjh(@Param("begin") String begin, @Param("end") String end);
 
-   List<PgdTzjh> getTzjh1(@Param("begin") String begin, @Param("end") String end);
-   List<PgdDh> getDhjh1(String id);
-   List<PgdSljh>  getSljh1(@Param("begin") String begin, @Param("end") String end);
-   List<PgdPwjh>  getPwjh1(@Param("begin") String begin, @Param("end") String end);
-   List<PgdQgjh>  getQgjh1(@Param("begin") String begin, @Param("end") String end);
+    List<PgdSljh> getSljh(@Param("list") List<String> list, @Param("bzry") String bzry, @Param("bzrq") String bzrq);
 
-   @MapKey("kw")
-   Map<String,Object> gekuachaliang(String from,String to,String zt);
+    List<PgdPwjh> getPwjh(@Param("list") List<String> list, @Param("bzry") String bzry, @Param("bzrq") String bzrq);
 
-  List<Map<String,Object>> jhwcqk(String from,String to);
+    List<PgdQgjh> getQgjh(@Param("list") List<String> list, @Param("bzry") String bzry, @Param("bzrq") String bzrq);
 
-  List<Map<String,Object>> gyfcl();
+    int xfbc(List<String> ids);
 
-  List<Map<String,Object>> gxjhwcqk(String from,String to);
+    int tqlj(List<String> ids);
 
-  List<Map<String,Object>> gcjd(List<String> czbh);
 
-   DmYdjh   getYdjhMin(@Param("dcch") String dcch, @Param("dcpl") String dcpl);
-   List<DmYdjh>   getydjhhz(Map map );
+    List<PgdTzjh> getTzjh1(@Param("begin") String begin, @Param("end") String end);
 
+    List<PgdDh> getDhjh1(String id);
 
+    List<PgdSljh> getSljh1(@Param("begin") String begin, @Param("end") String end);
+
+    List<PgdPwjh> getPwjh1(@Param("begin") String begin, @Param("end") String end);
+
+    List<PgdQgjh> getQgjh1(@Param("begin") String begin, @Param("end") String end);
+
+    @MapKey("kw")
+    Map<String, Object> gekuachaliang(String from, String to, String zt);
+
+    List<Map<String, Object>> jhwcqk(String from, String to);
+
+    List<Map<String, Object>> gyfcl();
+
+    List<Map<String, Object>> gxjhwcqk(String from, String to);
+
+    List<Map<String, Object>> gcjd(List<String> czbh);
+
+    DmYdjh getYdjhMin(@Param("dcch") String dcch, @Param("dcpl") String dcpl);
+
+    List<DmYdjh> getydjhhz(Map map);
+
+    List<Map<String,Object>> getWcl();
 }

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

@@ -55,6 +55,8 @@ public class KbanService {
         List<Map<String, String>> everyKw = kbanMapper.getEveryKw(from, to);
         AtomicInteger sl=new AtomicInteger(0);
         AtomicInteger slc=new AtomicInteger(0);
+        AtomicInteger kw1=new AtomicInteger(0);
+        AtomicInteger kw1c=new AtomicInteger(0);
         AtomicInteger kw2=new AtomicInteger(0);
         AtomicInteger kw2c=new AtomicInteger(0);
         AtomicInteger kw3=new AtomicInteger(0);
@@ -70,6 +72,14 @@ public class KbanService {
             if (zt>=42){
                 slc.incrementAndGet();
             }
+            if (kw==1){
+                if (zt>=42){
+                    kw1.incrementAndGet();
+                }
+                if (zt==52||zt==62){
+                    kw1c.incrementAndGet();
+                }
+            }
             if (kw==2){
                 if (zt>=42){
                     kw2.incrementAndGet();
@@ -95,7 +105,7 @@ public class KbanService {
                 }
             }
         });
-        List<Integer> zsl = Arrays.asList(sl.get(),kw2.get(),kw3.get(),kw4.get());
+        List<Integer> zsl = Arrays.asList(sl.get(),kw1.get(),kw2.get(),kw3.get(),kw4.get());
         List<Integer> kwc = Arrays.asList(slc.get(),kw2c.get(),kw3c.get(),kw4c.get());
         List<Integer> wcl = Arrays.asList(sl.get()-slc.get(),kw2.get()-kw2c.get(),kw3.get()-kw3c.get(),kw4.get()-kw4c.get());
         map.put("zsl",zsl);//总数量

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

@@ -245,10 +245,11 @@ public class DmYdjhServiceImpl extends ServiceImpl<DmYdjhMapper, DmYdjh> impleme
         String bzry= (String) request.getAttribute("yhms");
         String bzrq= DateUtil.format(DateUtil.date(), "yyyy/MM/dd");
 
+        String gxsj=DateUtil.date().toString("yyyy/MM/dd HH:mm:ss");
         //工单号
         List<DmYdjh> updateList = ydjhList.stream()
                 .filter(item->StrUtil.isNotEmpty(item.getSljhrq()))
-                .map(this::ofXf).collect(Collectors.toList());
+                .map(item->ofXf(item,gxsj)).collect(Collectors.toList());
 
         this.updateBatchById(updateList);
 
@@ -304,7 +305,7 @@ public class DmYdjhServiceImpl extends ServiceImpl<DmYdjhMapper, DmYdjh> impleme
         publisher.publishEvent(ydjhList);
     }
 
-    private DmYdjh ofXf(DmYdjh item){
+    private DmYdjh ofXf(DmYdjh item,String gxsj){
         Long djh=this.handlerDjh(item);
         DmYdjh dmYdjh = new DmYdjh();
         dmYdjh.setId(item.getId());
@@ -312,6 +313,7 @@ public class DmYdjhServiceImpl extends ServiceImpl<DmYdjhMapper, DmYdjh> impleme
         String perfix=item.getSljhrq().replace("/","");
         perfix=perfix.substring(2);
         dmYdjh.setDjh(StrUtil.format("{}{}",perfix, String.format("%03d",djh)));
+        dmYdjh.setGxsj(gxsj);
         return dmYdjh;
     }
 

src/main/java/com/dsic/gj_erp/service/zyjh/ZyjhService.java

@@ -29,6 +29,13 @@ public class ZyjhService extends ServiceImpl<DmYdjhMapper,DmYdjh> {
     private final DmCbxxpService dmCbxxpService;
     private final RedisTemplate<String,Object> redisTemplate;
 
+    /**
+     * 获取所有未处理批次
+     */
+    public List<Map<String,Object>> getWcl(){
+        return baseMapper.getWcl();
+    }
+
     public List<Map<String, Object>> gcjd(){
         ImmutableMap<String, Boolean> map = ImmutableMap.of("flag", true);
         List<DmCbxxp> list = dmCbxxpService.getList(map);

src/main/resources/mappers/jhgk/DmYdjhMapper.xml

@@ -888,8 +888,19 @@ where dc_ch=#{dcch} and dc_pl =#{dcpl}
 
 
     </select>
-
-
+    <select id="getWcl" resultType="java.util.Map">
+        SELECT
+            *
+        from
+            (select
+                 dc_ch dcCh,dc_pl dcPl,zt,gxsj,ROW_NUMBER() over(PARTITION by dc_ch,dc_pl,zt order by dc_ch,dc_pl) rn
+             from
+                 dm_ydjh
+             where
+                 zt>='2' and zt&lt;'62' ) a
+        where a.rn=1
+        order by dcCh asc ,dcPl desc ,zt
+    </select>
 
 
 </mapper>

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

@@ -7,7 +7,7 @@
     </select>
 
     <select id="getEveryCompZlByNf" resultType="map">
-        SELECT MONTH(CAST(qgfkrq AS DATE)) mon,sum(bcshzl) zl from dm_ydjh WHERE qgfkrq BETWEEN #{from} and #{to} group by MONTH(CAST(qgfkrq AS DATE))
+        SELECT MONTH(CAST(qgfkrq AS DATE)) mon,sum(bcshzl)/1000 zl from dm_ydjh WHERE qgfkrq BETWEEN #{from} and #{to} group by MONTH(CAST(qgfkrq AS DATE))
     </select>
 
     <select id="getEveryKw" resultType="java.util.Map">