fix:二期出库完成报错bug修复
This commit is contained in:
@@ -649,6 +649,7 @@ public class StIvtIostorinvOutServiceImpl extends ServiceImpl<StIvtIostorinvOutM
|
||||
|
||||
// 判断是否有未完成的任务
|
||||
String task_in = disDaoList.stream()
|
||||
.filter(row -> ObjectUtil.isNotEmpty(row.getTask_id()))
|
||||
.map(row -> row.getTask_id().toString())
|
||||
.distinct()
|
||||
.collect(Collectors.joining("','"));
|
||||
|
||||
@@ -378,6 +378,10 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService {
|
||||
param.put("Attribute2", jo_mst.getString("confirm_time"));
|
||||
param.put("Attribute3", DateUtil.now());
|
||||
|
||||
// 删除子卷
|
||||
WQLObject.getWQLObject("pdm_bi_subpackagerelation")
|
||||
.delete("package_box_sn = '"+json.getString("box_no")+"'");
|
||||
|
||||
JSONArray container_jo = wo_dis.query("iostorinv_id = '" + jo_mst.getString("iostorinv_id") + "' AND box_no = '" + json.getString("box_no") + "'").getResultJSONArray(0);
|
||||
for (int k = 0; k < container_jo.size(); k++) {
|
||||
JSONObject dis_jo = container_jo.getJSONObject(k);
|
||||
@@ -1493,6 +1497,10 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService {
|
||||
param.put("Attribute2", jo_mst.getString("confirm_time"));
|
||||
param.put("Attribute3", DateUtil.now());
|
||||
|
||||
// 删除子卷
|
||||
WQLObject.getWQLObject("pdm_bi_subpackagerelation")
|
||||
.delete("package_box_sn = '"+json.getString("box_no")+"'");
|
||||
|
||||
JSONArray container_jo = wo_dis.query("iostorinv_id = '" + jo_mst.getString("iostorinv_id") + "' AND box_no = '" + json.getString("box_no") + "'").getResultJSONArray(0);
|
||||
for (int k = 0; k < container_jo.size(); k++) {
|
||||
JSONObject dis_jo = container_jo.getJSONObject(k);
|
||||
|
||||
@@ -48,14 +48,6 @@ export function blurQuery(data) {
|
||||
})
|
||||
}
|
||||
|
||||
export function oneCreate(data) {
|
||||
return request({
|
||||
url: 'api/structattr/oneCreate',
|
||||
method: 'post',
|
||||
data
|
||||
})
|
||||
}
|
||||
|
||||
export function tunConfirm(data) {
|
||||
return request({
|
||||
url: 'api/structattr/tunConfirm',
|
||||
@@ -64,12 +56,4 @@ export function tunConfirm(data) {
|
||||
})
|
||||
}
|
||||
|
||||
export function blurQuery(data) {
|
||||
return request({
|
||||
url: 'api/structattr/blurQuery',
|
||||
method: 'post',
|
||||
data
|
||||
})
|
||||
}
|
||||
|
||||
export default { add, edit, del, changeActive, oneCreate, blurQuery, tunConfirm }
|
||||
|
||||
Reference in New Issue
Block a user