diff --git a/src/main/java/com/dsic/gj_erp/controller/jhgk/DmYdjhController.java b/src/main/java/com/dsic/gj_erp/controller/jhgk/DmYdjhController.java index 6927c07..7e1fcb1 100644 --- a/src/main/java/com/dsic/gj_erp/controller/jhgk/DmYdjhController.java +++ b/src/main/java/com/dsic/gj_erp/controller/jhgk/DmYdjhController.java @@ -110,7 +110,7 @@ public class DmYdjhController { List list= service.list(new QueryWrapper() .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") diff --git a/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmYdjhServiceImpl.java b/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmYdjhServiceImpl.java index 3f3f4ef..934254e 100644 --- a/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmYdjhServiceImpl.java +++ b/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmYdjhServiceImpl.java @@ -324,9 +324,9 @@ public class DmYdjhServiceImpl extends ServiceImpl 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;