From c35fd3e4b493fe630b2a99fdbfe37a8044f3c1be Mon Sep 17 00:00:00 2001
From: xhj <xhjzrq@163.com>
Date: Sun, 15 Dec 2024 09:23:32 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../gj_erp/controller/pgd/PgdSljhController.java     | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

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<SlKc> slKcList= new ArrayList<>();
         if(ceil>1){
             for(int i=0;i<ceil;i++){
                 SlKc slKc =new SlKc();
                 slKc.setDyrq(DateUtil.format(DateUtil.date(), "yyyy/MM/dd"));
+                slKc.setSllsh(id);
                 if (ceil - i == 1){
                     slKc.setList(list.subList(i*18,list.size()));
                 }else{
@@ -179,6 +183,7 @@ public class PgdSljhController {
         }else{
             SlKc slKc =new SlKc();
             slKc.setDyrq(DateUtil.format(DateUtil.date(), "yyyy/MM/dd"));
+            slKc.setSllsh(id);
             slKc.setList(list);
             slKcList.add(slKc);
         }
@@ -196,7 +201,7 @@ public class PgdSljhController {
     @ResponseBody
     public ResultBean slPrintD(HttpServletRequest req, @RequestBody List<SlKc> 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<SlKc> slKcList= new ArrayList<>();
         if(ceil>1){
             for(int i=0;i<ceil;i++){
                 SlKc slKc =new SlKc();
                 slKc.setDyrq(DateUtil.format(DateUtil.date(), "yyyy/MM/dd"));
+                slKc.setSllsh(sllsh);
                 if (ceil - i == 1){
                     slKc.setList(list.subList(i*18,list.size()));
                 }else{
@@ -260,6 +267,7 @@ public class PgdSljhController {
         }else{
             SlKc slKc =new SlKc();
             slKc.setDyrq(DateUtil.format(DateUtil.date(), "yyyy/MM/dd"));
+            slKc.setSllsh(sllsh);
             slKc.setList(list);
             slKcList.add(slKc);
         }