1.修正作业计划下发功能,仅可下发未上料打印的计划

src/main/java/com/dsic/gj_erp/controller/jhgk/DmYdjhController.java

@@ -110,7 +110,7 @@ public class DmYdjhController {
         List<DmYdjh> list= service.list(new QueryWrapper<DmYdjh>()
                 .eq(StrUtil.isNotEmpty(map.get("dcCh")),"dc_ch",map.get("dcCh"))
                 .ge(StrUtil.isNotEmpty(map.get("zt")),"zt",map.get("zt"))
-                        .lt("zt","11")//仅可下发未上料打印的计划
+                        .lt("zt",11)//仅可下发未上料打印的计划
                 .ge(StrUtil.isNotEmpty(map.get("yf")), "jssj", DateUtil.beginOfMonth(DateUtil.parseDate(map.get("yf"))).toString("yyyy/MM/dd"))
                 .le(StrUtil.isNotEmpty(map.get("yf")), "jssj", DateUtil.endOfMonth(DateUtil.parseDate(map.get("yf"))).toString("yyyy/MM/dd"))
                 .orderByAsc("jssj,dc_ch,dc_pl,zl,lqlb")

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

@@ -324,9 +324,9 @@ public class DmYdjhServiceImpl extends ServiceImpl<DmYdjhMapper, DmYdjh> impleme
         DmYdjh dmYdjh = new DmYdjh();
         dmYdjh.setId(item.getId());
         dmYdjh.setZt("2");
-        String perfix=item.getSljhrq().replace("/","");
-        perfix=perfix.substring(2);
-        dmYdjh.setDjh(StrUtil.format("{}{}",perfix, String.format("%03d",djh)));
+        //String perfix=item.getSljhrq().replace("/","");
+        //perfix=perfix.substring(2);
+        //dmYdjh.setDjh(StrUtil.format("{}{}",perfix, String.format("%03d",djh)));
         dmYdjh.setGxsj(gxsj);
         dmYdjh.setPlxh(item.getPlxh());
         return dmYdjh;