update sit server url

issue.sh

@@ -46,5 +46,5 @@ docker run -d \
   -p ${PORT}:1098 \
   -w /${PROJECT_NAME}  \
   gradle:alpine  \
-  bash -c "gradle flywayRepair -Pflyway.url=jdbc:mysql://project.benchmarkchina.com:3306/srm_aship -Pflyway.user=root -Pflyway.password=benchmark123 -Pflyway.locations=filesystem:upgrade/sql/mysql; gradle flywayMigrate -Pflyway.url=jdbc:mysql://project.benchmarkchina.com:3306/srm_aship -Pflyway.user=root -Pflyway.password=benchmark123 -Pflyway.locations=filesystem:upgrade/sql/mysql -Pflyway.outOfOrder=true -Pflyway.validateOnMigrate=false -Pflyway.ignoreMissingMigrations=true -Pflyway.ignoreFutureMigrations=true; gradle bootRun -Dspring.profiles.active=sit"
+  bash -c "gradle flywayRepair -Pflyway.url=jdbc:mysql://srm.benchmarkchina.com:3306/srm_aship -Pflyway.user=root -Pflyway.password=benchmark123 -Pflyway.locations=filesystem:upgrade/sql/mysql; gradle flywayMigrate -Pflyway.url=jdbc:mysql://srm.benchmarkchina.com:3306/srm_aship -Pflyway.user=root -Pflyway.password=benchmark123 -Pflyway.locations=filesystem:upgrade/sql/mysql -Pflyway.outOfOrder=true -Pflyway.validateOnMigrate=false -Pflyway.ignoreMissingMigrations=true -Pflyway.ignoreFutureMigrations=true; gradle bootRun -Dspring.profiles.active=sit"
 

readme.md

 # 各环境
 
 * SIT:
-URL: http://project.benchmarkchina.com:58000/  
-mysql DB: project.benchmarkchina.com:3306/srm_aship  
+URL: http://srm.benchmarkchina.com:58000/  
+mysql DB: srm.benchmarkchina.com:3306/srm_aship  
 环境启动：sh/alidata1/dev/aship/srm/run-docker.sh    
 
 * Staging:  

run-docker.sh

@@ -34,5 +34,5 @@ docker run -d \
   -p ${PORT}:1098 \
   -w /${PROJECT_NAME}  \
   gradle:alpine  \
-  bash -c "gradle flywayRepair -Pflyway.url=jdbc:mysql://project.benchmarkchina.com:3306/srm_aship -Pflyway.user=root -Pflyway.password=benchmark123 -Pflyway.locations=filesystem:upgrade/sql/mysql; gradle flywayMigrate -Pflyway.url=jdbc:mysql://project.benchmarkchina.com:3306/srm_aship -Pflyway.user=root -Pflyway.password=benchmark123 -Pflyway.locations=filesystem:upgrade/sql/mysql -Pflyway.outOfOrder=true -Pflyway.validateOnMigrate=false -Pflyway.ignoreMissingMigrations=true -Pflyway.ignoreFutureMigrations=true; gradle build;gradle bootRun -Dspring.profiles.active=sit"
+  bash -c "gradle flywayRepair -Pflyway.url=jdbc:mysql://srm.benchmarkchina.com:3306/srm_aship -Pflyway.user=root -Pflyway.password=benchmark123 -Pflyway.locations=filesystem:upgrade/sql/mysql; gradle flywayMigrate -Pflyway.url=jdbc:mysql://srm.benchmarkchina.com:3306/srm_aship -Pflyway.user=root -Pflyway.password=benchmark123 -Pflyway.locations=filesystem:upgrade/sql/mysql -Pflyway.outOfOrder=true -Pflyway.validateOnMigrate=false -Pflyway.ignoreMissingMigrations=true -Pflyway.ignoreFutureMigrations=true; gradle build;gradle bootRun -Dspring.profiles.active=sit"
   

src/main/resources/application.yml

@@ -130,7 +130,7 @@ spring:
     profiles: sit
     datasource:
         driverClassName: com.mysql.jdbc.Driver
-        url: jdbc:mysql://project.benchmarkchina.com:3306/srm_aship?characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull
+        url: jdbc:mysql://srm.benchmarkchina.com:3306/srm_aship?characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull
         username: root
         password: benchmark123
 
@@ -160,7 +160,7 @@ spring:
 
     datasource:
         driver-class-name: com.mysql.jdbc.Driver
-        url: jdbc:mysql://project.benchmarkchina.com:3306/srm_aship?autoReconnect=true&useUnicode=true&characterEncoding=utf-8&useSSL=false
+        url: jdbc:mysql://srm.benchmarkchina.com:3306/srm_aship?autoReconnect=true&useUnicode=true&characterEncoding=utf-8&useSSL=false
         username: root
         password: benchmark123
     http:

src/main/resources/hibernate.cfg.xml

@@ -4,7 +4,7 @@
         "http://www.hibernate.org/dtd/hibernate-configuration-3.0.dtd">
 <hibernate-configuration>
     <session-factory>
-        <property name="connection.url">jdbc:mysql://project.benchmarkchina.com:3306/srm_aship</property>
+        <property name="connection.url">jdbc:mysql://srm.benchmarkchina.com:3306/srm_aship</property>
         <property name="connection.driver_class">com.mysql.jdbc.Driver</property>
         <mapping class="com.i1.srm.base.dao.entity.BaseDictFile"/>
 

src/main/resources/static/app/srm/deliveryOrder/update/update.js

@@ -841,8 +841,8 @@ angular.module('IOne').controller('SteelCoilDlgCtrl', function ($scope, $uibModa
             {name: '批次号', field: 'doDtlProduct.batchId', enableCellEdit: false, width: 100},
             {name: '汇总数量', field: 'doDtlProduct.totalAmount', enableCellEdit: false, width: 100},
             {name: '箱号', field: 'boxCode', enableCellEdit: false, width: 100},
-            {name: '炉号', field: 'furnaceNo', enableCellEdit: true, width: 100, cellClass: 'editable-field'},
-            {name: '钢卷号', field: 'steelCoil', enableCellEdit: true, width: 100, cellClass: 'editable-field'},
+            {name: '规格', field: 'furnaceNo', enableCellEdit: true, width: 100, cellClass: 'editable-field'},
+            {name: '数量', field: 'steelCoil', enableCellEdit: true, width: 100, cellClass: 'editable-field'},
             {name: '每卷重量', field: 'amountInCurrentBox', enableCellEdit: true, width: 100, cellClass: 'editable-field'},
             {name: '原产地', field: 'doDtlProduct.sourceArea', enableCellEdit: false, width: 100},
             {name: '制造日期', field: 'doDtlProduct.manufacturingDate', enableCellEdit: false, width: 100, cellFilter: 'date:"yyyy-MM-dd"'},

src/main/resources/static/app/srm/deliveryOrder/view/view.js

@@ -239,8 +239,8 @@
                                 {name: '汇总项次', field: 'doDtlProductRow', width: 100, enableCellEdit: false},
                                 {name: '箱号', field: 'boxIndex', width: 100, enableCellEdit: false},
                                 {name: '箱条码', field: 'boxCode', width: 280, enableCellEdit: false},
-                                {name: '炉号', field: 'steelCoil', enableCellEdit: false, width: 100},
-                                {name: '钢卷号', field: 'furnaceNo', enableCellEdit: false, width: 100},
+                                {name: '规格', field: 'furnaceNo', enableCellEdit: false, width: 100},
+                                {name: '数量', field: 'steelCoil', enableCellEdit: false, width: 100},
                                 {name: '本箱内数量/重量', field: 'amountInCurrentBox', enableCellEdit: false, width: 150},
                                 // { name:'制造日期', field: 'manufacturingDate', cellFilter: 'date:"yyyy-MM-dd"', type: 'date', enableCellEdit: false, width:150},