费用支出单调整

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/syShippingOrder/mapper/xml/SyShippingOrderMapper.xml

@@ -116,7 +116,7 @@ on a.elements_Id = b.id
 left join sy_packing_list_fabric_item c
 on a.tailoring_fabric_item_id = c.id
 where a.sy_shipping_order_item_id =#{id}
- GROUP BY a.group_id order by a.english_name,b.declaration_name desc
+ GROUP BY a.group_id order by a.english_name,b.declaration_name
     </select>
 
 
@@ -175,19 +175,19 @@ group by c.group_id) t group by t.elementsId,t.styleNumber,t.smailPo,t.unitPrice
     <insert id="saveSalePayVouch">
 
  insert into SalePayVouch(cSPVCode,ID,dDate,cPersonCode,cDepCode,cCusCode,cDefine10,cVouchType,cMaker,
-   iSourceId,cSourceCode,cSOCode,cnextsystem,iexchrate,cVouchID,Cexch_Name,iVTid,cvencode)
+   iSourceId,cSourceCode,cSOCode,cnextsystem,iexchrate,cVouchID,Cexch_Name,iVTid,cvencode,cVerifier,
+   dverifydate,dverifysystime,cSourceType)
    value (#{map.cSPVCode},#{map.ID},#{map.dDate},#{map.cPersonCode},#{map.cDepCode},#{map.cCusCode},
    #{map.cDefine10},#{map.cVouchType},#{map.cMaker},#{map.iSourceId},#{map.cSourceCode},#{map.cSOCode},
-   #{map.cnextsystem},#{map.iexchrate},#{map.cVouchID},#{map.Cexch_Name},#{map.iVTid},#{map.cvencode})
+   #{map.cnextsystem},#{map.iexchrate},#{map.cVouchID},#{map.Cexch_Name},#{map.iVTid},#{map.cvencode},#{map.cVerifier},
+   #{map.dverifydate},#{map.dverifysystime},'97')
 
     </insert>
 
     <!--    新增费用支出单子表-->
     <insert id="saveSalePayVouchs">
 
-        <!--  insert into SalePayVouch(cVouchID,cMaker,ID,cSPVCode,dDate,cDefine10,cCusCode,cDepCode,cPersonCode,Cexch_Name,iexchrate,cSOCode,cvencode,cnextsystem)
-      values('0000002979','应甜甜','1000001209','0000001132','2022-12-16 15:37:00','22TW-CAM-44','T020001','TSM03','T0149','人民币','1','SYW440-马菲羊-面料','0176','其他应付单')-->
-   insert into SalePayVouchs(cSPVCode,iMoney,cExpCode,ID,irowno)
+     insert into SalePayVouchs(cSPVCode,iMoney,cExpCode,ID,irowno)
    value (#{map.cSPVCode},#{map.iMoney},#{map.cExpCode},#{map.ID},#{map.irowno})
 
     </insert>

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/syShippingOrder/service/impl/SyShippingOrderServiceImpl.java

@@ -570,19 +570,29 @@ public class SyShippingOrderServiceImpl extends ServiceImpl<SyShippingOrderMappe
         List<Map<String,Object>> listmaps = new ArrayList<>();
 
         SimpleDateFormat sf = new SimpleDateFormat("yyyy-MM-dd 00:00:00.000");
+        SimpleDateFormat sf2 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS");
 
         //记录每次ID
         String id = "";
         //记录每次单据号
         String cCode = "";
         String cVouchID = "";
+        //创建人
+        String create = "";
         //获取单据号加1
         cCode= org.jeecg.modules.system.util.oConvertUtils.addOne(purchaseWarehousingMapper.getMaxCode("cSPVCode","SalePayVouch","cSPVCode"));
         //获取ID
-        id = org.jeecg.modules.system.util.oConvertUtils.addOne(purchaseWarehousingMapper.getMaxCode("ID","SalePayVouch","dcreatesystime"));
+        id = org.jeecg.modules.system.util.oConvertUtils.addOne(purchaseWarehousingMapper.getMaxCode("ID","SalePayVouch","cSPVCode"));
         //单据id
-        //cVouchID = org.jeecg.modules.system.util.oConvertUtils.addOne(purchaseWarehousingMapper.getMaxCode("cVouchID","SalePayVouch","dcreatesystime"));
+        cVouchID = org.jeecg.modules.system.util.oConvertUtils.addOne(purchaseWarehousingMapper.getMaxCode("cVouchID","SalePayVouch","cSPVCode"));
 
+        //设置创建人
+        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+        if(org.jeecg.modules.system.util.oConvertUtils.isEmpty(sysUser)){
+            create = "admin";
+        }else {
+            create = sysUser.getRealname();
+        }
         //查询U8汇率
         Map<String, Object> rate = null;
         String nflat = "";
@@ -645,14 +655,14 @@ public class SyShippingOrderServiceImpl extends ServiceImpl<SyShippingOrderMappe
 
                     if (ii > 1) {
                         cCode = org.jeecg.modules.system.util.oConvertUtils.addOne(cCode);
-                        //cVouchID = org.jeecg.modules.system.util.oConvertUtils.addOne(cVouchID);
+                        cVouchID = org.jeecg.modules.system.util.oConvertUtils.addOne(cVouchID);
                         id = org.jeecg.modules.system.util.oConvertUtils.addOne(id);
                         map.put("cSPVCode", cCode);//单据号
-                        // map.put("cVouchID",cVouchID);
+                        map.put("cVouchID",cVouchID);
                         map.put("ID", id);//ID
                     } else {
                         map.put("cSPVCode", cCode);//单据号
-                        //map.put("cVouchID",cVouchID);
+                        map.put("cVouchID",cVouchID);
                         map.put("ID", id);//ID
                     }
                     map.put("dDate", sf.format(new Date()));//日期
@@ -660,7 +670,7 @@ public class SyShippingOrderServiceImpl extends ServiceImpl<SyShippingOrderMappe
                     map.put("cDepCode", mapPo.get("cDepCode"));//部门
                     map.put("cCusCode", mapPo.get("cCusCode"));//客户简称
                     map.put("cDefine10", map1.get("shippingOrderNumber"));//外销发票号
-                    map.put("cVouchType", "PO");//单据类型
+                    map.put("cVouchType", "P0");//单据类型
                     map.put("cMaker", "进出口平台管理员");//制单人
                     map.put("iSourceId", mapPo.get("ID"));//来源ID、
                     map.put("cSourceCode", li.get("orderNumber"));//订单号
@@ -669,8 +679,10 @@ public class SyShippingOrderServiceImpl extends ServiceImpl<SyShippingOrderMappe
                     map.put("iexchrate", "1");//汇率
                     map.put("Cexch_Name", "人民币");
                     map.put("iVTid", "57");
-
                     map.put("cvencode", rmb.get("freightForwarder"));
+                    map.put("cVerifier",create);//审核人
+                    map.put("dverifydate",sf.format(new Date()));//审核日期
+                    map.put("dverifysystime",sf2.format(new Date()));//审核时间
                     listmap.add(map);
 
 
@@ -705,14 +717,14 @@ public class SyShippingOrderServiceImpl extends ServiceImpl<SyShippingOrderMappe
 
                     if (ii > 1) {
                         cCode = org.jeecg.modules.system.util.oConvertUtils.addOne(cCode);
-                        //cVouchID = org.jeecg.modules.system.util.oConvertUtils.addOne(cVouchID);
+                        cVouchID = org.jeecg.modules.system.util.oConvertUtils.addOne(cVouchID);
                         id = org.jeecg.modules.system.util.oConvertUtils.addOne(id);
                         map.put("cSPVCode", cCode);//单据号
-                        // map.put("cVouchID",cVouchID);
+                        map.put("cVouchID",cVouchID);
                         map.put("ID", id);//ID
                     } else {
                         map.put("cSPVCode", cCode);//单据号
-                        //map.put("cVouchID",cVouchID);
+                        map.put("cVouchID",cVouchID);
                         map.put("ID", id);//ID
                     }
 
@@ -721,7 +733,7 @@ public class SyShippingOrderServiceImpl extends ServiceImpl<SyShippingOrderMappe
                     map.put("cDepCode", mapPo.get("cDepCode"));//部门
                     map.put("cCusCode", mapPo.get("cCusCode"));//客户简称
                     map.put("cDefine10", map1.get("shippingOrderNumber"));//外销发票号
-                    map.put("cVouchType", "PO");//单据类型
+                    map.put("cVouchType", "P0");//单据类型
                     map.put("cMaker", "进出口平台管理员");//制单人
                     map.put("iSourceId", mapPo.get("ID"));//来源ID、
                     map.put("cSourceCode", li.get("orderNumber"));//订单号li.get("orderNumber")
@@ -731,6 +743,9 @@ public class SyShippingOrderServiceImpl extends ServiceImpl<SyShippingOrderMappe
                     map.put("Cexch_Name", "美元");
                     map.put("iVTid", "57");//单据模板号
                     map.put("cvencode", usd.get("freightForwarder"));
+                    map.put("cVerifier",create);//审核人
+                    map.put("dverifydate",sf.format(new Date()));//审核日期
+                    map.put("dverifysystime",sf2.format(new Date()));//审核时间
                     listmap.add(map);