root/lanzhouhailiang_one
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-11-17 10:33:06 +08:00
parent 2874adc42c eb89796d5c
commit a2772eeb86
13 changed files with 193 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -44,6 +44,9 @@
PAGEQUERY
SELECT
ivt.*,
attr.sect_id,
attr.sect_code,
attr.sect_name,
point.point_code,
point.point_name,
mater.material_code,
@@ -53,6 +56,7 @@
FROM
ST_IVT_StructIvt ivt
LEFT JOIN sch_base_point point ON ivt.struct_id = point.source_id
LEFT JOIN st_ivt_structattr attr ON ivt.struct_id = attr.struct_id
LEFT JOIN md_me_materialbase mater ON mater.material_id = ivt.material_id
LEFT JOIN md_pb_measureunit unit ON unit.measure_unit_id = ivt.qty_unit_id
LEFT JOIN SCH_BASE_Region region ON region.region_id = ivt.region_id

2
lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/BakingServiceImpl.java
View File

@@ -241,6 +241,7 @@ public class BakingServiceImpl implements BakingService {
String point_code1 = whereJson.getString("point_code");
if (ObjectUtil.isEmpty(point_code1)) throw new BadRequestException("出箱点位不能为空");
JSONObject jsonHotIvt = hosIvtTab.query("point_code = '" + point_code1 + "'").uniqueResult(0);
if (ObjectUtil.isEmpty(jsonHotIvt)) throw new BadRequestException("点位不存在");
// 1.查询暂存位有没有空位
String product_area = jsonHotIvt.getString("product_area");
@@ -328,6 +329,7 @@ public class BakingServiceImpl implements BakingService {
// 1.获取此暂存位的生产区域和上下位置
JSONObject jsonPoint = pointTab.query("point_code = '" + point_code1 + "'").uniqueResult(0);
if (ObjectUtil.isEmpty(jsonPoint)) throw new BadRequestException("点位不存在");
// 2.找冷却区空货位
JSONObject map = new JSONObject();

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

@@ -38,7 +38,7 @@ public class CoolInServiceImpl implements CoolInService {
map.put("flag", "1");
if (ObjectUtil.isNotEmpty(container_name)) map.put("container_name", "%"+container_name+"%");
JSONObject jsonObject = WQL.getWO("PDA_COOLIN").addParamMap(map).pageQuery(ctx, "der.container_name ASC");
JSONObject jsonObject = WQL.getWO("PDA_COOLIN").addParamMap(map).pageQuery(ctx, "container_name");
JSONArray resultJSONArray = WQL.getWO("PDA_COOLIN").addParamMap(map).process().getResultJSONArray(0);
JSONObject jo = new JSONObject();

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

@@ -65,7 +65,6 @@
der.product_area AS product_area,
der.update_time AS update_time,
ivt.point_location,
ivt.product_area,
der.workorder_id
FROM
PDM_BI_RawFoilWorkOrder der

20
lms/nladmin-system/src/main/java/org/nl/wms/pdm/bi/service/impl/SubpackagerelationServiceImpl.java
View File

@@ -2,9 +2,11 @@
package org.nl.wms.pdm.bi.service.impl;
import cn.hutool.core.map.MapUtil;
import com.alibaba.fastjson.JSON;
import lombok.RequiredArgsConstructor;
import org.nl.modules.common.exception.BadRequestException;
import org.nl.modules.wql.WQL;
import org.nl.wms.pdm.bi.service.SubpackagerelationService;
import org.nl.wms.pdm.bi.service.dto.SubpackagerelationDto;
import org.springframework.stereotype.Service;
@@ -37,9 +39,21 @@ public class SubpackagerelationServiceImpl implements SubpackagerelationService
@Override
public Map<String,Object> queryAll(Map whereJson, Pageable page){
WQLObject wo = WQLObject.getWQLObject("pdm_bi_subpackagerelation");
ResultBean rb = wo.pagequery(WqlUtil.getHttpContext(page), "1=1", "package_box_sn desc");
final JSONObject json = rb.pageResult();
String material_code = MapUtil.getStr(whereJson, "material_code");
String material_name = MapUtil.getStr(whereJson, "material_name");
String sale_order_name = MapUtil.getStr(whereJson, "sale_order_name");
String customer_name = MapUtil.getStr(whereJson, "customer_name");
String customer_description = MapUtil.getStr(whereJson, "customer_description");
JSONObject map = new JSONObject();
map.put("flag", "1");
if (ObjectUtil.isNotEmpty(material_code)) map.put("material_code","%"+material_code+"%");
if (ObjectUtil.isNotEmpty(material_name)) map.put("material_name","%"+material_name+"%");
if (ObjectUtil.isNotEmpty(sale_order_name)) map.put("sale_order_name","%"+sale_order_name+"%");
if (ObjectUtil.isNotEmpty(customer_name)) map.put("customer_name","%"+customer_name+"%");
if (ObjectUtil.isNotEmpty(customer_description)) map.put("customer_description","%"+customer_description+"%");
JSONObject json = WQL.getWO("PDM_BI_SUBPACKAGER01").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "create_time DESC");
return json;
}

76
lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/PDM_BI_SUBPACKAGER01.wql Normal file
View File

@@ -0,0 +1,76 @@
[交易说明]
交易名： 子卷包装
所属模块：
功能简述：
版权所有：
表引用：
版本经历：
[数据库]
--指定数据库，为空采用默认值，默认为db.properties中列出的第一个库
[IO定义]
#################################################
## 表字段对应输入参数
#################################################
输入.flag TYPEAS s_string
输入.material_code TYPEAS s_string
输入.material_name TYPEAS s_string
输入.sale_order_name TYPEAS s_string
输入.customer_name TYPEAS s_string
输入.customer_description TYPEAS s_string
[临时表]
--这边列出来的临时表就会在运行期动态创建
[临时变量]
--所有中间过程变量均可在此处定义
[业务过程]
##########################################
# 1、输入输出检查 #
##########################################
##########################################
# 2、主过程前处理 #
##########################################
##########################################
# 3、业务主过程 #
##########################################
IF 输入.flag = "1"
PAGEQUERY
SELECT
*
FROM
pdm_bi_subpackagerelation
WHERE
1=1
OPTION 输入.material_code <> ""
product_name LIKE 输入.material_code
ENDOPTION
OPTION 输入.material_name <> ""
product_description LIKE 输入.material_name
ENDOPTION
OPTION 输入.sale_order_name <> ""
sale_order_name LIKE 输入.sale_order_name
ENDOPTION
OPTION 输入.customer_name <> ""
customer_name LIKE 输入.customer_name
ENDOPTION
OPTION 输入.customer_description <> ""
customer_description LIKE 输入.customer_description
ENDOPTION
ENDSELECT
ENDPAGEQUERY
ENDIF

1
lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/ST_IVT_HOTPOINTIVT.wql
View File

@@ -82,6 +82,7 @@
PAGEQUERY
SELECT
mst.bill_code,
mst.container_name,
dtl.start_point_code,
dtl.next_point_code,
dtl.temperature,

18
lms/nladmin-system/src/main/java/org/nl/wms/st/instor/wql/QST_IVT_CHECK.wql
View File

@@ -141,15 +141,15 @@
PAGEQUERY
SELECT
struct.sect_id,
struct.sect_code,
struct.sect_name,
struct.struct_id,
struct.struct_code,
struct.struct_name,
struct.storagevehicle_code,
mb.material_id,
mb.material_name,
mb.material_code,
MAX(struct.sect_code) AS sect_code,
MAX(struct.sect_name) AS sect_name,
MAX(struct.struct_id) AS struct_id,
MAX(struct.struct_code) AS struct_code,
MAX(struct.struct_name) AS struct_name,
MAX(struct.storagevehicle_code) AS storagevehicle_code,
MAX(mb.material_id) AS material_id,
MAX(mb.material_name) AS material_name,
MAX(mb.material_code) AS material_code,
'1' AS base_qty,
'0' AS fac_qty,
'箱' AS qty_unit_name,

13
lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/wql/QST_IVT_CHECKOUTBILL.wql
View File

@@ -67,20 +67,9 @@
IF 输入.flag = "1"
PAGEQUERY
SELECT
ios.*,
dis.num
ios.*
FROM
ST_IVT_IOStorInv ios
LEFT JOIN (
SELECT
count(d.struct_id) AS num,
MAX(d.iostorinv_id) AS iostorinv_id
FROM
ST_IVT_IOStorInvDis d
WHERE
1=1
group by d.struct_id
) AS dis ON ios.iostorinv_id = dis.iostorinv_id
WHERE
io_type = '1'
and ios.is_delete='0'

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

@@ -57,6 +57,7 @@
<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="sect_name" label="库区" min-width="120" show-overflow-tooltip />
<!-- <el-table-column prop="region_name" label="下料区域" min-width="120" show-overflow-tooltip />-->
<el-table-column prop="material_code" label="物料编码" min-width="120" show-overflow-tooltip />
<el-table-column prop="material_name" label="物料名称" min-width="120" show-overflow-tooltip />

79
lms/nladmin-ui/src/views/wms/pdm/bi/index.vue
View File

@@ -2,6 +2,85 @@
<div class="app-container">
<!--工具栏-->
<div class="head-container">
<div v-if="crud.props.searchToggle">
<!-- 搜索 -->
<el-form
:inline="true"
class="demo-form-inline"
label-position="right"
label-width="90px"
label-suffix=":"
>
<el-form-item label="物料编码">
<el-input
v-model="query.material_code"
clearable
placeholder="输入物料编码"
style="width: 185px;"
class="filter-item"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<el-form-item label="物料名称">
<el-input
v-model="query.material_name"
clearable
placeholder="输入物料名称"
style="width: 185px;"
class="filter-item"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<el-form-item label="订单号">
<el-input
v-model="query.sale_order_name"
clearable
placeholder="输入订单号"
style="width: 185px;"
class="filter-item"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<el-form-item label="客户编码">
<el-input
v-model="query.customer_name"
clearable
placeholder="输入客户编码"
style="width: 185px;"
class="filter-item"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<el-form-item label="客户名称">
<el-input
v-model="query.customer_description"
clearable
placeholder="输入客户名称"
style="width: 185px;"
class="filter-item"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<!-- <el-form-item label="满轴位状态">
<el-select
v-model="query.full_point_status"
clearable
filterable
size="mini"
class="filter-item"
style="width: 185px;"
@change="hand"
>
<el-option
v-for="item in dict.sch_full_point_status"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>-->
<rrOperation :crud="crud" />
</el-form>
</div>
<!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
<crudOperation :permission="permission" />
<!--表单组件-->

1
lms/nladmin-ui/src/views/wms/pdm/ivt/hotpointivt/taskDtl.vue
View File

@@ -87,6 +87,7 @@
<!--表格渲染-->
<el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
<el-table-column prop="bill_code" label="单据编码" :min-width="flexWidth('bill_code',crud.data,'单据编码')" />
<el-table-column prop="container_name" label="母卷号" :min-width="flexWidth('container_name',crud.data,'母卷号')" />
<el-table-column prop="dtl_status" label="明细状态" :min-width="flexWidth('dtl_status',crud.data,'明细状态')" />
<el-table-column prop="start_point_code" label="起始点位" :min-width="flexWidth('start_point_code',crud.data,'起始点位')" />
<el-table-column prop="next_point_code" label="终点点位" :min-width="flexWidth('next_point_code',crud.data,'终点点位')" />

2
lms/nladmin-ui/src/views/wms/st/outbill/StructIvt.vue
View File

@@ -179,7 +179,7 @@ export default {
debugger
// 判断是否可以关闭编辑状态
if (row.edit === undefined) {
row.edit = false
this.$set(row, 'edit', false)
}
if (!row.edit) {
if (row.plan_qty > this.queryrow.unassign_qty) {