Merge branch 'dev' of http://192.168.1.41:3000/maixinrong/Calculation into dev

app/public/js/stage.js

@@ -391,11 +391,9 @@ $(document).ready(() => {
                 getColor: function (sheet, data, row, col, defaultColor) {
                     if (col.field === 'uamount') {
                         if (data.bamount > 0) {
-                            const usedAmount = ZhCalc.add(data.uamount, data.pre_amount);
-                            return usedAmount < 0 || usedAmount > data.bamount ? '#ff6f5c' : defaultColor;
+                            return data.uamount < 0 || data.uamount > data.vamount ? '#ff6f5c' : defaultColor;
                         } else if (data.bamount < 0) {
-                            const usedAmount = ZhCalc.add(data.uamount, data.pre_amount);
-                            return usedAmount > 0 || usedAmount < data.bamount ? '#ff6f5c' : defaultColor;
+                            return data.uamount > 0 || data.uamount < data.vamount ? '#ff6f5c' : defaultColor;
                         } else {
                             return data.uamount ? '#ff6f5c' : defaultColor;
                         }

app/service/stage_change_final.js

@@ -103,13 +103,13 @@ module.exports = app => {
         }
 
         async getPreMinusChange(tid, sorder) {
-            const sql = 'SELECT lid, pid, SUM(qty) FROM ' + this.tableName + ' WHERE tid = ? and sorder < ? GROUP BY lid, pid';
+            const sql = 'SELECT lid, pid, SUM(qty) as qty FROM ' + this.tableName + ' WHERE tid = ? and sorder < ? and minus GROUP BY lid, pid';
             const data = await this.db.query(sql, [tid, sorder]);
             return data;
         }
 
         async getMinusChange(tid) {
-            const sql = 'SELECT lid, pid, SUM(qty) FROM ' + this.tableName + ' WHERE tid = ? GROUP BY lid, pid';
+            const sql = 'SELECT lid, pid, SUM(qty) as qty FROM ' + this.tableName + ' WHERE tid = ? GROUP BY lid, pid';
             const data = await this.db.query(sql, [tid]);
             return data;
         }