opt优化入库查询
This commit is contained in:
@@ -6,6 +6,7 @@ import cn.hutool.core.util.IdUtil;
|
||||
import cn.hutool.core.util.NumberUtil;
|
||||
import cn.hutool.core.util.ObjectUtil;
|
||||
import cn.hutool.core.util.StrUtil;
|
||||
import cn.hutool.http.HttpUtil;
|
||||
import com.alibaba.fastjson.JSON;
|
||||
import com.alibaba.fastjson.JSONArray;
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
@@ -106,6 +107,7 @@ public class RawAssistIStorServiceImpl implements RawAssistIStorService {
|
||||
} else {
|
||||
map.put("pcsn", "%" + pcsn + "%");
|
||||
}
|
||||
map.put("flag", "29");
|
||||
}
|
||||
|
||||
// 空格查询
|
||||
@@ -121,6 +123,7 @@ public class RawAssistIStorServiceImpl implements RawAssistIStorService {
|
||||
} else {
|
||||
map.put("sap_pcsn", "%" + sap_pcsn + "%");
|
||||
}
|
||||
map.put("flag", "29");
|
||||
}
|
||||
|
||||
// 空格查询
|
||||
@@ -137,6 +140,7 @@ public class RawAssistIStorServiceImpl implements RawAssistIStorService {
|
||||
map.put("box_no", "%" + box_no + "%");
|
||||
|
||||
}
|
||||
map.put("flag", "29");
|
||||
}
|
||||
|
||||
// 空格查询
|
||||
@@ -172,10 +176,6 @@ public class RawAssistIStorServiceImpl implements RawAssistIStorService {
|
||||
map.put("in_stor_id", in_stor_id);
|
||||
}
|
||||
|
||||
if (ObjectUtil.isNotEmpty(map.get("sap_pcsn_in"))) {
|
||||
map.put("flag", "29");
|
||||
}
|
||||
|
||||
JSONObject jo = WQL.getWO("QST_IVT_RAWASSISTISTOR").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "iostorinv_id desc");
|
||||
return jo;
|
||||
}
|
||||
@@ -1867,6 +1867,11 @@ public class RawAssistIStorServiceImpl implements RawAssistIStorService {
|
||||
|
||||
if (ObjectUtil.isEmpty(struct_jo)) {
|
||||
// 主存区类型更改成中转区类型:找一排主存区的更改中转区、把一排中转区的更改成主存区(只允许调用一次)
|
||||
String result = HttpUtil.get("http://127.0.0.1:8013/api/in/rawAssist/updateStructSect?layer_num=" + col_num);
|
||||
JSONObject toJSON = (JSONObject)JSONObject.toJSON(result);
|
||||
if (!toJSON.getString("status").equals("200")){
|
||||
throw new BadRequestException(toJSON.getString("message"));
|
||||
}
|
||||
SpringContextHolder.getBean(RawAssistIStorServiceImpl.class).updateStructSect(col_num);
|
||||
struct_jo = autoDisMove2(whereJson);
|
||||
}
|
||||
@@ -2794,7 +2799,7 @@ public class RawAssistIStorServiceImpl implements RawAssistIStorService {
|
||||
/**
|
||||
* 新开事务,把当前事务挂起,(新开事务不回滚)
|
||||
*/
|
||||
@Transactional(propagation=Propagation.REQUIRES_NEW)
|
||||
@Transactional()
|
||||
public void updateStructSect(String layer_num) {
|
||||
WQLObject attr = WQLObject.getWQLObject("st_ivt_structattr");
|
||||
WQLObject point = WQLObject.getWQLObject("sch_base_point");
|
||||
|
||||
@@ -273,7 +273,7 @@
|
||||
ios.input_time <= 输入.end_time
|
||||
ENDOPTION
|
||||
) ios2
|
||||
LEFT JOIN (
|
||||
inner JOIN (
|
||||
SELECT
|
||||
dis.iostorinv_id
|
||||
FROM
|
||||
@@ -372,38 +372,6 @@
|
||||
ios.input_time <= 输入.end_time
|
||||
ENDOPTION
|
||||
) ios2
|
||||
LEFT JOIN (
|
||||
SELECT
|
||||
dis.iostorinv_id
|
||||
FROM
|
||||
st_ivt_iostorinvdis dis
|
||||
WHERE
|
||||
1 = 1
|
||||
OPTION 输入.box_no <> ""
|
||||
dis.box_no like 输入.box_no
|
||||
ENDOPTION
|
||||
|
||||
OPTION 输入.box_no_in <> ""
|
||||
dis.box_no IN 输入.box_no_in
|
||||
ENDOPTION
|
||||
|
||||
OPTION 输入.pcsn <> ""
|
||||
dis.pcsn like 输入.pcsn
|
||||
ENDOPTION
|
||||
|
||||
OPTION 输入.pcsn_in <> ""
|
||||
dis.pcsn IN 输入.pcsn_in
|
||||
ENDOPTION
|
||||
|
||||
OPTION 输入.sap_pcsn <> ""
|
||||
sub.sap_pcsn like 输入.sap_pcsn
|
||||
ENDOPTION
|
||||
|
||||
OPTION 输入.sap_pcsn_in <> ""
|
||||
sub.sap_pcsn IN 输入.sap_pcsn_in
|
||||
ENDOPTION
|
||||
GROUP BY dis.iostorinv_id
|
||||
) dis2 ON dis2.iostorinv_id = ios2.iostorinv_id
|
||||
INNER JOIN (
|
||||
SELECT
|
||||
dtl.iostorinv_id,
|
||||
|
||||
Reference in New Issue
Block a user