1.完善质量跟踪数据

src/main/java/com/dsic/gj_erp/bean/czzj/MpDhsj.java

@@ -74,7 +74,7 @@ public class MpDhsj {
         mp.setWpjb("L");
         mp.setGzlx("M");
         mp.setGzbm("3K");
-        mp.setZt("1");
+        mp.setZt("0");
         mp.setXdtz("0");
         mp.setHxfl("B");
         mp.setDhsl1("0");

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

@@ -285,6 +285,7 @@ public class ZyjhController {
                         continue;
                     }
 
+                    Map<String, Object> mpsycljljbp = zyjhService.getMPSYCLJLJBP(item.getDcCh(), item.getTzbh());
                     //质量跟踪数据
                     List<MpDhsj> collect = new ArrayList<>();
                     String date = DateUtil.date().toString("yyyy/MM/dd");
@@ -295,6 +296,9 @@ public class ZyjhController {
                             MpDhsj mpDhsj = MpDhsj.of(item2, date, item.getSllph());
                             String xh = StrUtil.padPre(j + 1 + "", 3, "0");
                             mpDhsj.setDhh(mpDhsjDhh+"-"+xh);
+                            if (ObjUtil.isNotEmpty(mpsycljljbp)) {
+                                mpDhsj.setGysbh("BZGY-"+mpsycljljbp.get("gzzx3"));
+                            }
                             collect.add(mpDhsj);
                         }
                     }

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

@@ -72,4 +72,6 @@ public interface DmYdjhMapper extends BaseMapper<DmYdjh> {
 
     void xzylbs(String dcch,String dcpl);
     void updatezyq(String dcch,String dcpl);
+
+    Map<String,Object> getMPSYCLJLJBP(String dcCh,String tzbh);
 }

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

@@ -40,6 +40,10 @@ public class ZyjhService extends ServiceImpl<DmYdjhMapper,DmYdjh> {
 
     private static final String MPDHSJ_KEY="MPDHSJ";
 
+    public Map<String,Object> getMPSYCLJLJBP(String dcCh,String tzbh){
+        return baseMapper.getMPSYCLJLJBP(dcCh,tzbh);
+    }
+
     public String getMpDhsjDhh(){
         String date=DateUtil.date().toString("yyyyMMdd");
         Object xh = redisTemplate.opsForHash().get(MPDHSJ_KEY, date);

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

@@ -1062,6 +1062,87 @@ where dc_ch=#{dcch} and dc_pl =#{dcpl}
         order by dc_ch,dc_pl
     </select>
 
+    <select id="getMPSYCLJLJBP" resultType="java.util.Map">
+        SELECT
+            top 1
+            mp_sycljljbp.clpzh,
+               mp_sycljljbp.zdr,
+               mp_sycljljbp.zdrq,
+               mp_sycljljbp.dc_tz,
+               mp_sycljljbp.dc_th,
+               mp_sycljljbp.dc_tpbh,
+               mp_sycljljbp.dc_tpmc,
+               mp_sycljljbp.dc_ch,
+               mp_sycljljbp.dc_cm,
+               MP_SYCLJLJBP.JHKSRQG1 ,
+               MP_SYCLJLJBP.JHJHRQG1 ,
+               MP_SYCLJLJBP.JHKSRQG2 ,
+               MP_SYCLJLJBP.JHJHRQG2 ,
+               MP_SYCLJLJBP.JHKSRQG3 ,
+               MP_SYCLJLJBP.JHJHRQG3,
+               MP_SYCLJLJBP.YLZD1,
+               MP_SYCLJLJBP.YLZD2,
+               MP_SYCLJLJBP.LLKW,
+               MP_SYCLJLJBP.DC_YJ,
+               MP_SYCLJLJBP.XGRQ2,
+               MP_SYCLJLJBP.XGRQ3,
+               MP_SYCLJLJBP.TZDH,
+               MP_SYCLJLJBP.DC_YS,
+               MP_SYCLJLJBP.RWZXZT,
+               MP_SYCLJLJBP.RWSCPZ,
+               MP_SYCLJLJBP.RWSCLL,
+               MP_SYCLJLJBP.ZZK1,
+               RTRIM(MP_SYCLJLJBP.GZZX1) AS GZZX1,
+               RTRIM(MP_SYCLJLJBP.JGZ1) AS JGZ1,
+               RTRIM(MP_SYCLJLJBP.WGRQ1) AS WGRQ1,
+               RTRIM(MP_SYCLJLJBP.HBRY1) AS HBRY1,
+               RTRIM(MP_SYCLJLJBP.HBRQ1) AS HBRQ1,
+               RTRIM(MP_SYCLJLJBP.GZZX2) AS GZZX2,
+               RTRIM(MP_SYCLJLJBP.JGZ2) AS JGZ2,
+               RTRIM(MP_SYCLJLJBP.WGRQ2) AS WGRQ2,
+               RTRIM(MP_SYCLJLJBP.HBRY2) AS HBRY2,
+               RTRIM(MP_SYCLJLJBP.HBRQ2) AS HBRQ2,
+               RTRIM(MP_SYCLJLJBP.GZZX3) AS GZZX3,
+               RTRIM(MP_SYCLJLJBP.JGZ3) AS JGZ3,
+               RTRIM(MP_SYCLJLJBP.WGRQ3) AS WGRQ3,
+               RTRIM(MP_SYCLJLJBP.HBRY3) AS HBRY3,
+               RTRIM(MP_SYCLJLJBP.HBRQ3) AS HBRQ3,
+               RTRIM(MP_SYCLJLJBP.DC_PL) AS DC_PL,
+               RTRIM(MP_SYCLJLJBP.DC_ZL) AS DC_ZL,
+               RTRIM(MP_SYCLJLJBP.DC_FD) AS DC_FD,
+               RTRIM(DM_BCHXJBP.XTRQ) AS XTRQ,
+               DM_BCHXJBP.LJSL,
+               DM_BCHXJBP.YCLZL,
+               DM_BCHXJBP.HXCD,
+               RTRIM(DM_BCHXJBP.GCBH) AS GCBH,
+               RTRIM(DM_BCHXJBP.YLZD1) AS YLZD11,
+               DM_BCHXJBP.YLZD4 AS YLZD4,
+               RTRIM(MP_SYCLJLJBP.HXFL) AS HXFL,
+               0 AS BS	,
+               RTRIM(MP_SYCLJLJBP.ywh) AS ywh,
+               MP_SYCLJLJBP.dc_lph AS dc_lph,
+               DM_BCHXJBP.YLZL,
+               RTRIM(DM_BCHXJBP.YLBH) AS YLBH,
+               RTRIM(DM_BCHXJBP.CLMC) AS CLMC,
+               0 as kjbs,
+               RTRIM(MP_SYCLJLJBP.CLLY) AS CLLY,
+               '' as dc_th_old ,
+               '' as clpzh_new ,
+               RTRIM(MP_SYCLJLJBP.QGCJ) AS QGCJ,
+               RTRIM(MP_SYCLJLJBP.DC_YLBH ) AS DC_YLBH ,
+               RTRIM(MP_SYCLJLJBP.QGLX) AS QGLX,
+               RTRIM(MP_SYCLJLJBP.YLCJBM) AS YLCJBM,
+               RTRIM(MP_SYCLJLJBP.YLKWH) AS YLKWH,
+               RTRIM(MP_SYCLJLJBP.sbbh) AS sbbh,
+               '' as sxh,
+               '' as ylsxh,
+               MP_SYCLJLJBP.BZXX
+        FROM MP_SYCLJLJBP,DM_BCHXJBP
+        WHERE (MP_SYCLJLJBP.DC_TH) = (DM_BCHXJBP.TZBH)
+          and   (MP_SYCLJLJBP.DC_ch) = (DM_BCHXJBP.dc_ch)
+          and MP_SYCLJLJBP.DC_CH =#{dcCh} and MP_SYCLJLJBP.DC_TH =#{tzbh}
+    </select>
+
 
     <update id="xzylbs"   parameterType="string" >
         UPDATE dm_ydjh set dm_ydjh.ylbs=dm_bchxylp.sfyl