YL2767 4 weeks ago
parent
commit
d064d21fc7

+ 6
- 1
src/main/java/com/th/demo/service/impl/ware/ChangeServiceImpl.java View File

70
         if (cargo == null){
70
         if (cargo == null){
71
             sum_weight=0;
71
             sum_weight=0;
72
         }else{
72
         }else{
73
+            if(cargo.getSumWeight() == 0){
74
+                num =10;
75
+                return JSONTools.toString(1,"货权信息已维护,但可是用量为0");
76
+            }
73
             sum_weight = cargo.getSumWeight();
77
             sum_weight = cargo.getSumWeight();
74
         }
78
         }
75
 
79
 
76
         for (int i = 0; i < list.size(); i++) {
80
         for (int i = 0; i < list.size(); i++) {
77
             //保留可转移重量不为0的情况下,货权转移重量的计算
81
             //保留可转移重量不为0的情况下,货权转移重量的计算
82
+            // 25.5.27增加规则维护货权转移信息的,只要重量为0了
78
             if(sum_weight != 0 && (sum_weight-use_weight-list.get(i).getWeight()) < 0){
83
             if(sum_weight != 0 && (sum_weight-use_weight-list.get(i).getWeight()) < 0){
79
                 num =10;
84
                 num =10;
80
-                return JSONTools.toString(1,"权转移重量不足");
85
+                return JSONTools.toString(1,"权转移重量不足");
81
             }
86
             }
82
             if(list.get(i).getCustomer().getName().equals(c.getName())){
87
             if(list.get(i).getCustomer().getName().equals(c.getName())){
83
                 recordType = "0";
88
                 recordType = "0";

+ 7
- 7
src/main/resource/localhost/db.properties View File

4
 #jdbc.password=root
4
 #jdbc.password=root
5
 
5
 
6
 #???????????????????????????????
6
 #???????????????????????????????
7
-jdbc.driverClass=com.mysql.jdbc.Driver
8
-jdbc.jdbcUrl=jdbc:mysql://localhost:3306/ware_mj?characterEncoding=utf8
9
-jdbc.user=root
10
-jdbc.password=root
11
-
12
 #jdbc.driverClass=com.mysql.jdbc.Driver
7
 #jdbc.driverClass=com.mysql.jdbc.Driver
13
-#jdbc.jdbcUrl=jdbc:mysql://60.205.9.174:3309/ware_mj?useUnicode=true&characterEncoding=utf8
8
+#jdbc.jdbcUrl=jdbc:mysql://localhost:3306/ware_mj?characterEncoding=utf8
14
 #jdbc.user=root
9
 #jdbc.user=root
15
-#jdbc.password=122403
10
+#jdbc.password=root
11
+
12
+jdbc.driverClass=com.mysql.jdbc.Driver
13
+jdbc.jdbcUrl=jdbc:mysql://60.205.9.174:3309/ware_mj?useUnicode=true&characterEncoding=utf8
14
+jdbc.user=root
15
+jdbc.password=122403

Loading…
Cancel
Save