diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java index 4d8aab4d4..be1548df6 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java @@ -741,7 +741,7 @@ public class CheckOutBillServiceImpl implements CheckOutBillService { } JSONObject jsonMap = new JSONObject(); // 已分配重量 - double assign_qty = 0; + double assign_qty = dtl.getDoubleValue("assign_qty"); if (ObjectUtil.isNotEmpty(dtl.getString("source_bill_code")) || is_top3) { while (unassign_qty > 0) { @@ -919,7 +919,7 @@ public class CheckOutBillServiceImpl implements CheckOutBillService { //出库主表 WQLObject wo_mst = WQLObject.getWQLObject("ST_IVT_IOStorInv"); //库区表 - WQLObject wo_sect = WQLObject.getWQLObject("ST_IVT_IOStorInv"); + WQLObject wo_sect = WQLObject.getWQLObject("st_ivt_sectattr"); //定义需要更新的仓位集合 HashMap Struct_map = new HashMap(); @@ -959,7 +959,7 @@ public class CheckOutBillServiceImpl implements CheckOutBillService { } JSONObject jsonMap = new JSONObject(); // 已分配数量 - double assign_qty = 0; + double assign_qty = dtl.getDoubleValue("assign_qty"); if (ObjectUtil.isNotEmpty(dtl.getString("source_bill_code")) || is_top3) { while (unassign_qty > 0) { // 1.有销售订单号 @@ -1173,7 +1173,6 @@ public class CheckOutBillServiceImpl implements CheckOutBillService { } } - @Override @Transactional(rollbackFor = Exception.class) public void allCancel(JSONObject whereJson) { @@ -1307,7 +1306,7 @@ public class CheckOutBillServiceImpl implements CheckOutBillService { //查询主表信息 JSONObject jo_mst = wo_mst.query("iostorinv_id = '" + iostorinv_id + "'").uniqueResult(0); // 查询此分配明细下的所有相同箱号的分配明细 - JSONArray diss = wo_dis.query("box_no = '" + whereJson.getString("storagevehicle_code") + "'").getResultJSONArray(0); + JSONArray diss = wo_dis.query("box_no = '" + whereJson.getString("storagevehicle_code") + "' and iostorinv_id = '"+iostorinv_id+"'").getResultJSONArray(0); for (int i = 0; i < diss.size(); i++) { JSONObject dis = diss.getJSONObject(i); diff --git a/lms/nladmin-ui/src/views/wms/st/outbill/DivDialog.vue b/lms/nladmin-ui/src/views/wms/st/outbill/DivDialog.vue index 3d3047c45..12fd1de34 100644 --- a/lms/nladmin-ui/src/views/wms/st/outbill/DivDialog.vue +++ b/lms/nladmin-ui/src/views/wms/st/outbill/DivDialog.vue @@ -100,6 +100,7 @@ style="width: 100%;" max-height="300" border + :cell-style="cellStyle" :highlight-current-row="true" :header-cell-style="{background:'#f5f7fa',color:'#606266'}" @current-change="handleDtlCurrentChange" @@ -180,7 +181,7 @@ ref="table2" :data="tabledis" style="width: 100%;" - max-height="300" + max-height="400" border :highlight-current-row="true" :header-cell-style="{background:'#f5f7fa',color:'#606266'}" @@ -202,9 +203,10 @@ - - - + + + + @@ -504,6 +506,16 @@ export default { }).catch(() => { this.tabledis = [] }) + }, + cellStyle({ row, column, rowIndex, columnIndex }) { + const assign_qty = parseInt(row.assign_qty) + const plan_qty = parseInt(row.plan_qty) + + if (column.property === 'assign_qty') { + if (assign_qty > plan_qty) { + return 'background: yellow' + } + } } } }