1.上料报工增加垮位查询条件

2.修复生成材质跟踪数据异常问题
3.修正零件数据状态未分配问题

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

@@ -442,8 +442,8 @@ public class ZyjhController {
                 .eq(StrUtil.isNotEmpty(search.getDcPl()),DmYdjh::getDcPl, search.getDcPl())
                 .eq(StrUtil.isNotEmpty(search.getKw()),DmYdjh::getKw, search.getKw())
                 .eq(StrUtil.isNotEmpty(search.getZylx()),DmYdjh::getZylx, search.getZylx())
+                        .likeRight(StrUtil.isNotEmpty(search.getSlkcdw()),DmYdjh::getSlkcdw,search.getSlkcdw())
                 .orderByAsc(DmYdjh::getDjh)
-
         );
         return new ResultBean<>(list);
     }

src/main/java/com/dsic/gj_erp/controller/zyjh/dto/SljhSearch.java

@@ -13,4 +13,5 @@ public class SljhSearch {
     private String sllsh;
     private String zt="2";
     private String zylx;
+    private String slkcdw;
 }

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

@@ -42,7 +42,7 @@ public class ZyjhService extends ServiceImpl<DmYdjhMapper,DmYdjh> {
 
     public String getMpDhsjDhh(){
         String date=DateUtil.date().toString("yyyyMMdd");
-        Long xh = (Long) redisTemplate.opsForHash().get(MPDHSJ_KEY, date);
+        Object xh = redisTemplate.opsForHash().get(MPDHSJ_KEY, date);
         if(ObjUtil.isEmpty(xh)){
             redisTemplate.opsForHash().put(MPDHSJ_KEY, date,0);
         }

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

@@ -929,8 +929,8 @@
             case when isnull(dm_ydjh.qjgrq,'')<>''
                      then 'Y'
                  else '' end,
-            '01',
+            '01' qjg_zt,
-            '01','01',dm_ydjh.dmrq dmjhrq,dm_ydjh.pkrq pkjhrq,dm_ydjh.qjgrq qjgjhrq,'01'
+            '01' pk_zt,'01' dm_zt,dm_ydjh.dmrq dmjhrq,dm_ydjh.pkrq pkjhrq,dm_ydjh.qjgrq qjgjhrq,'01' ppzt
         from dm_ydjh,dm_bom
                          LEFT JOIN dm_qfxq on dm_qfxq.DC_CH=dm_bom.dcch and dm_qfxq.DC_PL=dm_bom.pl and dm_qfxq.DC_FD=dm_bom.fd
         WHERE