1 修改

src/main/java/com/example/backend/pAndSExe/controller/PsExeController.java

@@ -72,10 +72,10 @@ public class PsExeController {
         logger.info("收到库存业务导入请求，文件名: {}", file.getOriginalFilename());
         try {
             // 调用服务方法，获取导入结果
-           // String resultMsg = stockService.importInfExe1ToMdkc();
-           // String s = payService.importInfExe3ToPay();
-           // String s1 = feePayService.importInfFeiyongfukuanToPay();
-           // String s2 = feeInvoiceSettleService.importInfToSettle();
+           String resultMsg = stockService.importInfExe1ToMdkc();
+           String s = payService.importInfExe3ToPay();
+           String s1 = feePayService.importInfFeiyongfukuanToPay();
+           String s2 = feeInvoiceSettleService.importInfToSettle();
             String s3 = jinxiangInvoiceSettleService.importJinxiangInfToSettle();
            // String s4 = daodandengjiSettleService.importDaodandengjiInfToSettle();
            // String s5 = shoukuanrenlingSettleService.importShoukuanrenlingInfToSettle();
@@ -84,7 +84,7 @@ public class PsExeController {
 
 
             // 返回成功JSON
-            return Result.success(/*resultMsg+s+s1+s2+*/s3/*+s4+s5+s6+s7*/, "所有业务导入");
+            return Result.success(resultMsg+s+s1+s2+s3/*+s4+s5+s6+s7*/, "所有业务导入");
         } catch (Exception e) {
             logger.error("库存业务导入失败", e);
             // 返回失败JSON

src/main/java/com/example/backend/pAndSExe/mapper/MdkcctrlMapper.java

@@ -46,7 +46,7 @@ public interface MdkcctrlMapper extends BaseMapper<Mdkcctrl> {
             "from warehouse\n" +
             "where ifnull(del_flag, 0) <> 1\n" +
             "\tand ifnull(endsign, 0) = 1\n" +
-            "and sotockname=#{stockname}\n" +
+            "and stockname=#{stockname}\n" +
             "limit 1")
     String selectStockNoByName(String stockname);
 

src/main/java/com/example/backend/pAndSExe/service/impl/JinxiangInvoiceSettleServiceImpl.java

@@ -75,6 +75,7 @@ public class JinxiangInvoiceSettleServiceImpl implements JinxiangInvoiceSettleSe
                 settle.setExpanseReportId(inf.getExpanseReportId());
                 settle.setCreateBy(inf.getCreateBy());
                 settle.setReceiptNo(inf.getReceiptNo());
+                settle.setPoOrderNo(inf.getPono());
                 String s = mdkcctrlMapper.selectCreateByName(inf.getCreateBy());
                 settle.setCreateByName(s);
                 settle.setCreateTime(new Date());