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

Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one

Browse Source
This commit is contained in:
ZHOUZ\Noble'lift
2022-12-01 14:54:24 +08:00
parent c6a7beebee 4ce71af1f7
commit 8f9e569833
5 changed files with 22 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lms/nladmin-system/src/main/java/org/nl/wms/ext/sap/service/impl/SapToLmsServiceImpl.java
View File

@@ -74,7 +74,7 @@ public class SapToLmsServiceImpl implements SapToLmsService {
JSONObject jsonMst = new JSONObject();
//获取SAP的存储地点
String LGORT = jo.getString("LGORT");
String LGORT = item.getJSONObject(0).getString("LGORT");
JSONObject stor_jo = WQLObject.getWQLObject("ST_IVT_BSRealStorAttr").query("ext_id = '"+LGORT+"'").uniqueResult(0);
if (ObjectUtil.isEmpty(stor_jo)){
result.put("RTYPE", "E");

8
lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/VirtualOutServiceImpl.java
View File

@@ -11,6 +11,7 @@ import lombok.extern.slf4j.Slf4j;
import org.nl.modules.common.exception.BadRequestException;
import org.nl.modules.wql.WQL;
import org.nl.modules.wql.core.bean.WQLObject;
import org.nl.wms.basedata.st.service.impl.UserStorServiceImpl;
import org.nl.wms.pda.st.service.VirtualOutService;
import org.nl.wms.st.inbill.service.CheckOutBillService;
import org.nl.wms.st.outbill.service.impl.CheckOutBillServiceImpl;
@@ -39,6 +40,13 @@ public class VirtualOutServiceImpl implements VirtualOutService {
map.put("box_no", whereJson.getString("box_no"));
map.put("bill_code", whereJson.getString("bill_code"));
map.put("bill_type", whereJson.getString("bill_type"));
//获取人员对应的仓库
UserStorServiceImpl userStorService = new UserStorServiceImpl();
String in_stor_id = userStorService.getInStor();
if (ObjectUtil.isNotEmpty(in_stor_id)) map.put("in_stor_id",in_stor_id);
JSONArray resultJSONArray = WQL.getWO("PDA_VIRTUALOUT").addParamMap(map).process().getResultJSONArray(0);
JSONObject jo = new JSONObject();

4
lms/nladmin-system/src/main/java/org/nl/wms/pda/st/wql/PDA_ST_01.wql
View File

@@ -112,8 +112,8 @@
LEFT JOIN st_ivt_sectattr se ON se.sect_id =sa.sect_id
WHERE
se.sect_type_attr = '09'
AND lock_type = '1'
AND stor_id = 输入.stor_id
AND sa.lock_type = '1'
AND sa.stor_id = 输入.stor_id
AND sa.is_delete = '0'
AND IFNULL( storagevehicle_code, '' ) = ''
ORDER BY

11
lms/nladmin-system/src/main/java/org/nl/wms/pda/st/wql/PDA_VIRTUALOUT.wql
View File

@@ -18,6 +18,7 @@
输入.bill_type TYPEAS s_string
输入.material_code TYPEAS s_string
输入.box_no TYPEAS s_string
输入.in_stor_id TYPEAS f_string
[临时表]
@@ -64,8 +65,9 @@
FROM
ST_IVT_IOStorInv mst
LEFT JOIN ST_IVT_IOStorInvDis dis ON dis.iostorinv_id = mst.iostorinv_id
LEFT JOIN st_ivt_sectattr se ON se.sect_id =dis.sect_id
WHERE
dis.sect_id = '1586913215886004224'
se.sect_type_attr = '09'
AND mst.is_delete = '0'
AND mst.io_type = '1'
AND mst.bill_status <> '99'
@@ -82,6 +84,10 @@
mst.bill_type = 输入.bill_type
ENDOPTION
OPTION 输入.in_stor_id <> ""
mst.stor_id in 输入.in_stor_id
ENDOPTION
ENDSELECT
ENDQUERY
ENDIF
@@ -116,8 +122,9 @@
LEFT JOIN ST_IVT_IOStorInv mst ON dis.iostorinv_id = mst.iostorinv_id
LEFT JOIN md_me_materialbase mater ON dis.material_id = mater.material_id
LEFT JOIN PDM_BI_SubPackageRelation sub ON dis.pcsn = sub.container_name
LEFT JOIN st_ivt_sectattr se ON se.sect_id =dis.sect_id
WHERE
dis.sect_id = '1586913215886004224'
se.sect_type_attr = '09'
AND mst.is_delete = '0'
AND mst.io_type = '1'
AND dis.work_status <> '99'

4
lms/nladmin-ui/src/views/wms/basedata/st/ivt/index.vue
View File

@@ -76,8 +76,8 @@
<!--表格渲染-->
<el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
<el-table-column type="selection" width="55" />
<el-table-column prop="point_code" label="仓位编码" min-width="120" show-overflow-tooltip />
<el-table-column prop="point_name" label="仓位名称" min-width="120" show-overflow-tooltip />
<el-table-column prop="struct_code" label="仓位编码" min-width="120" show-overflow-tooltip />
<el-table-column prop="struct_name" label="仓位名称" min-width="120" show-overflow-tooltip />
<el-table-column prop="stor_name" label="仓库" min-width="120" show-overflow-tooltip />
<el-table-column prop="sect_name" label="库区" min-width="120" show-overflow-tooltip />
<!-- <el-table-column prop="region_name" label="下料区域" min-width="120" show-overflow-tooltip />-->