diff --git a/src/main/java/com/dsic/gj_erp/controller/pgd/PgdSljhController.java b/src/main/java/com/dsic/gj_erp/controller/pgd/PgdSljhController.java index 3fc7d72..e703dbd 100644 --- a/src/main/java/com/dsic/gj_erp/controller/pgd/PgdSljhController.java +++ b/src/main/java/com/dsic/gj_erp/controller/pgd/PgdSljhController.java @@ -128,6 +128,8 @@ public class PgdSljhController { ydjh.setKcch(slKc.getDCCH()); ydjh.setDcCh(slKc.getZYCH()); ydjh.setDcPl(slKc.getZYPL()); + ydjh.setWpgg(slKc.getWPGG()); + ydjh.setWpxh(slKc.getWPXH()); ydjh.setZt("11"); ydjh.setJhlx("99"); ydjh.setSllsh(id); @@ -161,12 +163,14 @@ public class PgdSljhController { slKc.setWPZT(wpztMap.get(slKc.getWPZT())); } + int ceil = (int) (Math.ceil((double) list.size() / 18)); List slKcList= new ArrayList<>(); if(ceil>1){ for(int i=0;i list) throws Exception, CustomException { //ls_lsh = F_GETPJH("MM",'00',"MSMS") - String id = syService.f_getpjh("MM", "00", "MSMS"); + //String id = syService.f_getpjh("MM", "00", "MSMS"); //dw_1.object.sllsh[ll_ii] = ls_lsh //dw_1.object.dyry[ll_ii] = gs_user //dw_1.object.dyrq[ll_ii] = ls_datetime @@ -209,7 +214,7 @@ public class PgdSljhController { imCkwpkwp.setWph(slKc.getWPH()); imCkwpkwp.setKwh(slKc.getKWH()); imCkwpkwp.setNbsbm(slKc.getNBSBM()); - imCkwpkwp.setSllsh(id); + // imCkwpkwp.setSllsh(id); imCkwpkwp.setDyrq(DateUtil.format(DateUtil.date(), "yyyy/MM/dd HH:mm")); imCkwpkwp.setDyry((String) req.getAttribute("yhms")); ckupList.add(imCkwpkwp); @@ -242,12 +247,14 @@ public class PgdSljhController { slKc.setWPZT(wpztMap.get(slKc.getWPZT())); } + String sllsh= list.get(0).getSllsh(); int ceil = (int) (Math.ceil((double) list.size() / 18)); List slKcList= new ArrayList<>(); if(ceil>1){ for(int i=0;i