Jelajahi Sumber

调用变更,后端默认不匹配部位

MaiXinRong 3 tahun lalu
induk
melakukan
b200792b93
2 mengubah file dengan 4 tambahan dan 4 penghapusan
  1. 1 1
      app/controller/stage_controller.js
  2. 3 3
      app/service/change.js

+ 1 - 1
app/controller/stage_controller.js

@@ -536,7 +536,7 @@ module.exports = app => {
                 if (!data.target || (!data.target.bills && !data.target.pos) || !data.change) {
                     throw '调用变更令数据错误';
                 }
-                let result, minus, posMinus;
+                let result;
                 if (data.target.pos) {
                     result = await ctx.service.stageChange.posChange(data.target.pos, data.target.minus, data.change);
                     result.change = { target: { lid: data.target.pos.lid, pid: data.target.pos.id } };

+ 3 - 3
app/service/change.js

@@ -1198,11 +1198,11 @@ module.exports = app => {
                     ? field + ' = ' + self.db.escape(value)
                     : self.db.format("(?? = null or ?? = '')", [field, field]);
             };
-            const filter = getFilterPart('cb.code', bills.b_code) +
+            let filter = getFilterPart('cb.code', bills.b_code) +
                 ' And ' + getFilterPart('cb.name', bills.name) +
                 ' And ' + getFilterPart('cb.unit', bills.unit) +
-                ' And cb.`unit_price` = ' + this.db.escape(bills.unit_price) +
-                (pos ? ' And ' + getFilterPart('cb.bwmx', pos.name) : '');
+                ' And cb.`unit_price` = ' + this.db.escape(bills.unit_price);
+            // if (data.pos) filter = filter + ' And ' + getFilterPart('cb.bwmx', pos.name);
             const sql =
                 'SELECT c.cid, c.code, c.name, c.w_code, c.p_code, c.peg, c.org_name, c.org_code, c.new_name, c.new_code,' +
                 '    c.content, c.basis, c.memo, c.type, c.class, c.quality, c.company, c.charge, ' +