zengtx пре 3 година
родитељ
комит
325a91092a

+ 4 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/failDocument/entity/SyFailDocument.java

@@ -52,4 +52,8 @@ public class SyFailDocument {
 	@Excel(name = "原因", width = 15)
     @ApiModelProperty(value = "原因")
 	private java.lang.Object reason;
+	/**账套*/
+	@Excel(name = "账套", width = 15)
+	@ApiModelProperty(value = "账套")
+	private String accid;
 }

+ 7 - 5
jeecg-boot-module-system/src/main/java/org/jeecg/modules/openApi/controller/MOMainController.java

@@ -53,8 +53,8 @@ public class MOMainController implements ApplicationContextAware {
     private static ISenYuDataSourceTwo senYuDataSourceTwo;
     //数据源one
     private static ISenYuDataSourceThree iSenYuDataSourceThree;
-    @Autowired
-    private ISyFailDocumentService iSyFailDocumentService;
+
+    private static ISyFailDocumentService iSyFailDocumentService;
 
 
     @PostMapping(value = "/QueryMoMain")
@@ -222,9 +222,7 @@ public class MOMainController implements ApplicationContextAware {
                             String type = jo.getString("type");
                             //单据号
                             String poNum = jo.getString("poNum");
-                            if(oConvertUtils.isEmpty(poNum)){
-                                poNum ="测试001";
-                            }
+
                             //单据日期
                             String date = jo.getString("date");
                             //账套666
@@ -238,6 +236,7 @@ public class MOMainController implements ApplicationContextAware {
                                         syFailDocument.setDocumentNo(poNum);
                                         syFailDocument.setDocumentDate(date);
                                         syFailDocument.setDocumentStatus("0");
+                                        syFailDocument.setAccid(accId);
                                         syFailDocument.setReason(message);
                                         iSyFailDocumentService.save(syFailDocument);
                                     }
@@ -252,6 +251,7 @@ public class MOMainController implements ApplicationContextAware {
                                         syFailDocument.setDocumentNo(poNum);
                                         syFailDocument.setDocumentDate(date);
                                         syFailDocument.setDocumentStatus("0");
+                                        syFailDocument.setAccid(accId);
                                         syFailDocument.setReason(message);
                                         iSyFailDocumentService.save(syFailDocument);
                                     }
@@ -266,6 +266,7 @@ public class MOMainController implements ApplicationContextAware {
                                         syFailDocument.setDocumentNo(poNum);
                                         syFailDocument.setDocumentDate(date);
                                         syFailDocument.setDocumentStatus("0");
+                                        syFailDocument.setAccid(accId);
                                         syFailDocument.setReason(message);
                                         iSyFailDocumentService.save(syFailDocument);
                                     }
@@ -294,5 +295,6 @@ public class MOMainController implements ApplicationContextAware {
         this.senYuDataSourceOne = applicationContext.getBean(ISenYuDataSourceOne.class);
         this.senYuDataSourceTwo = applicationContext.getBean(ISenYuDataSourceTwo.class);
         this.iSenYuDataSourceThree = applicationContext.getBean(ISenYuDataSourceThree.class);
+        this.iSyFailDocumentService = applicationContext.getBean(ISyFailDocumentService.class);
     }
 }

+ 7 - 5
jeecg-boot-module-system/src/main/java/org/jeecg/modules/openApi/controller/POPomainController.java

@@ -47,8 +47,8 @@ public class POPomainController implements ApplicationContextAware {
     private static ISenYuDataSourceTwo senYuDataSourceTwo;
     //数据源one
     private static ISenYuDataSourceThree iSenYuDataSourceThree;
-    @Autowired
-    private ISyFailDocumentService iSyFailDocumentService;
+
+    private static ISyFailDocumentService iSyFailDocumentService;
 
 
     @PostMapping(value = "/QueryPoMain")
@@ -208,6 +208,7 @@ public class POPomainController implements ApplicationContextAware {
                         }
                         //回写U8物料信息表是否同步成功字段
                             JSONObject jo = jsonArray;
+                             System.out.println("JSON数据:"+jo);
                             //获取是否成功
                             String code = jo.getString("code");
                             //获取返回消息
@@ -220,9 +221,6 @@ public class POPomainController implements ApplicationContextAware {
                             String type = jo.getString("type");
                             //单据号
                             String poNum = jo.getString("poNum");
-                            if(oConvertUtils.isEmpty(poNum)){
-                                poNum ="测试001";
-                            }
                             //单据日期
                             String date = jo.getString("date");
                             //账套1
@@ -236,6 +234,7 @@ public class POPomainController implements ApplicationContextAware {
                                         syFailDocument.setDocumentNo(poNum);
                                         syFailDocument.setDocumentDate(date);
                                         syFailDocument.setDocumentStatus("0");
+                                        syFailDocument.setAccid(accId);
                                         syFailDocument.setReason(message);
                                         iSyFailDocumentService.save(syFailDocument);
                                     }
@@ -250,6 +249,7 @@ public class POPomainController implements ApplicationContextAware {
                                         syFailDocument.setDocumentNo(poNum);
                                         syFailDocument.setDocumentDate(date);
                                         syFailDocument.setDocumentStatus("0");
+                                        syFailDocument.setAccid(accId);
                                         syFailDocument.setReason(message);
                                         iSyFailDocumentService.save(syFailDocument);
                                     }
@@ -264,6 +264,7 @@ public class POPomainController implements ApplicationContextAware {
                                         syFailDocument.setDocumentNo(poNum);
                                         syFailDocument.setDocumentDate(date);
                                         syFailDocument.setDocumentStatus("0");
+                                        syFailDocument.setAccid(accId);
                                         syFailDocument.setReason(message);
                                         iSyFailDocumentService.save(syFailDocument);
                                     }
@@ -290,6 +291,7 @@ public class POPomainController implements ApplicationContextAware {
         this.senYuDataSourceOne = applicationContext.getBean(ISenYuDataSourceOne.class);
         this.senYuDataSourceTwo = applicationContext.getBean(ISenYuDataSourceTwo.class);
         this.iSenYuDataSourceThree = applicationContext.getBean(ISenYuDataSourceThree.class);
+        this.iSyFailDocumentService = applicationContext.getBean(ISyFailDocumentService.class);
     }
 
 }