root/longdianningxing
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

代码更新

Browse Source
This commit is contained in:
liuxy
2022-12-07 14:51:51 +08:00
parent cba07beb7c
commit 60cb32dc7e
2 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java
View File

@@ -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<String, JSONObject> Struct_map = new HashMap<String, JSONObject>();
@@ -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);