Merge branch 'aship/aship#1'

deploy/IOne-SRM-Prod/application.yml

@@ -53,6 +53,7 @@ srm:
         defaultPoChgReturnType: 0
         supplierErpCheck: true
         supplierErpSend: true
+        genBarcode: SRM_genbarcode
     email:
         enable: true
         recipients: gujian@benchmarkchina.com,raven@benchmarkchina.com

deploy/IOne-SRM-Staging/application.yml

@@ -53,6 +53,7 @@ srm:
         defaultPoChgReturnType: 0
         supplierErpCheck: true
         supplierErpSend: true
+        genBarcode: SRM_genbarcode
     email:
         enable: true
         recipients: gujian@benchmarkchina.com,raven@benchmarkchina.com

src/main/java/com/i1/erp/base/soap/SupplierSyncClient.java

@@ -416,6 +416,10 @@ public class SupplierSyncClient extends WebServiceClient {
                                 case "pmcacti":
                                     pmcacti = field.getValue();
                                     break;
+                                case "ta_pmcsrm01":
+                                    //是否启用防伪码
+                                    supplier.setUseBarcode(field.getValue());
+                                    break;
                             }
                         }
                         supplier.setSrmStarted("Y");

upgrade/sql/mysql/V2017.181__ALTER_TABLE_DO_DTL_FILE.sql

+ALTER TABLE srm_po_dtl_file ADD APPLIED_AMOUNT DECIMAL(18,5) DEFAULT 0 COMMENT '已申请数量';
\ No newline at end of file