修改

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/stkmisdelivery/StkMisDeliveryService.java

@@ -39,8 +39,13 @@ public class StkMisDeliveryService extends FinKingDeeService {
         }
         map_fEntityModel_.put("FBaseCurrId", "PRE001");
         map_fEntityModel_.put("FOwnerIdHead",stkMisDelivery.getFOwnerIdHead());
-        map_fEntityModel_.put("FDEPTID",stkMisDelivery.getFDEPTID());
+        map_fEntityModel_.put("FDeptId",stkMisDelivery.getFDEPTID());
         map_fEntityModel_.put("FNOTE",stkMisDelivery.getFNOTE());
+        map_fEntityModel_.put("F_PAEZ_Base",stkMisDelivery.getFOwnerIdHead());
+        map_fEntityModel_.put("F_PAEZ_Base1",stkMisDelivery.getFDEPTID());
+        map_fEntityModel_.put("F_PAEZ_Base2",stkMisDelivery.getFDEPTID());
+        map_fEntityModel_.put("F_PAEZ_Assistant","21");
+
         List<StkMisDelivery.StkMisDeliveryEntry> stkMiscellaneousEntryList =
                 stkMisDelivery.getStkMisDeliveryEntry() == null ? new ArrayList<>() : stkMisDelivery.getStkMisDeliveryEntry();
         //准备 物料列表的数据
@@ -50,7 +55,7 @@ public class StkMisDeliveryService extends FinKingDeeService {
         }
         String kingDeeData = StkMisDeliveryCastToKingDeeBillFields.getKingDeeData(map_fEntityModel_, vehicleListMap.getData());
         try {
-            ResultBean<String> resultBean1 = accessKingDeeInterface(KingDeeBillId.STK_MISCELLANEOUS.getID(), kingDeeData, KingDeeBillUrl.SAVE_URL.getURL());
+            ResultBean<String> resultBean1 = accessKingDeeInterface(KingDeeBillId.STK_MisDelivery.getID(), kingDeeData, KingDeeBillUrl.SAVE_URL.getURL());
             if (!resultBean1.getSuccess()) {
                 log.info("其他出库单保存失败!");
                 return rb.setMsg("其他出库单保存失败!");
@@ -76,7 +81,7 @@ public class StkMisDeliveryService extends FinKingDeeService {
             m.put("FMATERIALID", c.getFMATERIALID());
             m.put("FUnitID", c.getFUnitID());
             m.put("FSTOCKID", c.getFSTOCKID());
-            m.put("FOWNERID", c.getFOWNERID());
+            m.put("FOwnerId", c.getFOWNERID());
             m.put("FKEEPERID", c.getFOWNERID());
             mapList.add(m);
         }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/stkmisdelivery/data_FEntity.json

@@ -7,17 +7,20 @@
     "FNumber": "@KD_FUnitID"
   },
   "FQty": 1.0,
-  "FREALQTY": 1.0,
+  "FREALQty": 1.0,
-  "FBASEQTY": 1.0,
+  "FActualQty": 1.0,
+  "FBaseQty": 1.0,
+  "FBaseActualQty": 1.0,
+
   "FSTOCKID": {
     "FNumber": "@KD_FSTOCKID"
   },
   "FSTOCKSTATUSID": {
     "FNumber": "KCZT01_SYS"
   },
-  "FOWNERTYPEID": "BD_OwnerOrg",
+  "FOwnerTypeId": "BD_OwnerOrg",
-  "FOWNERID": {
+  "FOwnerId": {
-    "FNumber": "@KD_FOWNERID"
+    "FNumber": "@KD_FOwnerId"
   },
   "FKEEPERTYPEID": "BD_KeeperOrg",
   "FKEEPERID": {"FNumber": "@KD_FKEEPERID"}

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/stkmisdelivery/data_model.json

@@ -15,6 +15,21 @@
   "FBaseCurrId": {
     "FNumber": "PRE001"
   },
+  "F_PAEZ_Assistant": {
+    "FNumber": "21"
+  },
+  "F_PAEZ_Base": {
+    "FNUMBER": "@KD_F_PAEZ_Base"
+  },
+  "F_PAEZ_Base1": {
+    "FNUMBER": "@KD_F_PAEZ_Base1"
+  },
+  "F_PAEZ_Base2": {
+    "FNUMBER": "@KD_F_PAEZ_Base2"
+  },
+  "FDeptId": {
+    "FNumber": "@KD_FDeptId"
+  },
   "FNOTE": "@KD_FNOTE",
   "FEntity": [
   ]

anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/factoryDailyReport/FactoryDaliyReportFeign.java

@@ -38,6 +38,9 @@ public interface FactoryDaliyReportFeign {
     @ResponseBody
     ResultBean<FgsVo> list3(@RequestParam("divisionSid") String divisionSid);
 
+    @GetMapping("/list4")
+    @ResponseBody
+    ResultBean<FgsDetailVo> list4(@RequestParam("linkSid") String linkSid);
 }
 
 

anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/factoryDailyReport/FgsDetailVo.java

@@ -0,0 +1,30 @@
+package com.yxt.anrui.reportcenter.api.factoryDailyReport;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2025/5/30
+ **/
+@Data
+public class FgsDetailVo {
+
+    private String title;
+
+    private List<YearAllVo> row1;
+
+    private List<String> row2;
+
+    private List<String> row3;
+    private List<String> row4;
+    private List<String> row5;
+    private List<String> row6;
+    private List<String> row7;
+    private List<String> row8;
+    private List<String> row9;
+    private List<String> row10;
+    private List<String> row11;
+}

anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/factoryDailyReport/FactoryDaliyReportRest.java

@@ -52,5 +52,9 @@ public class FactoryDaliyReportRest implements FactoryDaliyReportFeign {
         return factoryDaliyReportService.list3(divisionSid);
     }
 
+    @Override
+    public ResultBean<FgsDetailVo> list4(String linkSid) {
+        return factoryDaliyReportService.list4(linkSid);
+    }
 
 }

anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/factoryDailyReport/FactoryDaliyReportService.java

@@ -328,4 +328,11 @@ public class FactoryDaliyReportService {
         }
         return rb.success().setData(fgsVo);
     }
+
+    public ResultBean<FgsDetailVo> list4(String linkSid) {
+        ResultBean<FgsDetailVo> rb = ResultBean.fireFail();
+        FgsDetailVo fgsDetailVo = new FgsDetailVo();
+
+        return null;
+    }
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoutboundapply/LoanOutboundApplyRest.java

@@ -6,6 +6,7 @@ import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables;
 import com.yxt.anrui.riskcenter.api.loanoutboundapply.*;
 import com.yxt.anrui.riskcenter.api.loanoutboundapply.app.AppOutboundDetailsVo;
 import com.yxt.anrui.riskcenter.api.loanoutboundapply.flow.*;
+import com.yxt.anrui.riskcenter.api.loanreturninboundapply.LoanReturnInboundApply;
 import com.yxt.anrui.riskcenter.api.loansubletapply.*;
 import com.yxt.anrui.riskcenter.api.loansubletapply.app.AppSubletDetailsVo;
 import com.yxt.anrui.riskcenter.api.loansubletapply.flow.*;
@@ -13,7 +14,9 @@ import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -110,5 +113,12 @@ public class LoanOutboundApplyRest implements LoanOutboundApplyFeign {
         return loanOutboundApplyService.appDetail(sid);
     }
 
+    @ApiOperation(value = "财务推送其它入库单测试")
+    @PostMapping(value = "/pushStkIn")
+    public ResultBean pushStkIn(String sid){
+        LoanOutboundApply loanOutboundApply = loanOutboundApplyService.fetchBySid(sid);
+        loanOutboundApplyService.pushStkOut(loanOutboundApply);
+        return ResultBean.fireSuccess();
 
+    }
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoutboundapply/LoanOutboundApplyService.java

@@ -721,7 +721,7 @@ public class LoanOutboundApplyService extends MybatisBaseService<LoanOutboundApp
                         Future future1 = pool.submit(() -> {
                             //推送其他出库单
                             //TOdO:
-                            pushStkOut(finalLoanOutboundApply,busVinSidList);
+                            pushStkOut(finalLoanOutboundApply);
                         });
                     } catch (Exception e) {
                         e.printStackTrace();
@@ -1254,7 +1254,8 @@ public class LoanOutboundApplyService extends MybatisBaseService<LoanOutboundApp
         }
     }
 
-    public void pushStkOut(LoanOutboundApply loanOutboundApply,List<String> busVinSidList) {
+    public void pushStkOut(LoanOutboundApply loanOutboundApply) {
+        List<String> busVinSidList = loanOutboundVehService.selectByMainSid(loanOutboundApply.getSid());
         SysOrganizationVo sysOrg = sysOrganizationFeign.fetchBySid(loanOutboundApply.getUseOrgSid()).getData();
         StkMisDelivery stkMisDelivery = new StkMisDelivery();
         List<StkMisDelivery.StkMisDeliveryEntry> stkMiscellaneousEntryList = new ArrayList<>();
@@ -1272,9 +1273,10 @@ public class LoanOutboundApplyService extends MybatisBaseService<LoanOutboundApp
             stkMisDeliveryEntry.setFSTOCKID("ARZSCK");
             stkMisDeliveryEntry.setFOWNERID(sysOrg.getOrgCode());
             stkMiscellaneousEntryList.add(stkMisDeliveryEntry);
-            stkMisDelivery.setStkMisDeliveryEntry(stkMiscellaneousEntryList);
         }
+
         if(!stkMiscellaneousEntryList.isEmpty()){
+            stkMisDelivery.setStkMisDeliveryEntry(stkMiscellaneousEntryList);
             ResultBean resultBean = finKingDeeFeign.draftStkMisDelivery(stkMisDelivery);
         }
     }