yuansh преди 5 месеца
родител
ревизия
fab20345a7
променени са 100 файла, в които са добавени 222 реда и са изтрити 0 реда
  1. 2 0
      srm-module-code/src/main/java/org/jeecg/modules/baseCode/entity/BaseCompanyInformation.java
  2. 2 0
      srm-module-code/src/main/java/org/jeecg/modules/baseCode/entity/BaseExchangeRate.java
  3. 2 0
      srm-module-code/src/main/java/org/jeecg/modules/baseCode/entity/BaseProductArchive.java
  4. 2 0
      srm-module-code/src/main/java/org/jeecg/modules/baseCode/entity/BaseProductClass.java
  5. 2 0
      srm-module-code/src/main/java/org/jeecg/modules/baseCode/entity/BaseProjectArchive.java
  6. 2 0
      srm-module-code/src/main/java/org/jeecg/modules/baseCode/entity/BaseShipArchive.java
  7. 2 0
      srm-module-code/src/main/java/org/jeecg/modules/baseCode/entity/BaseShipArchiveAccessories.java
  8. 2 0
      srm-module-code/src/main/java/org/jeecg/modules/baseCode/entity/BaseShipArchiveRelateCustomer.java
  9. 2 0
      srm-module-code/src/main/java/org/jeecg/modules/baseCode/entity/BaseTemplates.java
  10. 2 0
      srm-module-code/src/main/java/org/jeecg/modules/baseCode/entity/SerialPattern.java
  11. 2 0
      srm-module-code/src/main/java/org/jeecg/modules/cuspCode/entity/CuspCustomerProfile.java
  12. 2 0
      srm-module-code/src/main/java/org/jeecg/modules/cuspCode/entity/CuspCustomerProfileMan.java
  13. 2 0
      srm-module-code/src/main/java/org/jeecg/modules/cuspCode/entity/CuspIntermediator.java
  14. 2 0
      srm-module-code/src/main/java/org/jeecg/modules/cuspCode/entity/CuspSupplierEvaluation.java
  15. 2 0
      srm-module-code/src/main/java/org/jeecg/modules/cuspCode/entity/CuspSupplierEvaluationScore.java
  16. 2 0
      srm-module-code/src/main/java/org/jeecg/modules/cuspCode/entity/CuspSupplierProfile.java
  17. 2 0
      srm-module-code/src/main/java/org/jeecg/modules/cuspCode/entity/CuspSupplierProfileCatalog.java
  18. 2 0
      srm-module-code/src/main/java/org/jeecg/modules/cuspCode/entity/CuspSupplierProfileMan.java
  19. 2 0
      srm-module-code/src/main/java/org/jeecg/modules/cuspCode/entity/CuspSupplierProfileQualification.java
  20. 2 0
      srm-module-code/src/main/java/org/jeecg/modules/cuspCode/vo/CuspCustomerProfilePage.java
  21. 2 0
      srm-module-code/src/main/java/org/jeecg/modules/cuspCode/vo/CuspSupplierEvaluationPage.java
  22. 2 0
      srm-module-code/src/main/java/org/jeecg/modules/cuspCode/vo/CuspSupplierProfilePage.java
  23. 2 0
      srm-module-code/src/main/java/org/jeecg/modules/purCode/entity/PurCommissionRequest.java
  24. 2 0
      srm-module-code/src/main/java/org/jeecg/modules/purCode/entity/PurCommissionRequestDetails.java
  25. 2 0
      srm-module-code/src/main/java/org/jeecg/modules/purCode/entity/PurDeliveryNodeShip.java
  26. 2 0
      srm-module-code/src/main/java/org/jeecg/modules/purCode/entity/PurDeliveryNote.java
  27. 2 0
      srm-module-code/src/main/java/org/jeecg/modules/purCode/entity/PurDeliveryNoteArrival.java
  28. 2 0
      srm-module-code/src/main/java/org/jeecg/modules/purCode/entity/PurInquiryForm.java
  29. 2 0
      srm-module-code/src/main/java/org/jeecg/modules/purCode/entity/PurInquiryFormProduct.java
  30. 2 0
      srm-module-code/src/main/java/org/jeecg/modules/purCode/entity/PurInquiryFormShip.java
  31. 4 0
      srm-module-code/src/main/java/org/jeecg/modules/purCode/entity/PurOrder.java
  32. 2 0
      srm-module-code/src/main/java/org/jeecg/modules/purCode/entity/PurOrderFiles.java
  33. 4 0
      srm-module-code/src/main/java/org/jeecg/modules/purCode/entity/PurOrderHis.java
  34. 2 0
      srm-module-code/src/main/java/org/jeecg/modules/purCode/entity/PurOrderProduct.java
  35. 2 0
      srm-module-code/src/main/java/org/jeecg/modules/purCode/entity/PurOrderProductHis.java
  36. 2 0
      srm-module-code/src/main/java/org/jeecg/modules/purCode/entity/PurOrderShip.java
  37. 2 0
      srm-module-code/src/main/java/org/jeecg/modules/purCode/entity/PurOrderShipHis.java
  38. 2 0
      srm-module-code/src/main/java/org/jeecg/modules/purCode/entity/PurPayment.java
  39. 5 0
      srm-module-code/src/main/java/org/jeecg/modules/purCode/entity/PurPaymentRequest.java
  40. 2 0
      srm-module-code/src/main/java/org/jeecg/modules/purCode/entity/PurPaymentRequestDetails.java
  41. 4 0
      srm-module-code/src/main/java/org/jeecg/modules/purCode/entity/PurPurchaseQuotation.java
  42. 2 0
      srm-module-code/src/main/java/org/jeecg/modules/purCode/entity/PurPurchaseQuotationProduct.java
  43. 2 0
      srm-module-code/src/main/java/org/jeecg/modules/purCode/entity/PurPurchaseQuotationShip.java
  44. 3 0
      srm-module-code/src/main/java/org/jeecg/modules/purCode/entity/PurQuotationSelection.java
  45. 2 0
      srm-module-code/src/main/java/org/jeecg/modules/purCode/entity/PurQuotationSelectionProduct.java
  46. 2 0
      srm-module-code/src/main/java/org/jeecg/modules/purCode/entity/PurQuotationSelectionShip.java
  47. 2 0
      srm-module-code/src/main/java/org/jeecg/modules/purCode/entity/PurShippingFee.java
  48. 2 0
      srm-module-code/src/main/java/org/jeecg/modules/purCode/entity/PurShippingFeeNotice.java
  49. 2 0
      srm-module-code/src/main/java/org/jeecg/modules/purCode/entity/PurShippingFeeProdeuct.java
  50. 2 0
      srm-module-code/src/main/java/org/jeecg/modules/purCode/vo/PurCommissionRequestPage.java
  51. 2 0
      srm-module-code/src/main/java/org/jeecg/modules/purCode/vo/PurDeliveryNoteAlert.java
  52. 2 0
      srm-module-code/src/main/java/org/jeecg/modules/purCode/vo/PurDeliveryNotePage.java
  53. 2 0
      srm-module-code/src/main/java/org/jeecg/modules/purCode/vo/PurInquiryFormPage.java
  54. 4 0
      srm-module-code/src/main/java/org/jeecg/modules/purCode/vo/PurOrderAlert.java
  55. 4 0
      srm-module-code/src/main/java/org/jeecg/modules/purCode/vo/PurOrderHisPage.java
  56. 4 0
      srm-module-code/src/main/java/org/jeecg/modules/purCode/vo/PurOrderPage.java
  57. 2 0
      srm-module-code/src/main/java/org/jeecg/modules/purCode/vo/PurPaymentRequestPage.java
  58. 2 0
      srm-module-code/src/main/java/org/jeecg/modules/purCode/vo/PurQuotationSelectionAlert.java
  59. 2 0
      srm-module-code/src/main/java/org/jeecg/modules/purCode/vo/PurQuotationSelectionPage.java
  60. 2 0
      srm-module-code/src/main/java/org/jeecg/modules/purCode/vo/PurShippingFeePage.java
  61. 2 0
      srm-module-code/src/main/java/org/jeecg/modules/purCode/vo/SupplierQuotationDetails.java
  62. 2 0
      srm-module-code/src/main/java/org/jeecg/modules/saleCode/entity/SaleAdvancePayment.java
  63. 2 0
      srm-module-code/src/main/java/org/jeecg/modules/saleCode/entity/SaleContract.java
  64. 2 0
      srm-module-code/src/main/java/org/jeecg/modules/saleCode/entity/SaleContractHis.java
  65. 2 0
      srm-module-code/src/main/java/org/jeecg/modules/saleCode/entity/SaleContractProduct.java
  66. 2 0
      srm-module-code/src/main/java/org/jeecg/modules/saleCode/entity/SaleContractProductHis.java
  67. 2 0
      srm-module-code/src/main/java/org/jeecg/modules/saleCode/entity/SaleContractShip.java
  68. 2 0
      srm-module-code/src/main/java/org/jeecg/modules/saleCode/entity/SaleContractShipHis.java
  69. 2 0
      srm-module-code/src/main/java/org/jeecg/modules/saleCode/entity/SaleDelivery.java
  70. 2 0
      srm-module-code/src/main/java/org/jeecg/modules/saleCode/entity/SaleDeliveryDetails.java
  71. 2 0
      srm-module-code/src/main/java/org/jeecg/modules/saleCode/entity/SaleDeliveryFiles.java
  72. 2 0
      srm-module-code/src/main/java/org/jeecg/modules/saleCode/entity/SaleDeliveryShip.java
  73. 2 0
      srm-module-code/src/main/java/org/jeecg/modules/saleCode/entity/SaleInquiryForm.java
  74. 2 0
      srm-module-code/src/main/java/org/jeecg/modules/saleCode/entity/SaleInquiryFormProduct.java
  75. 2 0
      srm-module-code/src/main/java/org/jeecg/modules/saleCode/entity/SaleInquiryFormShip.java
  76. 2 0
      srm-module-code/src/main/java/org/jeecg/modules/saleCode/entity/SaleInvoice.java
  77. 2 0
      srm-module-code/src/main/java/org/jeecg/modules/saleCode/entity/SaleInvoiceProduct.java
  78. 2 0
      srm-module-code/src/main/java/org/jeecg/modules/saleCode/entity/SaleInvoiceShip.java
  79. 4 0
      srm-module-code/src/main/java/org/jeecg/modules/saleCode/entity/SaleOrder.java
  80. 2 0
      srm-module-code/src/main/java/org/jeecg/modules/saleCode/entity/SaleOrderFiles.java
  81. 4 0
      srm-module-code/src/main/java/org/jeecg/modules/saleCode/entity/SaleOrderHis.java
  82. 2 0
      srm-module-code/src/main/java/org/jeecg/modules/saleCode/entity/SaleOrderProduct.java
  83. 2 0
      srm-module-code/src/main/java/org/jeecg/modules/saleCode/entity/SaleOrderProductHis.java
  84. 2 0
      srm-module-code/src/main/java/org/jeecg/modules/saleCode/entity/SaleOrderShip.java
  85. 2 0
      srm-module-code/src/main/java/org/jeecg/modules/saleCode/entity/SaleOrderShipHis.java
  86. 2 0
      srm-module-code/src/main/java/org/jeecg/modules/saleCode/entity/SaleQuotation.java
  87. 2 0
      srm-module-code/src/main/java/org/jeecg/modules/saleCode/entity/SaleQuotationHis.java
  88. 2 0
      srm-module-code/src/main/java/org/jeecg/modules/saleCode/entity/SaleQuotationProduct.java
  89. 2 0
      srm-module-code/src/main/java/org/jeecg/modules/saleCode/entity/SaleQuotationProductHis.java
  90. 2 0
      srm-module-code/src/main/java/org/jeecg/modules/saleCode/entity/SaleQuotationShip.java
  91. 2 0
      srm-module-code/src/main/java/org/jeecg/modules/saleCode/entity/SaleQuotationShipHis.java
  92. 2 0
      srm-module-code/src/main/java/org/jeecg/modules/saleCode/entity/SaleReceipt.java
  93. 2 0
      srm-module-code/src/main/java/org/jeecg/modules/saleCode/entity/SaleRfp.java
  94. 2 0
      srm-module-code/src/main/java/org/jeecg/modules/saleCode/vo/SaleContractHisPage.java
  95. 2 0
      srm-module-code/src/main/java/org/jeecg/modules/saleCode/vo/SaleContractPage.java
  96. 2 0
      srm-module-code/src/main/java/org/jeecg/modules/saleCode/vo/SaleDeliveryAlert.java
  97. 2 0
      srm-module-code/src/main/java/org/jeecg/modules/saleCode/vo/SaleDeliveryPage.java
  98. 2 0
      srm-module-code/src/main/java/org/jeecg/modules/saleCode/vo/SaleInquiryFormPage.java
  99. 2 0
      srm-module-code/src/main/java/org/jeecg/modules/saleCode/vo/SaleInvoicePage.java
  100. 4 0
      srm-module-code/src/main/java/org/jeecg/modules/saleCode/vo/SaleOrderAlert.java

+ 2 - 0
srm-module-code/src/main/java/org/jeecg/modules/baseCode/entity/BaseCompanyInformation.java

@@ -41,6 +41,8 @@ public class BaseCompanyInformation implements Serializable {
 	/**创建人*/
     @ApiModelProperty(value = "创建人")
     private String createBy;
+    private String sysOrgCode;
+
 	/**创建时间*/
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")

+ 2 - 0
srm-module-code/src/main/java/org/jeecg/modules/baseCode/entity/BaseExchangeRate.java

@@ -41,6 +41,8 @@ public class BaseExchangeRate implements Serializable {
 	/**创建人*/
     @ApiModelProperty(value = "创建人")
     private String createBy;
+    private String sysOrgCode;
+
 	/**创建时间*/
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")

+ 2 - 0
srm-module-code/src/main/java/org/jeecg/modules/baseCode/entity/BaseProductArchive.java

@@ -41,6 +41,8 @@ public class BaseProductArchive implements Serializable {
 	/**创建人*/
     @ApiModelProperty(value = "创建人")
     private String createBy;
+    private String sysOrgCode;
+
 	/**创建时间*/
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")

+ 2 - 0
srm-module-code/src/main/java/org/jeecg/modules/baseCode/entity/BaseProductClass.java

@@ -41,6 +41,8 @@ public class BaseProductClass implements Serializable {
 	/**创建人*/
     @ApiModelProperty(value = "创建人")
     private String createBy;
+    private String sysOrgCode;
+
 	/**创建时间*/
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")

+ 2 - 0
srm-module-code/src/main/java/org/jeecg/modules/baseCode/entity/BaseProjectArchive.java

@@ -43,6 +43,8 @@ public class BaseProjectArchive implements Serializable {
     @ApiModelProperty(value = "创建人")
     @Excel(name = "创建人(create by)", width = 15)
     private String createBy;
+    private String sysOrgCode;
+
 
 	/**创建时间*/
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")

+ 2 - 0
srm-module-code/src/main/java/org/jeecg/modules/baseCode/entity/BaseShipArchive.java

@@ -39,6 +39,8 @@ public class BaseShipArchive implements Serializable {
 	/**创建人*/
     @ApiModelProperty(value = "创建人")
     private String createBy;
+    private String sysOrgCode;
+
 	/**创建时间*/
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")

+ 2 - 0
srm-module-code/src/main/java/org/jeecg/modules/baseCode/entity/BaseShipArchiveAccessories.java

@@ -41,6 +41,8 @@ public class BaseShipArchiveAccessories implements Serializable {
 	/**创建人*/
     @ApiModelProperty(value = "创建人")
     private String createBy;
+    private String sysOrgCode;
+
 	/**创建时间*/
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")

+ 2 - 0
srm-module-code/src/main/java/org/jeecg/modules/baseCode/entity/BaseShipArchiveRelateCustomer.java

@@ -41,6 +41,8 @@ public class BaseShipArchiveRelateCustomer implements Serializable {
 	/**创建人*/
     @ApiModelProperty(value = "创建人")
     private String createBy;
+    private String sysOrgCode;
+
 	/**创建时间*/
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")

+ 2 - 0
srm-module-code/src/main/java/org/jeecg/modules/baseCode/entity/BaseTemplates.java

@@ -41,6 +41,8 @@ public class BaseTemplates implements Serializable {
 	/**创建人*/
     @ApiModelProperty(value = "创建人")
     private String createBy;
+    private String sysOrgCode;
+
 	/**创建时间*/
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")

+ 2 - 0
srm-module-code/src/main/java/org/jeecg/modules/baseCode/entity/SerialPattern.java

@@ -57,6 +57,8 @@ public class SerialPattern implements Serializable {
 	/**创建人*/
     @ApiModelProperty(value = "创建人")
     private String createBy;
+    private String sysOrgCode;
+
 	/**创建时间*/
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")

+ 2 - 0
srm-module-code/src/main/java/org/jeecg/modules/cuspCode/entity/CuspCustomerProfile.java

@@ -36,6 +36,8 @@ public class CuspCustomerProfile implements Serializable {
 	/**创建人*/
     @ApiModelProperty(value = "创建人")
     private String createBy;
+    private String sysOrgCode;
+
 	/**创建时间*/
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")

+ 2 - 0
srm-module-code/src/main/java/org/jeecg/modules/cuspCode/entity/CuspCustomerProfileMan.java

@@ -35,6 +35,8 @@ public class CuspCustomerProfileMan implements Serializable {
 	/**创建人*/
     @ApiModelProperty(value = "创建人")
     private String createBy;
+    private String sysOrgCode;
+
 	/**创建时间*/
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")

+ 2 - 0
srm-module-code/src/main/java/org/jeecg/modules/cuspCode/entity/CuspIntermediator.java

@@ -41,6 +41,8 @@ public class CuspIntermediator implements Serializable {
 	/**创建人*/
     @ApiModelProperty(value = "创建人")
     private String createBy;
+    private String sysOrgCode;
+
 	/**创建时间*/
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")

+ 2 - 0
srm-module-code/src/main/java/org/jeecg/modules/cuspCode/entity/CuspSupplierEvaluation.java

@@ -36,6 +36,8 @@ public class CuspSupplierEvaluation implements Serializable {
 	/**创建人*/
     @ApiModelProperty(value = "创建人")
     private String createBy;
+    private String sysOrgCode;
+
 	/**创建时间*/
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")

+ 2 - 0
srm-module-code/src/main/java/org/jeecg/modules/cuspCode/entity/CuspSupplierEvaluationScore.java

@@ -35,6 +35,8 @@ public class CuspSupplierEvaluationScore implements Serializable {
 	/**创建人*/
     @ApiModelProperty(value = "创建人")
     private String createBy;
+    private String sysOrgCode;
+
 	/**创建时间*/
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")

+ 2 - 0
srm-module-code/src/main/java/org/jeecg/modules/cuspCode/entity/CuspSupplierProfile.java

@@ -41,6 +41,8 @@ public class CuspSupplierProfile implements Serializable {
      */
     @ApiModelProperty(value = "创建人")
     private String createBy;
+    private String sysOrgCode;
+
     /**
      * 创建时间
      */

+ 2 - 0
srm-module-code/src/main/java/org/jeecg/modules/cuspCode/entity/CuspSupplierProfileCatalog.java

@@ -39,6 +39,8 @@ public class CuspSupplierProfileCatalog implements Serializable {
 	/**创建人*/
     @ApiModelProperty(value = "创建人")
     private String createBy;
+    private String sysOrgCode;
+
 	/**创建时间*/
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")

+ 2 - 0
srm-module-code/src/main/java/org/jeecg/modules/cuspCode/entity/CuspSupplierProfileMan.java

@@ -35,6 +35,8 @@ public class CuspSupplierProfileMan implements Serializable {
 	/**创建人*/
     @ApiModelProperty(value = "创建人")
     private String createBy;
+    private String sysOrgCode;
+
 	/**创建时间*/
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")

+ 2 - 0
srm-module-code/src/main/java/org/jeecg/modules/cuspCode/entity/CuspSupplierProfileQualification.java

@@ -44,6 +44,8 @@ public class CuspSupplierProfileQualification implements Serializable {
      */
     @ApiModelProperty(value = "创建人")
     private String createBy;
+    private String sysOrgCode;
+
     /**
      * 创建时间
      */

+ 2 - 0
srm-module-code/src/main/java/org/jeecg/modules/cuspCode/vo/CuspCustomerProfilePage.java

@@ -28,6 +28,8 @@ public class CuspCustomerProfilePage {
 	/**创建人*/
 	@ApiModelProperty(value = "创建人")
     private String createBy;
+    private String sysOrgCode;
+
 	/**创建时间*/
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")

+ 2 - 0
srm-module-code/src/main/java/org/jeecg/modules/cuspCode/vo/CuspSupplierEvaluationPage.java

@@ -28,6 +28,8 @@ public class CuspSupplierEvaluationPage {
 	/**创建人*/
 	@ApiModelProperty(value = "创建人")
     private String createBy;
+    private String sysOrgCode;
+
 	/**创建时间*/
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")

+ 2 - 0
srm-module-code/src/main/java/org/jeecg/modules/cuspCode/vo/CuspSupplierProfilePage.java

@@ -30,6 +30,8 @@ public class CuspSupplierProfilePage {
 	/**创建人*/
 	@ApiModelProperty(value = "创建人")
     private String createBy;
+    private String sysOrgCode;
+
 	/**创建时间*/
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")

+ 2 - 0
srm-module-code/src/main/java/org/jeecg/modules/purCode/entity/PurCommissionRequest.java

@@ -36,6 +36,8 @@ public class PurCommissionRequest implements Serializable {
 	/**创建人*/
     @ApiModelProperty(value = "创建人")
     private String createBy;
+    private String sysOrgCode;
+
 	/**创建时间*/
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")

+ 2 - 0
srm-module-code/src/main/java/org/jeecg/modules/purCode/entity/PurCommissionRequestDetails.java

@@ -35,6 +35,8 @@ public class PurCommissionRequestDetails implements Serializable {
 	/**创建人*/
     @ApiModelProperty(value = "创建人")
     private String createBy;
+    private String sysOrgCode;
+
 	/**创建时间*/
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")

+ 2 - 0
srm-module-code/src/main/java/org/jeecg/modules/purCode/entity/PurDeliveryNodeShip.java

@@ -35,6 +35,8 @@ public class PurDeliveryNodeShip implements Serializable {
 	/**创建人*/
     @ApiModelProperty(value = "创建人")
     private String createBy;
+    private String sysOrgCode;
+
 	/**创建时间*/
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")

+ 2 - 0
srm-module-code/src/main/java/org/jeecg/modules/purCode/entity/PurDeliveryNote.java

@@ -36,6 +36,8 @@ public class PurDeliveryNote implements Serializable {
 	/**创建人*/
     @ApiModelProperty(value = "创建人")
     private String createBy;
+    private String sysOrgCode;
+
 	/**创建时间*/
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")

+ 2 - 0
srm-module-code/src/main/java/org/jeecg/modules/purCode/entity/PurDeliveryNoteArrival.java

@@ -35,6 +35,8 @@ public class PurDeliveryNoteArrival implements Serializable {
 	/**创建人*/
     @ApiModelProperty(value = "创建人")
     private String createBy;
+    private String sysOrgCode;
+
 	/**创建时间*/
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")

+ 2 - 0
srm-module-code/src/main/java/org/jeecg/modules/purCode/entity/PurInquiryForm.java

@@ -36,6 +36,8 @@ public class PurInquiryForm implements Serializable {
 	/**创建人*/
     @ApiModelProperty(value = "创建人")
     private String createBy;
+    private String sysOrgCode;
+
 	/**创建时间*/
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")

+ 2 - 0
srm-module-code/src/main/java/org/jeecg/modules/purCode/entity/PurInquiryFormProduct.java

@@ -40,6 +40,8 @@ public class PurInquiryFormProduct implements Serializable {
 	/**创建人*/
     @ApiModelProperty(value = "创建人")
     private String createBy;
+    private String sysOrgCode;
+
 	/**创建时间*/
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")

+ 2 - 0
srm-module-code/src/main/java/org/jeecg/modules/purCode/entity/PurInquiryFormShip.java

@@ -35,6 +35,8 @@ public class PurInquiryFormShip implements Serializable {
 	/**创建人*/
     @ApiModelProperty(value = "创建人")
     private String createBy;
+    private String sysOrgCode;
+
 	/**创建时间*/
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")

+ 4 - 0
srm-module-code/src/main/java/org/jeecg/modules/purCode/entity/PurOrder.java

@@ -44,6 +44,10 @@ public class PurOrder implements Serializable {
 	/**创建人*/
     @ApiModelProperty(value = "创建人")
     private String createBy;
+    private String sysOrgCode;
+    //组织  上海/香港
+    private String organize;
+
 	/**创建时间*/
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")

+ 2 - 0
srm-module-code/src/main/java/org/jeecg/modules/purCode/entity/PurOrderFiles.java

@@ -41,6 +41,8 @@ public class PurOrderFiles implements Serializable {
 	/**创建人*/
     @ApiModelProperty(value = "创建人")
     private String createBy;
+    private String sysOrgCode;
+
 	/**创建时间*/
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")

+ 4 - 0
srm-module-code/src/main/java/org/jeecg/modules/purCode/entity/PurOrderHis.java

@@ -48,6 +48,10 @@ public class PurOrderHis implements Serializable {
 	/**创建人*/
     @ApiModelProperty(value = "创建人")
     private String createBy;
+    private String sysOrgCode;
+    //组织  上海/香港
+    private String organize;
+
 	/**创建时间*/
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")

+ 2 - 0
srm-module-code/src/main/java/org/jeecg/modules/purCode/entity/PurOrderProduct.java

@@ -35,6 +35,8 @@ public class PurOrderProduct implements Serializable {
 	/**创建人*/
     @ApiModelProperty(value = "创建人")
     private String createBy;
+    private String sysOrgCode;
+
 	/**创建时间*/
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")

+ 2 - 0
srm-module-code/src/main/java/org/jeecg/modules/purCode/entity/PurOrderProductHis.java

@@ -35,6 +35,8 @@ public class PurOrderProductHis implements Serializable {
 	/**创建人*/
     @ApiModelProperty(value = "创建人")
     private String createBy;
+    private String sysOrgCode;
+
 	/**创建时间*/
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")

+ 2 - 0
srm-module-code/src/main/java/org/jeecg/modules/purCode/entity/PurOrderShip.java

@@ -35,6 +35,8 @@ public class PurOrderShip implements Serializable {
 	/**创建人*/
     @ApiModelProperty(value = "创建人")
     private String createBy;
+    private String sysOrgCode;
+
 	/**创建时间*/
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")

+ 2 - 0
srm-module-code/src/main/java/org/jeecg/modules/purCode/entity/PurOrderShipHis.java

@@ -35,6 +35,8 @@ public class PurOrderShipHis implements Serializable {
 	/**创建人*/
     @ApiModelProperty(value = "创建人")
     private String createBy;
+    private String sysOrgCode;
+
 	/**创建时间*/
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")

+ 2 - 0
srm-module-code/src/main/java/org/jeecg/modules/purCode/entity/PurPayment.java

@@ -41,6 +41,8 @@ public class PurPayment implements Serializable {
 	/**创建人*/
     @ApiModelProperty(value = "创建人")
     private String createBy;
+    private String sysOrgCode;
+
 	/**创建时间*/
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")

+ 5 - 0
srm-module-code/src/main/java/org/jeecg/modules/purCode/entity/PurPaymentRequest.java

@@ -36,6 +36,8 @@ public class PurPaymentRequest implements Serializable {
 	/**创建人*/
     @ApiModelProperty(value = "创建人")
     private String createBy;
+    private String sysOrgCode;
+
 	/**创建时间*/
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@@ -52,14 +54,17 @@ public class PurPaymentRequest implements Serializable {
 	/**审批(approve)(1-是,0-否)*/
 	@Excel(name = "审批(approve)(1-是,0-否)", width = 15)
     @ApiModelProperty(value = "审批(approve)(1-是,0-否)")
+    @Dict(dicCode = "yes_or_no")
     private String approve;
 	/**提交(submit)1是0否*/
 	@Excel(name = "提交(submit)1是0否", width = 15)
     @ApiModelProperty(value = "提交(submit)1是0否")
+    @Dict(dicCode = "yes_or_no")
     private String submit;
 	/**付款(payment)1是0否*/
 	@Excel(name = "付款(payment)1是0否", width = 15)
     @ApiModelProperty(value = "付款(payment)1是0否")
+    @Dict(dicCode = "yes_or_no")
     private String payment;
 	/**删除状态(0-正常,1-已删除)*/
 	@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)

+ 2 - 0
srm-module-code/src/main/java/org/jeecg/modules/purCode/entity/PurPaymentRequestDetails.java

@@ -35,6 +35,8 @@ public class PurPaymentRequestDetails implements Serializable {
 	/**创建人*/
     @ApiModelProperty(value = "创建人")
     private String createBy;
+    private String sysOrgCode;
+
 	/**创建时间*/
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")

+ 4 - 0
srm-module-code/src/main/java/org/jeecg/modules/purCode/entity/PurPurchaseQuotation.java

@@ -36,6 +36,8 @@ public class PurPurchaseQuotation implements Serializable {
 	/**创建人*/
     @ApiModelProperty(value = "创建人")
     private String createBy;
+    private String sysOrgCode;
+
 	/**创建时间*/
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@@ -52,6 +54,7 @@ public class PurPurchaseQuotation implements Serializable {
 	/**状态(1-结束,0-报价中)*/
 	@Excel(name = "状态(1-结束,0-报价中)", width = 15)
     @ApiModelProperty(value = "状态(1-结束,0-报价中)")
+    @Dict(dicCode = "yes_or_no")
     private Integer status;
 	/**删除状态(0-正常,1-已删除)*/
 	@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
@@ -61,6 +64,7 @@ public class PurPurchaseQuotation implements Serializable {
 	/**提交(1是 0否)*/
 	@Excel(name = "提交(1是 0否)", width = 15)
     @ApiModelProperty(value = "提交(1是 0否)")
+    @Dict(dicCode = "yes_or_no")
     private String submit;
 	/**单据日期(bill date)*/
 	@Excel(name = "单据日期(bill date)", width = 15, format = "yyyy-MM-dd")

+ 2 - 0
srm-module-code/src/main/java/org/jeecg/modules/purCode/entity/PurPurchaseQuotationProduct.java

@@ -35,6 +35,8 @@ public class PurPurchaseQuotationProduct implements Serializable {
 	/**创建人*/
     @ApiModelProperty(value = "创建人")
     private String createBy;
+    private String sysOrgCode;
+
 	/**创建时间*/
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")

+ 2 - 0
srm-module-code/src/main/java/org/jeecg/modules/purCode/entity/PurPurchaseQuotationShip.java

@@ -35,6 +35,8 @@ public class PurPurchaseQuotationShip implements Serializable {
 	/**创建人*/
     @ApiModelProperty(value = "创建人")
     private String createBy;
+    private String sysOrgCode;
+
 	/**创建时间*/
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")

+ 3 - 0
srm-module-code/src/main/java/org/jeecg/modules/purCode/entity/PurQuotationSelection.java

@@ -36,6 +36,8 @@ public class PurQuotationSelection implements Serializable {
 	/**创建人*/
     @ApiModelProperty(value = "创建人")
     private String createBy;
+    private String sysOrgCode;
+
 	/**创建时间*/
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@@ -57,6 +59,7 @@ public class PurQuotationSelection implements Serializable {
 	/**提交(1是 0否)*/
 	@Excel(name = "提交(1是 0否)", width = 15)
     @ApiModelProperty(value = "提交(1是 0否)")
+    @Dict(dicCode = "yes_or_no")
     private String submit;
 	/**单据日期(bill date)*/
 	@Excel(name = "单据日期(bill date)", width = 15, format = "yyyy-MM-dd")

+ 2 - 0
srm-module-code/src/main/java/org/jeecg/modules/purCode/entity/PurQuotationSelectionProduct.java

@@ -35,6 +35,8 @@ public class PurQuotationSelectionProduct implements Serializable {
 	/**创建人*/
     @ApiModelProperty(value = "创建人")
     private String createBy;
+    private String sysOrgCode;
+
 	/**创建时间*/
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")

+ 2 - 0
srm-module-code/src/main/java/org/jeecg/modules/purCode/entity/PurQuotationSelectionShip.java

@@ -35,6 +35,8 @@ public class PurQuotationSelectionShip implements Serializable {
 	/**创建人*/
     @ApiModelProperty(value = "创建人")
     private String createBy;
+    private String sysOrgCode;
+
 	/**创建时间*/
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")

+ 2 - 0
srm-module-code/src/main/java/org/jeecg/modules/purCode/entity/PurShippingFee.java

@@ -44,6 +44,8 @@ public class PurShippingFee implements Serializable {
 	/**创建人*/
     @ApiModelProperty(value = "创建人")
     private String createBy;
+    private String sysOrgCode;
+
 	/**创建时间*/
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")

+ 2 - 0
srm-module-code/src/main/java/org/jeecg/modules/purCode/entity/PurShippingFeeNotice.java

@@ -43,6 +43,8 @@ public class PurShippingFeeNotice implements Serializable {
 	/**创建人*/
     @ApiModelProperty(value = "创建人")
     private String createBy;
+    private String sysOrgCode;
+
 	/**创建时间*/
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")

+ 2 - 0
srm-module-code/src/main/java/org/jeecg/modules/purCode/entity/PurShippingFeeProdeuct.java

@@ -35,6 +35,8 @@ public class PurShippingFeeProdeuct implements Serializable {
 	/**创建人*/
     @ApiModelProperty(value = "创建人")
     private String createBy;
+    private String sysOrgCode;
+
 	/**创建时间*/
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")

+ 2 - 0
srm-module-code/src/main/java/org/jeecg/modules/purCode/vo/PurCommissionRequestPage.java

@@ -32,6 +32,8 @@ public class PurCommissionRequestPage {
 	/**创建人*/
 	@ApiModelProperty(value = "创建人")
     private String createBy;
+    private String sysOrgCode;
+
 	/**创建时间*/
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")

+ 2 - 0
srm-module-code/src/main/java/org/jeecg/modules/purCode/vo/PurDeliveryNoteAlert.java

@@ -33,6 +33,8 @@ public class PurDeliveryNoteAlert implements Serializable {
 	/**创建人*/
     @ApiModelProperty(value = "创建人")
     private String createBy;
+    private String sysOrgCode;
+
 	/**创建时间*/
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")

+ 2 - 0
srm-module-code/src/main/java/org/jeecg/modules/purCode/vo/PurDeliveryNotePage.java

@@ -35,6 +35,8 @@ public class PurDeliveryNotePage {
 	/**创建人*/
 	@ApiModelProperty(value = "创建人")
     private String createBy;
+    private String sysOrgCode;
+
 	/**创建时间*/
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")

+ 2 - 0
srm-module-code/src/main/java/org/jeecg/modules/purCode/vo/PurInquiryFormPage.java

@@ -33,6 +33,8 @@ public class PurInquiryFormPage {
 	/**创建人*/
 	@ApiModelProperty(value = "创建人")
     private String createBy;
+    private String sysOrgCode;
+
 	/**创建时间*/
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")

+ 4 - 0
srm-module-code/src/main/java/org/jeecg/modules/purCode/vo/PurOrderAlert.java

@@ -32,6 +32,10 @@ public class PurOrderAlert implements Serializable {
 	/**创建人*/
     @ApiModelProperty(value = "创建人")
     private String createBy;
+    private String sysOrgCode;
+    //组织  上海/香港
+    private String organize;
+
 	/**创建时间*/
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")

+ 4 - 0
srm-module-code/src/main/java/org/jeecg/modules/purCode/vo/PurOrderHisPage.java

@@ -47,6 +47,10 @@ public class PurOrderHisPage {
 	/**创建人*/
 	@ApiModelProperty(value = "创建人")
     private String createBy;
+    private String sysOrgCode;
+	//组织  上海/香港
+	private String organize;
+
 	/**创建时间*/
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")

+ 4 - 0
srm-module-code/src/main/java/org/jeecg/modules/purCode/vo/PurOrderPage.java

@@ -35,6 +35,10 @@ public class PurOrderPage {
 	/**创建人*/
 	@ApiModelProperty(value = "创建人")
     private String createBy;
+    private String sysOrgCode;
+	//组织  上海/香港
+	private String organize;
+
 	/**确认人*/
 	@ApiModelProperty(value = "确认人")
 	private String confirmBy;

+ 2 - 0
srm-module-code/src/main/java/org/jeecg/modules/purCode/vo/PurPaymentRequestPage.java

@@ -32,6 +32,8 @@ public class PurPaymentRequestPage {
 	/**创建人*/
 	@ApiModelProperty(value = "创建人")
     private String createBy;
+    private String sysOrgCode;
+
 	/**创建时间*/
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")

+ 2 - 0
srm-module-code/src/main/java/org/jeecg/modules/purCode/vo/PurQuotationSelectionAlert.java

@@ -35,6 +35,8 @@ public class PurQuotationSelectionAlert implements Serializable {
 	/**创建人*/
     @ApiModelProperty(value = "创建人")
     private String createBy;
+    private String sysOrgCode;
+
 	/**创建时间*/
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")

+ 2 - 0
srm-module-code/src/main/java/org/jeecg/modules/purCode/vo/PurQuotationSelectionPage.java

@@ -33,6 +33,8 @@ public class PurQuotationSelectionPage {
 	/**创建人*/
 	@ApiModelProperty(value = "创建人")
     private String createBy;
+    private String sysOrgCode;
+
 	/**创建时间*/
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")

+ 2 - 0
srm-module-code/src/main/java/org/jeecg/modules/purCode/vo/PurShippingFeePage.java

@@ -41,6 +41,8 @@ public class PurShippingFeePage {
 	/**创建人*/
 	@ApiModelProperty(value = "创建人")
     private String createBy;
+    private String sysOrgCode;
+
 	/**创建时间*/
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")

+ 2 - 0
srm-module-code/src/main/java/org/jeecg/modules/purCode/vo/SupplierQuotationDetails.java

@@ -21,6 +21,8 @@ public class SupplierQuotationDetails {
     /**创建人*/
     @ApiModelProperty(value = "创建人")
     private String createBy;
+    private String sysOrgCode;
+
     /**创建时间*/
     @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")

+ 2 - 0
srm-module-code/src/main/java/org/jeecg/modules/saleCode/entity/SaleAdvancePayment.java

@@ -41,6 +41,8 @@ public class SaleAdvancePayment implements Serializable {
 	/**创建人*/
     @ApiModelProperty(value = "创建人")
     private String createBy;
+    private String sysOrgCode;
+
 	/**创建时间*/
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")

+ 2 - 0
srm-module-code/src/main/java/org/jeecg/modules/saleCode/entity/SaleContract.java

@@ -36,6 +36,8 @@ public class SaleContract implements Serializable {
 	/**创建人*/
     @ApiModelProperty(value = "创建人")
     private String createBy;
+    private String sysOrgCode;
+
 	/**创建时间*/
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")

+ 2 - 0
srm-module-code/src/main/java/org/jeecg/modules/saleCode/entity/SaleContractHis.java

@@ -38,6 +38,8 @@ public class SaleContractHis implements Serializable {
 	/**创建人*/
     @ApiModelProperty(value = "创建人")
     private String createBy;
+    private String sysOrgCode;
+
 	/**创建时间*/
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")

+ 2 - 0
srm-module-code/src/main/java/org/jeecg/modules/saleCode/entity/SaleContractProduct.java

@@ -37,6 +37,8 @@ public class SaleContractProduct implements Serializable {
 	/**创建人*/
     @ApiModelProperty(value = "创建人")
     private String createBy;
+    private String sysOrgCode;
+
 	/**创建时间*/
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")

+ 2 - 0
srm-module-code/src/main/java/org/jeecg/modules/saleCode/entity/SaleContractProductHis.java

@@ -41,6 +41,8 @@ public class SaleContractProductHis implements Serializable {
 	/**创建人*/
     @ApiModelProperty(value = "创建人")
     private String createBy;
+    private String sysOrgCode;
+
 	/**创建时间*/
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")

+ 2 - 0
srm-module-code/src/main/java/org/jeecg/modules/saleCode/entity/SaleContractShip.java

@@ -35,6 +35,8 @@ public class SaleContractShip implements Serializable {
 	/**创建人*/
     @ApiModelProperty(value = "创建人")
     private String createBy;
+    private String sysOrgCode;
+
 	/**创建时间*/
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")

+ 2 - 0
srm-module-code/src/main/java/org/jeecg/modules/saleCode/entity/SaleContractShipHis.java

@@ -39,6 +39,8 @@ public class SaleContractShipHis implements Serializable {
 	/**创建人*/
     @ApiModelProperty(value = "创建人")
     private String createBy;
+    private String sysOrgCode;
+
 	/**创建时间*/
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")

+ 2 - 0
srm-module-code/src/main/java/org/jeecg/modules/saleCode/entity/SaleDelivery.java

@@ -36,6 +36,8 @@ public class SaleDelivery implements Serializable {
 	/**创建人*/
     @ApiModelProperty(value = "创建人")
     private String createBy;
+    private String sysOrgCode;
+
 	/**创建时间*/
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")

+ 2 - 0
srm-module-code/src/main/java/org/jeecg/modules/saleCode/entity/SaleDeliveryDetails.java

@@ -35,6 +35,8 @@ public class SaleDeliveryDetails implements Serializable {
 	/**创建人*/
     @ApiModelProperty(value = "创建人")
     private String createBy;
+    private String sysOrgCode;
+
 	/**创建时间*/
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")

+ 2 - 0
srm-module-code/src/main/java/org/jeecg/modules/saleCode/entity/SaleDeliveryFiles.java

@@ -41,6 +41,8 @@ public class SaleDeliveryFiles implements Serializable {
 	/**创建人*/
     @ApiModelProperty(value = "创建人")
     private String createBy;
+    private String sysOrgCode;
+
 	/**创建时间*/
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")

+ 2 - 0
srm-module-code/src/main/java/org/jeecg/modules/saleCode/entity/SaleDeliveryShip.java

@@ -35,6 +35,8 @@ public class SaleDeliveryShip implements Serializable {
 	/**创建人*/
     @ApiModelProperty(value = "创建人")
     private String createBy;
+    private String sysOrgCode;
+
 	/**创建时间*/
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")

+ 2 - 0
srm-module-code/src/main/java/org/jeecg/modules/saleCode/entity/SaleInquiryForm.java

@@ -36,6 +36,8 @@ public class SaleInquiryForm implements Serializable {
 	/**创建人*/
     @ApiModelProperty(value = "创建人")
     private String createBy;
+    private String sysOrgCode;
+
 	/**创建时间*/
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")

+ 2 - 0
srm-module-code/src/main/java/org/jeecg/modules/saleCode/entity/SaleInquiryFormProduct.java

@@ -35,6 +35,8 @@ public class SaleInquiryFormProduct implements Serializable {
 	/**创建人*/
     @ApiModelProperty(value = "创建人")
     private String createBy;
+    private String sysOrgCode;
+
 	/**创建时间*/
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")

+ 2 - 0
srm-module-code/src/main/java/org/jeecg/modules/saleCode/entity/SaleInquiryFormShip.java

@@ -35,6 +35,8 @@ public class SaleInquiryFormShip implements Serializable {
 	/**创建人*/
     @ApiModelProperty(value = "创建人")
     private String createBy;
+    private String sysOrgCode;
+
 	/**创建时间*/
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")

+ 2 - 0
srm-module-code/src/main/java/org/jeecg/modules/saleCode/entity/SaleInvoice.java

@@ -37,6 +37,8 @@ public class SaleInvoice implements Serializable {
 	/**创建人*/
     @ApiModelProperty(value = "创建人")
     private String createBy;
+    private String sysOrgCode;
+
 	/**创建时间*/
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")

+ 2 - 0
srm-module-code/src/main/java/org/jeecg/modules/saleCode/entity/SaleInvoiceProduct.java

@@ -35,6 +35,8 @@ public class SaleInvoiceProduct implements Serializable {
 	/**创建人*/
     @ApiModelProperty(value = "创建人")
     private String createBy;
+    private String sysOrgCode;
+
 	/**创建时间*/
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")

+ 2 - 0
srm-module-code/src/main/java/org/jeecg/modules/saleCode/entity/SaleInvoiceShip.java

@@ -35,6 +35,8 @@ public class SaleInvoiceShip implements Serializable {
 	/**创建人*/
     @ApiModelProperty(value = "创建人")
     private String createBy;
+    private String sysOrgCode;
+
 	/**创建时间*/
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")

+ 4 - 0
srm-module-code/src/main/java/org/jeecg/modules/saleCode/entity/SaleOrder.java

@@ -44,6 +44,10 @@ public class SaleOrder implements Serializable {
 	/**创建人*/
     @ApiModelProperty(value = "创建人")
     private String createBy;
+    private String sysOrgCode;
+    //组织  上海/香港
+    private String organize;
+
 	/**创建时间*/
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")

+ 2 - 0
srm-module-code/src/main/java/org/jeecg/modules/saleCode/entity/SaleOrderFiles.java

@@ -41,6 +41,8 @@ public class SaleOrderFiles implements Serializable {
 	/**创建人*/
     @ApiModelProperty(value = "创建人")
     private String createBy;
+    private String sysOrgCode;
+
 	/**创建时间*/
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")

+ 4 - 0
srm-module-code/src/main/java/org/jeecg/modules/saleCode/entity/SaleOrderHis.java

@@ -48,6 +48,10 @@ public class SaleOrderHis implements Serializable {
 	/**创建人*/
     @ApiModelProperty(value = "创建人")
     private String createBy;
+    private String sysOrgCode;
+    //组织  上海/香港
+    private String organize;
+
 	/**创建时间*/
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")

+ 2 - 0
srm-module-code/src/main/java/org/jeecg/modules/saleCode/entity/SaleOrderProduct.java

@@ -37,6 +37,8 @@ public class SaleOrderProduct implements Serializable {
 	/**创建人*/
     @ApiModelProperty(value = "创建人")
     private String createBy;
+    private String sysOrgCode;
+
 	/**创建时间*/
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")

+ 2 - 0
srm-module-code/src/main/java/org/jeecg/modules/saleCode/entity/SaleOrderProductHis.java

@@ -37,6 +37,8 @@ public class SaleOrderProductHis implements Serializable {
 	/**创建人*/
     @ApiModelProperty(value = "创建人")
     private String createBy;
+    private String sysOrgCode;
+
 	/**创建时间*/
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")

+ 2 - 0
srm-module-code/src/main/java/org/jeecg/modules/saleCode/entity/SaleOrderShip.java

@@ -35,6 +35,8 @@ public class SaleOrderShip implements Serializable {
 	/**创建人*/
     @ApiModelProperty(value = "创建人")
     private String createBy;
+    private String sysOrgCode;
+
 	/**创建时间*/
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")

+ 2 - 0
srm-module-code/src/main/java/org/jeecg/modules/saleCode/entity/SaleOrderShipHis.java

@@ -35,6 +35,8 @@ public class SaleOrderShipHis implements Serializable {
 	/**创建人*/
     @ApiModelProperty(value = "创建人")
     private String createBy;
+    private String sysOrgCode;
+
 	/**创建时间*/
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")

+ 2 - 0
srm-module-code/src/main/java/org/jeecg/modules/saleCode/entity/SaleQuotation.java

@@ -45,6 +45,8 @@ public class SaleQuotation implements Serializable {
 	/**创建人*/
     @ApiModelProperty(value = "创建人")
     private String createBy;
+    private String sysOrgCode;
+
 	/**创建时间*/
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")

+ 2 - 0
srm-module-code/src/main/java/org/jeecg/modules/saleCode/entity/SaleQuotationHis.java

@@ -49,6 +49,8 @@ public class SaleQuotationHis implements Serializable {
 	/**创建人*/
     @ApiModelProperty(value = "创建人")
     private String createBy;
+    private String sysOrgCode;
+
 	/**创建时间*/
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")

+ 2 - 0
srm-module-code/src/main/java/org/jeecg/modules/saleCode/entity/SaleQuotationProduct.java

@@ -37,6 +37,8 @@ public class SaleQuotationProduct implements Serializable {
 	/**创建人*/
     @ApiModelProperty(value = "创建人")
     private String createBy;
+    private String sysOrgCode;
+
 	/**创建时间*/
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")

+ 2 - 0
srm-module-code/src/main/java/org/jeecg/modules/saleCode/entity/SaleQuotationProductHis.java

@@ -41,6 +41,8 @@ public class SaleQuotationProductHis implements Serializable {
 	/**创建人*/
     @ApiModelProperty(value = "创建人")
     private String createBy;
+    private String sysOrgCode;
+
 	/**创建时间*/
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")

+ 2 - 0
srm-module-code/src/main/java/org/jeecg/modules/saleCode/entity/SaleQuotationShip.java

@@ -35,6 +35,8 @@ public class SaleQuotationShip implements Serializable {
 	/**创建人*/
     @ApiModelProperty(value = "创建人")
     private String createBy;
+    private String sysOrgCode;
+
 	/**创建时间*/
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")

+ 2 - 0
srm-module-code/src/main/java/org/jeecg/modules/saleCode/entity/SaleQuotationShipHis.java

@@ -39,6 +39,8 @@ public class SaleQuotationShipHis implements Serializable {
 	/**创建人*/
     @ApiModelProperty(value = "创建人")
     private String createBy;
+    private String sysOrgCode;
+
 	/**创建时间*/
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")

+ 2 - 0
srm-module-code/src/main/java/org/jeecg/modules/saleCode/entity/SaleReceipt.java

@@ -41,6 +41,8 @@ public class SaleReceipt implements Serializable {
 	/**创建人*/
     @ApiModelProperty(value = "创建人")
     private String createBy;
+    private String sysOrgCode;
+
 	/**创建时间*/
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")

+ 2 - 0
srm-module-code/src/main/java/org/jeecg/modules/saleCode/entity/SaleRfp.java

@@ -41,6 +41,8 @@ public class SaleRfp implements Serializable {
 	/**创建人*/
     @ApiModelProperty(value = "创建人")
     private String createBy;
+    private String sysOrgCode;
+
 	/**创建时间*/
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")

+ 2 - 0
srm-module-code/src/main/java/org/jeecg/modules/saleCode/vo/SaleContractHisPage.java

@@ -37,6 +37,8 @@ public class SaleContractHisPage {
 	/**创建人*/
 	@ApiModelProperty(value = "创建人")
     private String createBy;
+    private String sysOrgCode;
+
 	/**创建时间*/
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")

+ 2 - 0
srm-module-code/src/main/java/org/jeecg/modules/saleCode/vo/SaleContractPage.java

@@ -33,6 +33,8 @@ public class SaleContractPage {
 	/**创建人*/
 	@ApiModelProperty(value = "创建人")
     private String createBy;
+    private String sysOrgCode;
+
 	/**创建时间*/
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")

+ 2 - 0
srm-module-code/src/main/java/org/jeecg/modules/saleCode/vo/SaleDeliveryAlert.java

@@ -31,6 +31,8 @@ public class SaleDeliveryAlert implements Serializable {
 	/**创建人*/
     @ApiModelProperty(value = "创建人")
     private String createBy;
+    private String sysOrgCode;
+
 	/**创建时间*/
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")

+ 2 - 0
srm-module-code/src/main/java/org/jeecg/modules/saleCode/vo/SaleDeliveryPage.java

@@ -33,6 +33,8 @@ public class SaleDeliveryPage {
 	/**创建人*/
 	@ApiModelProperty(value = "创建人")
     private String createBy;
+    private String sysOrgCode;
+
 	/**创建时间*/
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")

+ 2 - 0
srm-module-code/src/main/java/org/jeecg/modules/saleCode/vo/SaleInquiryFormPage.java

@@ -30,6 +30,8 @@ public class SaleInquiryFormPage {
 	/**创建人*/
 	@ApiModelProperty(value = "创建人")
     private String createBy;
+    private String sysOrgCode;
+
 	/**创建时间*/
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")

+ 2 - 0
srm-module-code/src/main/java/org/jeecg/modules/saleCode/vo/SaleInvoicePage.java

@@ -34,6 +34,8 @@ public class SaleInvoicePage {
 	/**创建人*/
 	@ApiModelProperty(value = "创建人")
     private String createBy;
+    private String sysOrgCode;
+
 	/**创建时间*/
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")

+ 4 - 0
srm-module-code/src/main/java/org/jeecg/modules/saleCode/vo/SaleOrderAlert.java

@@ -32,6 +32,10 @@ public class SaleOrderAlert implements Serializable {
 	/**创建人*/
     @ApiModelProperty(value = "创建人")
     private String createBy;
+    private String sysOrgCode;
+    //组织  上海/香港
+    private String organize;
+
 	/**创建时间*/
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")

Някои файлове не бяха показани, защото твърде много файлове са промени