1.调整优化

2.增加班次选择和派工报工页面切换功能

src/main/java/com/dsic/gj_erp/controller/jcsj/DmBzryController.java

@@ -49,6 +49,7 @@ public class DmBzryController {
                 StrUtil.isNotEmpty((String)map.get("zyq")),"zyq",(String)map.get("zyq")
 
             ).like(  StrUtil.isNotEmpty((String)map.get("userName")),"user_name",(String)map.get("userName"))
+                .eq(StrUtil.isNotEmpty((String)map.get("zt")),"zt",map.get("zt"))
         );
 //        list.forEach(e->{
 //            e.setZzt(e.getZt());

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

@@ -34,7 +34,7 @@ public interface DmYdjhMapper extends BaseMapper<DmYdjh> {
 
 
    List<PgdTzjh> getTzjh1(@Param("begin") String begin, @Param("end") String end);
-   List<PgdDh> getDhjh1(List<String> ids);
+   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);

src/main/java/com/dsic/gj_erp/pc/dto/tlt/七跨型板.java

@@ -19,7 +19,6 @@ public class 七跨型板 extends 套料图工序 {
                 .add(Constant.工序.号料)
                 .add(Constant.工序.切割)
                 .add(Constant.工序.打磨)
-                .add(Constant.工序.自由边处理)
                 .add(Constant.工序.曲型)
                 .build();
         return this;
@@ -37,7 +36,6 @@ public class 七跨型板 extends 套料图工序 {
                 .add(Constant.工序.号料)
                 .add(Constant.工序.切割)
                 .add(Constant.工序.打磨)
-                .add(Constant.工序.自由边处理)
                 .add(Constant.工序.曲型)
                 .build();
         return this;

src/main/java/com/dsic/gj_erp/pc/service/三月滚动接口.java

@@ -70,7 +70,7 @@ public class 三月滚动接口 {
                 });
             });
 
-        sygdMxService.saveBatch(mxList,500);
+        //sygdMxService.saveBatch(mxList,500);
 
         ljList.forEach(lj-> mxList.forEach(mx->{
             if (lj.getDcch().equals(mx.getDcCh())
@@ -79,7 +79,7 @@ public class 三月滚动接口 {
                 lj.setParentId(mx.getId());
             }
         }));
-        ljService.saveBatch(ljList,500);
+        //ljService.saveBatch(ljList,500);
 
         List<DmYdjhxf> list= sygdMxService.tqSygd1(begin,end);
         ResultBean r = new ResultBean(list);

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

@@ -259,13 +259,12 @@ public class DmYdjhServiceImpl extends ServiceImpl<DmYdjhMapper, DmYdjh> impleme
 
         List<String> idList = ydjhList.stream().map(DmYdjh::getId).collect(Collectors.toList());
 
-
+        idList.forEach(item->{
-            List<PgdDh> dh= baseMapper.getDhjh1(idList);
+            List<PgdDh> dh= baseMapper.getDhjh1(item);
             if (dh.size()>0){
-
                 dhService.saveBatch(dh);
-
             }
+        });
 
         if (idList.size() > 100) {
             List<String> list = idList.subList(idList.size() / 100 * 100, idList.size());

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

@@ -2,6 +2,8 @@ package com.dsic.gj_erp.service.zyjh;
 
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.ObjUtil;
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -42,11 +44,19 @@ public class ZyjhService extends ServiceImpl<DmYdjhMapper,DmYdjh> {
     }
 
     public void updateForSl(ShangLiao sl){
+        String date=DateUtil.date().toString("yyyy/MM/dd");
         LambdaUpdateWrapper<DmYdjh> wrapper = Wrappers.<DmYdjh>lambdaUpdate()
-                .set(DmYdjh::getSlycldw, sl.getYdjh().getSlycldw())
+                //上料
-                .set(DmYdjh::getSlyclcs, sl.getYdjh().getSlyclcs())
+                .set(ObjUtil.isNotEmpty(sl.getYdjh().getSlycldw()),DmYdjh::getSlycldw, sl.getYdjh().getSlycldw())
-                .set(DmYdjh::getSlfkrq, sl.getYdjh().getSlfkrq())
+                .set(ObjUtil.isNotEmpty(sl.getYdjh().getSlyclcs()),DmYdjh::getSlyclcs, sl.getYdjh().getSlyclcs())
-                .set(DmYdjh::getSlfkry, sl.getYdjh().getSlfkry())
+                .set(ObjUtil.isNotEmpty(sl.getYdjh().getSlfkry()),DmYdjh::getSlfkrq, date)
+                .set(ObjUtil.isNotEmpty(sl.getYdjh().getSlfkry()),DmYdjh::getSlfkry, sl.getYdjh().getSlfkry())
+
+                //理料
+                .set(ObjUtil.isNotEmpty(sl.getYdjh().getLldw()),DmYdjh::getLldw, sl.getYdjh().getLldw())
+                .set(ObjUtil.isNotEmpty(sl.getYdjh().getLlcs()),DmYdjh::getLlcs, sl.getYdjh().getLlcs())
+                .set(ObjUtil.isNotEmpty(sl.getYdjh().getLlfkry()),DmYdjh::getLlfkrq, date)
+                .set(ObjUtil.isNotEmpty(sl.getYdjh().getLlfkry()),DmYdjh::getLlfkry, sl.getYdjh().getLlfkry())
                 .eq(DmYdjh::getId, sl.getYdjh().getId());
 
         switch (sl.getType()){

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

@@ -445,12 +445,7 @@
                        MS_DDMXP.WPKD, MS_DDMXP.RKXH, MS_DDJBP.dhqdh) dhxx
              on dhxx.dhqdh = dm_ydjh.dhqd
         where
-        and dm_ydjh.id in
+        dm_ydjh.id =#{id}
-        <foreach collection="ids" index="index" item="item" open="(" separator="," close=");">
-            #{item}
-        </foreach>
-        ORDER BY dm_ydjh.dc_ch,
-                 dm_ydjh.dc_pl
     </select>
     <select id="getSljh" resultType="com.dsic.gj_erp.bean.pgd.PgdSljh">
         insert into pgd_sljh