推送云工厂接口供应商编码获取逻辑调整

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

@@ -8,9 +8,12 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import lombok.extern.log4j.Log4j2;
 
 import org.apache.commons.lang.StringEscapeUtils;
+import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.modules.documents.failDocument.entity.SyFailDocument;
 import org.jeecg.modules.documents.failDocument.service.ISyFailDocumentService;
@@ -42,6 +45,7 @@ import java.util.*;
  */
 @Log4j2
 @RestController
+@Api(tags="委外订单")
 @RequestMapping("/openApi/moMain")
 @Component
 public class MOMainController implements ApplicationContextAware {
@@ -57,6 +61,8 @@ public class MOMainController implements ApplicationContextAware {
     private static ISyFailDocumentService iSyFailDocumentService;
 
 
+    @AutoLog(value = "委外订单-分页列表查询")
+    @ApiOperation(value="委外订单-分页列表查询", notes="委外订单-分页列表查询")
     @PostMapping(value = "/QueryMoMain")
     public JSONObject QueryMoMain(String time) {
         //传出JSON
@@ -95,7 +101,7 @@ public class MOMainController implements ApplicationContextAware {
                 String ac = pkorgValue[1]; //or mo.dChangeVerifyTime >'"+lasttimeSf+"'
                 if (pkorgValue[0].equals("one")) {
                     String sql = "select mo.MOID as 'moId',mo.MOID as 'moId','"+ac+"' as accId,'"+pkorgValue[0]+"' as pkorg,mo.cState as 'poStatus'," +
-                            "mo.cCode as 'poNum','SUBCONTRACTOR_PO' as 'poType',ven.cVenDefine3 as 'supplierNumber',ven.cVenName as 'supplierName'," +
+                            "mo.cCode as 'poNum','SUBCONTRACTOR_PO' as 'poType',ven.cvencode as 'supplierNumber',ven.cVenName as 'supplierName'," +
                             "ven.cVenPerson as 'supplierContacts',ven.cVenHand as 'supplierContactsPhone',mo.cPersonCode as 'salerCode',hr.cPsn_Num as 'headerAttributeString9'," +
                             "hr1.cPsn_Name as 'headerAttributeString10',mo.cMaker as 'customerContacts','采购业务实体名称' as poBusinessUnitCode," +
                             "'' as 'customerContactsPhone','0.00' as 'totalAmount','0.00' as 'exTaxAmount', curr.cexch_code as 'currencyCode'," +
@@ -122,7 +128,7 @@ public class MOMainController implements ApplicationContextAware {
                     }//mo.cPersonCode as 'salerId',hr.cPsn_Num as 'buyerId',
                 }else if(pkorgValue[0].equals("two")){
                     String sql = "select mo.MOID as 'moId',mo.MOID as 'moId','"+ac+"' as accId,'"+pkorgValue[0]+"' as pkorg,mo.cState as 'poStatus'," +
-                            "mo.cCode as 'poNum','SUBCONTRACTOR_PO' as 'poType',ven.cVenDefine3 as 'supplierNumber',ven.cVenName as 'supplierName'," +
+                            "mo.cCode as 'poNum','SUBCONTRACTOR_PO' as 'poType',ven.cvencode as 'supplierNumber',ven.cVenName as 'supplierName'," +
                             "ven.cVenPerson as 'supplierContacts',ven.cVenHand as 'supplierContactsPhone',mo.cPersonCode as 'salerCode',hr.cPsn_Num as 'headerAttributeString9'," +
                             "hr1.cPsn_Name as 'headerAttributeString10',mo.cMaker as 'customerContacts','采购业务实体名称' as poBusinessUnitCode," +
                             "'' as 'customerContactsPhone','0.00' as 'totalAmount','0.00' as 'exTaxAmount', curr.cexch_code as 'currencyCode'," +
@@ -148,7 +154,7 @@ public class MOMainController implements ApplicationContextAware {
                     }//mo.cPersonCode as 'salerId',hr.cPsn_Num as 'buyerId',
                 }else if(pkorgValue[0].equals("three")){
                     String sql = "select mo.MOID as 'moId',mo.MOID as 'moId','"+ac+"' as accId,'"+pkorgValue[0]+"' as pkorg,mo.cState as 'poStatus'," +
-                            "mo.cCode as 'poNum','SUBCONTRACTOR_PO' as 'poType',ven.cVenDefine3 as 'supplierNumber',ven.cVenName as 'supplierName'," +
+                            "mo.cCode as 'poNum','SUBCONTRACTOR_PO' as 'poType',ven.cvencode as 'supplierNumber',ven.cVenName as 'supplierName'," +
                             "ven.cVenPerson as 'supplierContacts',ven.cVenHand as 'supplierContactsPhone',mo.cPersonCode as 'salerCode',hr.cPsn_Num as 'headerAttributeString9'," +
                             "hr1.cPsn_Name as 'headerAttributeString10',mo.cMaker as 'customerContacts','采购业务实体名称' as poBusinessUnitCode," +
                             "'' as 'customerContactsPhone','0.00' as 'totalAmount','0.00' as 'exTaxAmount', curr.cexch_code as 'currencyCode'," +

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

@@ -89,7 +89,7 @@ public class POPomainController implements ApplicationContextAware {
                 if (pkorgValue[0].equals("one")) {
                     //or cChangAuditTime >'"+lasttimeSf+"'
                     String sql = "select mo.POID as 'moId','"+ac+"' as accId,'"+pkorgValue[0]+"' as pkorg,mo.cState as 'poStatus',mo.cPOID as 'poNum','STANDARD_PO' as 'poType'," +
-                            "ven.cVenDefine3 as 'supplierNumber','采购业务实体名称' as 'poBusinessUnitCode',ven.cVenName as 'supplierName',mo.cPersonCode as salerCode,hr.cPsn_Num as 'headerAttributeString9'," +
+                            "ven.cvencode as 'supplierNumber','采购业务实体名称' as 'poBusinessUnitCode',ven.cVenName as 'supplierName',mo.cPersonCode as salerCode,hr.cPsn_Num as 'headerAttributeString9'," +
                             "ven.cVenPerson as 'supplierContacts',ven.cVenHand as 'supplierContactsPhone',hr.cDept_num as 'headerAttributeString11'," +
                             "mo.cPOID as headerAttributeString2,'' as 'customerContactsPhone','0.00' as 'totalAmount'," +
                             "'0.00' as 'exTaxAmount', curr.cexch_code as 'currencyCode',mo.iTaxRate as 'headerTaxRate'," +
@@ -116,7 +116,7 @@ public class POPomainController implements ApplicationContextAware {
                 }
                 else if(pkorgValue[0].equals("two")){
                     String sql = "select mo.POID as 'moId','"+ac+"' as accId,'"+pkorgValue[0]+"' as pkorg,mo.cState as 'poStatus',mo.cPOID as 'poNum','STANDARD_PO' as 'poType'," +
-                            "ven.cVenDefine3 as 'supplierNumber','采购业务实体名称' as 'poBusinessUnitCode',ven.cVenName as 'supplierName',mo.cPersonCode as salerCode,hr.cPsn_Num as 'headerAttributeString9'," +
+                            "ven.cvencode as 'supplierNumber','采购业务实体名称' as 'poBusinessUnitCode',ven.cVenName as 'supplierName',mo.cPersonCode as salerCode,hr.cPsn_Num as 'headerAttributeString9'," +
                             "ven.cVenPerson as 'supplierContacts',ven.cVenHand as 'supplierContactsPhone',hr.cDept_num as 'headerAttributeString11'," +
                             "mo.cPOID as headerAttributeString2,'' as 'customerContactsPhone','0.00' as 'totalAmount'," +
                             "'0.00' as 'exTaxAmount', curr.cexch_code as 'currencyCode',mo.iTaxRate as 'headerTaxRate'," +
@@ -142,7 +142,7 @@ public class POPomainController implements ApplicationContextAware {
 //hr.cPsn_Num as 'buyerId',mo.cPersonCode as salerId,
                 }else if(pkorgValue[0].equals("three")){
                     String sql = "select mo.POID as 'moId','"+ac+"' as accId,'"+pkorgValue[0]+"' as pkorg,mo.cState as 'poStatus',mo.cPOID as 'poNum','STANDARD_PO' as 'poType'," +
-                            "ven.cVenDefine3 as 'supplierNumber','采购业务实体名称' as 'poBusinessUnitCode',ven.cVenName as 'supplierName',mo.cPersonCode as salerCode,hr.cPsn_Num as 'headerAttributeString9'," +
+                            "ven.cvencode as 'supplierNumber','采购业务实体名称' as 'poBusinessUnitCode',ven.cVenName as 'supplierName',mo.cPersonCode as salerCode,hr.cPsn_Num as 'headerAttributeString9'," +
                             "ven.cVenPerson as 'supplierContacts',ven.cVenHand as 'supplierContactsPhone',hr.cDept_num as 'headerAttributeString11'," +
                             "mo.cPOID as headerAttributeString2,'' as 'customerContactsPhone','0.00' as 'totalAmount'," +
                             "'0.00' as 'exTaxAmount', curr.cexch_code as 'currencyCode',mo.iTaxRate as 'headerTaxRate'," +