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

修改

Browse Source
This commit is contained in:
ZHOUZ\Noble'lift
2022-11-24 16:01:59 +08:00
parent dde7740d79
commit c1caf24ad7
9 changed files with 215 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/mdcs.xls
View File

Binary file not shown.

27
lms/nladmin-system/src/main/java/org/nl/wms/ext/crm/service/impl/CrmToLmsServiceImpl.java
View File

@@ -1,11 +1,14 @@
package org.nl.wms.ext.crm.service.impl;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.nl.modules.common.utils.SecurityUtils;
import org.nl.modules.wql.WQL;
import org.nl.wms.ext.crm.service.CrmToLmsService;
import org.nl.modules.wql.core.bean.WQLObject;
@@ -54,6 +57,30 @@ public class CrmToLmsServiceImpl implements CrmToLmsService {
WQLObject.getWQLObject("MD_CS_CustomerBaseProc").insert(jo);
log.info(jo.toString());
//插入客户表
Long currentUserId = SecurityUtils.getCurrentUserId();
String nickName = SecurityUtils.getCurrentNickName();
String now = DateUtil.now();
JSONObject customer_jo = WQLObject.getWQLObject("").query("cust_code = '"+customer_name+"'").uniqueResult(0);
if (ObjectUtil.isEmpty(customer_jo)){
customer_jo = new JSONObject();
customer_jo.put("cust_id",IdUtil.getSnowflake(1,1).nextId());
customer_jo.put("cust_code",customer_name);
customer_jo.put("cust_name",description);
customer_jo.put("create_id",currentUserId);
customer_jo.put("create_name",nickName);
customer_jo.put("create_time",now);
customer_jo.put("update_optid",currentUserId);
customer_jo.put("update_optname",nickName);
customer_jo.put("update_time",now);
WQLObject.getWQLObject("md_cs_customerbase").insert(customer_jo);
}else {
customer_jo.put("cust_name",description);
WQLObject.getWQLObject("md_cs_customerbase").update(customer_jo);
}
JSONObject result = new JSONObject();
result.put("RTYPE", "S");
result.put("RTMSG", "操作成功!");

24
lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/MesToLmsServiceImpl.java
View File

@@ -882,7 +882,31 @@ public class MesToLmsServiceImpl implements MesToLmsService {
String is_mesTolms = SpringContextHolder.getBean(ParamServiceImpl.class).findByCode("is_mesTolms").getValue();
if (StrUtil.equals(is_mesTolms, "1")) {
String ContainerName = param.getString("ContainerName");
String SaleOrderName = param.getString("SaleOrderName");
String isUnPlanProduction = param.getString("isUnPlanProduction");
if (isUnPlanProduction.equals("1")){
Long currentUserId = SecurityUtils.getCurrentUserId();
String nickName = SecurityUtils.getCurrentNickName();
JSONObject sub_jo = WQLObject.getWQLObject("pdm_bi_subpackagerelation").query("container_name = '"+ContainerName+"'").uniqueResult(0);
/*sub_jo.put("change_type_scode","02");
sub_jo.put("create_id",currentUserId);
sub_jo.put("create_name",nickName);
sub_jo.put("change_time",DateUtil.now());
sub_jo.put("workorder_id",IdUtil.getSnowflake(1, 1).nextId() + "");
WQLObject.getWQLObject("PDM_BI_SubPackageRelationChangeFlow").insert(sub_jo);*/
sub_jo.put("sale_order_name",SaleOrderName);
WQLObject.getWQLObject("pdm_bi_subpackagerelation").update(sub_jo);
/*JSONObject new_sub = WQLObject.getWQLObject("pdm_bi_subpackagerelation").query("container_name = '"+ContainerName+"' AND status = '2'").uniqueResult(0);
new_sub.put("change_type_scode","01");
new_sub.put("create_id",currentUserId);
new_sub.put("create_name",nickName);
new_sub.put("change_time",DateUtil.now());
new_sub.put("workorder_id",IdUtil.getSnowflake(1, 1).nextId() + "");
WQLObject.getWQLObject("PDM_BI_SubPackageRelationChangeFlow").insert(new_sub);*/
}
}
JSONObject result = new JSONObject();

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

@@ -54,7 +54,8 @@ public class LmsToSapServiceImpl implements LmsToSapService {
String api = "";
url = url + "/sap/center/wms/004";
try {
String resultMsg = HttpRequest.post(url).header("TOKEN","FA163EE139D41EED9286BB7E1A2F8D4C")
String resultMsg = HttpRequest.post(url).header("TOKEN","877734686FA61EDD99E9D85A96D91E14")
.header("sap-client","800")
.body(String.valueOf(jo))
.execute().body();
result = JSONObject.parseObject(resultMsg);
@@ -115,10 +116,11 @@ public class LmsToSapServiceImpl implements LmsToSapService {
// String url = acsUrl + api;
String url = SpringContextHolder.getBean(ParamServiceImpl.class).findByCode("SAP_URL").getValue();
String api = "";
String api = "/sap/center/wms/005";
url = url + api;
try {
String resultMsg = HttpRequest.post(url)
String resultMsg = HttpRequest.post(url).header("TOKEN","877734686FA61EDD99E9D85A96D91E14")
.header("sap-client","800")
.body(String.valueOf(jo))
.execute().body();
result = JSONObject.parseObject(resultMsg);

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

@@ -44,10 +44,12 @@ public class SubpackagerelationServiceImpl implements SubpackagerelationService
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");
String package_box_sn = MapUtil.getStr(whereJson, "package_box_sn");
JSONObject map = new JSONObject();
map.put("flag", "1");
if (ObjectUtil.isNotEmpty(material_code)) map.put("material_code","%"+material_code+"%");
if (ObjectUtil.isNotEmpty(package_box_sn)) map.put("package_box_sn","%"+package_box_sn+"%");
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+"%");

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

@@ -19,6 +19,7 @@
输入.sale_order_name TYPEAS s_string
输入.customer_name TYPEAS s_string
输入.customer_description TYPEAS s_string
输入.package_box_sn TYPEAS s_string
[临时表]
@@ -55,6 +56,10 @@
product_name LIKE 输入.material_code
ENDOPTION
OPTION 输入.package_box_sn <> ""
package_box_sn LIKE 输入.package_box_sn
ENDOPTION
OPTION 输入.material_name <> ""
product_description LIKE 输入.material_name
ENDOPTION

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

Binary file not shown.

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

@@ -31,6 +31,16 @@
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<el-form-item label="木箱码">
<el-input
v-model="query.package_box_sn"
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"
@@ -61,7 +71,7 @@
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<!-- <el-form-item label="满轴位状态">
<!-- <el-form-item label="满轴位状态">
<el-select
v-model="query.full_point_status"
clearable
@@ -254,11 +264,11 @@
<el-table-column prop="package_box_sn" label="木箱码" :min-width="flexWidth('package_box_sn',crud.data,'木箱码')" />
<el-table-column prop="quanlity_in_box" label="箱内子卷数量" :min-width="flexWidth('quanlity_in_box',crud.data,'箱内子卷数量')" />
<el-table-column prop="box_weight" label="木箱自身重量" :min-width="flexWidth('box_weight',crud.data,'木箱自身重量')" />
<el-table-column prop="quality_guaran_period" label="保质期" :min-width="flexWidth('quality_guaran_period',crud.data,'保质期')"/>
<el-table-column v-if="false" prop="sale_order_name" label="销售订单及行号" class-name="leave-alone"/>
<el-table-column prop="quality_guaran_period" label="保质期" :min-width="flexWidth('quality_guaran_period',crud.data,'保质期')" />
<el-table-column prop="sale_order_name" label="销售订单及行号" :min-width="flexWidth('sale_order_name',crud.data,'保质期')" />
<el-table-column prop="customer_description" label="客户名称" :min-width="flexWidth('customer_description',crud.data,'客户名称')" />
<el-table-column v-if="false" prop="product_name" label="产品编码" :min-width="flexWidth('product_name',crud.data,'产品编码')" />
<el-table-column prop="product_description" label="产品描述" :min-width="flexWidth('product_description',crud.data,'产品描述')"/>
<el-table-column prop="product_name" label="产品描述" :min-width="flexWidth('product_name',crud.data,'产品描述')" />
<el-table-column prop="product_description" label="产品描述" :min-width="flexWidth('product_description',crud.data,'产品描述')" />
<el-table-column prop="date_of_fg_inbound" label="入库日期" :min-width="flexWidth('date_of_fg_inbound',crud.data,'入库日期')" />
<el-table-column prop="container_name" label="子卷号" :min-width="flexWidth('container_name',crud.data,'子卷号')" />
<el-table-column prop="sap_pcsn" label="sap批次" :min-width="flexWidth('sap_pcsn',crud.data,'SAP批次')" />
@@ -268,7 +278,7 @@
<el-table-column prop="net_weight" label="净重" :formatter="crud.formatNum3" :min-width="flexWidth('net_weight',crud.data,'净重')" />
<el-table-column prop="length" label="长度" :formatter="crud.formatNum3" :min-width="flexWidth('length',crud.data,'长度')" />
<el-table-column prop="date_of_production" label="制造完成日期" :min-width="flexWidth('date_of_production',crud.data,'制造完成日期')" />
<el-table-column prop="is_un_plan_production" label="计划外分切的子卷" :min-width="flexWidth('is_un_plan_production',crud.data,'计划外分切的子卷')" >
<el-table-column prop="is_un_plan_production" label="计划外分切的子卷" :min-width="flexWidth('is_un_plan_production',crud.data,'计划外分切的子卷')">
<template slot-scope="scope">
{{ dict.label.IS_OR_NOT[scope.row.is_un_plan_production] }}
</template>
@@ -280,7 +290,7 @@
<el-table-column prop="remark" label="备注" :min-width="flexWidth('remark',crud.data,'备注')" />
<el-table-column prop="create_name" label="创建人" :min-width="flexWidth('create_name',crud.data,'创建人')" />
<el-table-column prop="create_time" label="创建时间" :min-width="flexWidth('create_time',crud.data,'创建时间')" />
<el-table-column prop="status" label="状态" :min-width="flexWidth('status',crud.data,'状态')" >
<el-table-column prop="status" label="状态" :min-width="flexWidth('status',crud.data,'状态')">
<template slot-scope="scope">
{{ dict.label.sub_package_relation[scope.row.status] }}
</template>

204
lms/nladmin-ui/src/views/wms/pdm/order/slittingplan/index.vue
View File

@@ -154,74 +154,140 @@
</el-button>
</crudOperation>
<!--表单组件-->
<el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" width="500px">
<el-form ref="form" :model="form" :rules="rules" size="mini" label-width="80px">
<el-form-item label="订单类型" prop="order_type">
<el-input v-model="form.order_type" style="width: 370px;" />
</el-form-item>
<el-form-item label="子卷号" prop="container_name">
<el-input v-model="form.container_name" style="width: 370px;" />
</el-form-item>
<el-form-item label="产品编码" prop="product_name">
<el-input v-model="form.product_name" style="width: 370px;" />
</el-form-item>
<el-form-item label="产品描述" prop="description">
<el-input v-model="form.description" style="width: 370px;" />
</el-form-item>
<el-form-item label="来源母卷号" prop="parent_container_name">
<el-input v-model="form.parent_container_name" style="width: 370px;" />
</el-form-item>
<el-form-item label="改制来源子卷号" prop="restruct_container_name">
<el-input v-model="form.restruct_container_name" style="width: 370px;" />
</el-form-item>
<el-form-item label="子卷立库木箱号" prop="package_box_sn">
<el-input v-model="form.package_box_sn" style="width: 370px;" />
</el-form-item>
<el-form-item label="来源卷位置" prop="ware_house">
<el-input v-model="form.ware_house" style="width: 370px;" />
</el-form-item>
<el-form-item label="分切机台编码" prop="resource_name">
<el-input v-model="form.resource_name" style="width: 370px;" />
</el-form-item>
<el-form-item label="分切组" prop="split_group">
<el-input v-model="form.split_group" style="width: 370px;" />
</el-form-item>
<el-form-item label="生产顺序" prop="manufacture_sort">
<el-input v-model="form.manufacture_sort" style="width: 370px;" />
</el-form-item>
<el-form-item label="生产订单" prop="mfg_order_name">
<el-input v-model="form.mfg_order_name" style="width: 370px;" />
</el-form-item>
<el-form-item label="生产日期" prop="manufacture_date">
<el-input v-model="form.manufacture_date" style="width: 370px;" />
</el-form-item>
<el-form-item label="管件类型" prop="paper_tube_or_FRP">
<el-input v-model="form.paper_tube_or_FRP" style="width: 370px;" />
</el-form-item>
<el-form-item label="纸筒物料编码" prop="paper_tube_material">
<el-input v-model="form.paper_tube_material" style="width: 370px;" />
</el-form-item>
<el-form-item label="纸筒物料描述" prop="paper_tube_description">
<el-input v-model="form.paper_tube_description" style="width: 370px;" />
</el-form-item>
<el-form-item label="FRP管物料编码" prop="FRP_material">
<el-input v-model="form.FRP_material" style="width: 370px;" />
</el-form-item>
<el-form-item label="FRP管物料描述" prop="FRP_description">
<el-input v-model="form.FRP_description" style="width: 370px;" />
</el-form-item>
<el-form-item label="FRP管规格" prop="FRP_model">
<el-input v-model="form.FRP_model" style="width: 370px;" />
</el-form-item>
<el-form-item label="子卷幅宽" prop="split_breadth">
<el-input v-model="form.split_breadth" style="width: 370px;" />
</el-form-item>
<el-form-item label="子卷理论长度" prop="split_height">
<el-input v-model="form.split_height" style="width: 370px;" />
</el-form-item>
<el-form-item label="子卷理论重量" prop="split_weight">
<el-input v-model="form.split_weight" style="width: 370px;" />
</el-form-item>
<el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" width="1200px">
<el-form ref="form" :model="form" :rules="rules" size="mini" label-width="150px">
<el-row>
<el-col :span="12">
<el-form-item label="订单类型" prop="order_type">
<el-input v-model="form.order_type" style="width: 370px;" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="子卷号" prop="container_name">
<el-input v-model="form.container_name" style="width: 370px;" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="产品编码" prop="product_name">
<el-input v-model="form.product_name" style="width: 370px;" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="产品描述" prop="description">
<el-input v-model="form.description" style="width: 370px;" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="来源母卷号" prop="parent_container_name">
<el-input v-model="form.parent_container_name" style="width: 370px;" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="改制来源子卷号" prop="restruct_container_name">
<el-input v-model="form.restruct_container_name" style="width: 370px;" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="子卷立库木箱号" prop="package_box_sn">
<el-input v-model="form.package_box_sn" style="width: 370px;" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="来源卷位置" prop="ware_house">
<el-input v-model="form.ware_house" style="width: 370px;" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="分切机台编码" prop="resource_name">
<el-input v-model="form.resource_name" style="width: 370px;" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="分切组" prop="split_group">
<el-input v-model="form.split_group" style="width: 370px;" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="生产顺序" prop="manufacture_sort">
<el-input v-model="form.manufacture_sort" style="width: 370px;" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="生产订单" prop="mfg_order_name">
<el-input v-model="form.mfg_order_name" style="width: 370px;" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="生产日期" prop="manufacture_date">
<el-input v-model="form.manufacture_date" style="width: 370px;" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="管件类型" prop="paper_tube_or_FRP">
<el-input v-model="form.paper_tube_or_FRP" style="width: 370px;" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="纸筒物料编码" prop="paper_tube_material">
<el-input v-model="form.paper_tube_material" style="width: 370px;" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="纸筒物料描述" prop="paper_tube_description">
<el-input v-model="form.paper_tube_description" style="width: 370px;" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="FRP管物料编码" prop="FRP_material">
<el-input v-model="form.FRP_material" style="width: 370px;" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="FRP管物料描述" prop="FRP_description">
<el-input v-model="form.FRP_description" style="width: 370px;" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="FRP管规格" prop="FRP_model">
<el-input v-model="form.FRP_model" style="width: 370px;" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="子卷幅宽" prop="split_breadth">
<el-input v-model="form.split_breadth" style="width: 370px;" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="子卷理论长度" prop="split_height">
<el-input v-model="form.split_height" style="width: 370px;" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="子卷理论重量" prop="split_weight">
<el-input v-model="form.split_weight" style="width: 370px;" />
</el-form-item>
</el-col>
</el-row>
<el-form-item label="备注">
<el-input v-model="form.remark" style="width: 370px;" />
</el-form-item>
@@ -262,7 +328,7 @@
<el-table-column prop="is_parent_ok" label="母卷上料完成" width="100px" :formatter="formatParentName" />
<el-table-column prop="is_child_tz_ok" label="子卷套轴完成" width="100px" :formatter="formatChildName" />
<el-table-column prop="is_child_ps_ok" label="子卷配送完成" width="100px" :formatter="formatChildPsName" />
<el-table-column prop="qzzno" label="气涨轴编码" width="100px" />
<el-table-column prop="qzzno" label="气涨轴编码" width="100px" />
<el-table-column prop="start_time" label="开始时间" width="150px" />
<el-table-column prop="end_time" label="结束时间" width="150px" />
<!-- <el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">