diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/info/dao/PdmBiContainerinfo.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/info/dao/PdmBiContainerinfo.java
index 88356a0cd..abcc8bec8 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/info/dao/PdmBiContainerinfo.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/info/dao/PdmBiContainerinfo.java
@@ -166,6 +166,16 @@ public class PdmBiContainerinfo implements Serializable {
*/
private String standard_limit;
+ /**
+ * 客户需求抗拉上限
+ */
+ private String demand_up;
+
+ /**
+ * 内控标准抗拉上限
+ */
+ private String standard_up;
+
/**
* 生产实际抗拉值
*/
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/QST_STRUCTIVT001.wql b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/QST_STRUCTIVT001.wql
index 5e92b94fc..4fde6f42b 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/QST_STRUCTIVT001.wql
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/QST_STRUCTIVT001.wql
@@ -100,7 +100,9 @@
mater.material_code,
mater.material_name,
unit.unit_name,
- region.region_name
+ region.region_name,
+ container.demand_up,
+ container.demand_limit
FROM
ST_IVT_StructIvt StructIvt
inner JOIN st_ivt_structattr attr ON StructIvt.struct_id = attr.struct_id
@@ -108,6 +110,7 @@
inner JOIN md_me_materialbase mater ON mater.material_id = StructIvt.material_id
LEFT JOIN md_pb_measureunit unit ON unit.measure_unit_id = StructIvt.qty_unit_id
LEFT JOIN SCH_BASE_Region region ON region.region_id = StructIvt.region_id
+ left join pdm_bi_containerinfo container on container.container_name = StructIvt.pcsn
WHERE 1 = 1
and attr.stor_id in 输入.in_stor_id
OPTION 输入.struct <> ""
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/MesToLmsServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/MesToLmsServiceImpl.java
index fb716f570..cf6983a47 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/MesToLmsServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/MesToLmsServiceImpl.java
@@ -1,6 +1,7 @@
package org.nl.wms.ext.mes.service.impl;
import cn.hutool.core.date.DateUtil;
+import org.checkerframework.checker.units.qual.A;
import org.nl.common.utils.IdUtil;
import cn.hutool.core.util.NumberUtil;
import cn.hutool.core.util.ObjectUtil;
@@ -954,6 +955,7 @@ public class MesToLmsServiceImpl implements MesToLmsService {
}
String Status = param.getJSONObject(0).getString("Status");
String ResourceName = param.getJSONObject(0).getString("ResourceName");
+ String Attribute1 = param.getJSONObject(0).getString("Attribute1");
JSONObject cut_jo = WQLObject.getWQLObject("ST_IVT_CutPointIvt").query("ext_code = '" + ResourceName + "'").uniqueResult(0);
if (ObjectUtil.isEmpty(cut_jo)) {
throw new BadRequestException("分切计划对应的分切机不存在：" + ResourceName);
@@ -1004,6 +1006,9 @@ public class MesToLmsServiceImpl implements MesToLmsService {
plan_jo.put("is_parent_ok", "1");
plan_jo.put("is_child_tz_ok", "1");
plan_jo.put("is_child_ps_ok", "1");
+ if (StrUtil.isNotEmpty(Attribute1)) {
+ plan_jo.put("foil_container_name", Attribute1);
+ }
WQLObject.getWQLObject("pdm_bi_slittingproductionplan").update(plan_jo);
}
} else {
@@ -1082,6 +1087,9 @@ public class MesToLmsServiceImpl implements MesToLmsService {
plan_jo.put("is_child_tz_ok", "1");
plan_jo.put("is_child_ps_ok", "1");
plan_jo.put("is_paper_ok", "2");
+ if (StrUtil.isNotEmpty(Attribute1)) {
+ plan_jo.put("foil_container_name", Attribute1);
+ }
WQLObject.getWQLObject("pdm_bi_slittingproductionplan").update(plan_jo);
}
}
@@ -1854,7 +1862,7 @@ public class MesToLmsServiceImpl implements MesToLmsService {
// 插入生箔工序工单表
JSONObject json = new JSONObject();
json.put("workorder_id", IdUtil.getLongId());
- json.put("foil_container_ame", FoilContainerName);
+ json.put("foil_container_name", FoilContainerName);
json.put("container_name", TRContainerName);
json.put("resource_name", ResourceName);
json.put("mfg_order_name", MfgOrderName);
@@ -2264,6 +2272,10 @@ public class MesToLmsServiceImpl implements MesToLmsService {
String TensileStrength = param.getString("TensileStrength");
//包装类型
String ReWorkName = param.getString("ReWorkName");
+ //客户需求抗拉上限
+ String SOTensileStrengthUpperLimit = param.getString("SOTensileStrengthUpperLimit");
+ //内控标准抗拉上限
+ String ETTensileStrengthUpperLimit = param.getString("ETTensileStrengthUpperLimit");
String sub_type = "";
if (ObjectUtil.isEmpty(ReWorkName)) {
@@ -2306,6 +2318,8 @@ public class MesToLmsServiceImpl implements MesToLmsService {
.create_time(DateUtil.now())
.width_standard(WidthPlan)
.sub_type(sub_type)
+ .demand_up(SOTensileStrengthUpperLimit)
+ .standard_up(ETTensileStrengthUpperLimit)
.thickness_request(ThicknessPlan).build();
containerinfoService.save(containerinfo);
} else {
@@ -2328,6 +2342,8 @@ public class MesToLmsServiceImpl implements MesToLmsService {
one.setActual_value(TensileStrength);
one.setSub_type(sub_type);
one.setWidth_standard(WidthPlan);
+ one.setDemand_up(SOTensileStrengthUpperLimit);
+ one.setStandard_up(ETTensileStrengthUpperLimit);
one.setThickness_request(ThicknessPlan);
containerinfoService.updateById(one);
}
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/pdm.xls b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/pdm.xls
index f56b71873..99e88381d 100644
Binary files a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/pdm.xls and b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/pdm.xls differ
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/stat/service/impl/InBillQueryServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/stat/service/impl/InBillQueryServiceImpl.java
index fbe18c1bd..78b67ccc6 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/stat/service/impl/InBillQueryServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/stat/service/impl/InBillQueryServiceImpl.java
@@ -491,6 +491,7 @@ public class InBillQueryServiceImpl implements InBillQueryService {
mp.put("小卷号", json.getString("pcsn"));
mp.put("sap批次号", json.getString("sap_pcsn"));
mp.put("净重（KG）", NumberUtil.round(StrUtil.isEmpty(json.getString("net_weight")) ? "0" : json.getString("net_weight"), 1));
+ mp.put("生箔母卷", json.getString("foil_container_name"));
mp.put("卷数", json.getString("quanlity_in_box"));
mp.put("品级", "A");
mp.put("箱号", json.getString("box_no"));
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/stat/wql/ST_IVT_INBILLQUERY.wql b/lms/nladmin-system/src/main/java/org/nl/wms/stat/wql/ST_IVT_INBILLQUERY.wql
index 7be5af97a..8437bc18c 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/stat/wql/ST_IVT_INBILLQUERY.wql
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/stat/wql/ST_IVT_INBILLQUERY.wql
@@ -659,6 +659,7 @@
case when plan.paper_tube_or_FRP = '1' then '纸管' when plan.paper_tube_or_FRP = '2' then 'FRP管' end AS paper_type,
case when plan.paper_tube_or_FRP = '1' then plan.paper_tube_material when plan.paper_tube_or_FRP = '2' then plan.FRP_material end AS paper_code,
case when plan.paper_tube_or_FRP = '1' then plan.paper_tube_description when plan.paper_tube_or_FRP = '2' then plan.FRP_description end AS paper_name,
+ plan.foil_container_name,
sub.thickness,
sub.box_weight,
sub.length,
@@ -756,7 +757,8 @@
MAX(parent_container_name) AS parent_container_name,
MAX(restruct_container_name) AS restruct_container_name,
MAX(FRP_description) AS FRP_description,
- MAX(FRP_model) AS FRP_model
+ MAX(FRP_model) AS FRP_model,
+ MAX(foil_container_name) AS foil_container_name
FROM
pdm_bi_slittingproductionplan plan1
WHERE
@@ -1088,7 +1090,8 @@
MAX(parent_container_name) AS parent_container_name,
MAX(restruct_container_name) AS restruct_container_name,
MAX(FRP_description) AS FRP_description,
- MAX(FRP_model) AS FRP_model
+ MAX(FRP_model) AS FRP_model,
+ MAX(foil_container_name) AS foil_container_name
FROM
pdm_bi_slittingproductionplan plan1
WHERE
diff --git a/lms/nladmin-ui/src/views/wms/basedata/st/ivt/index.vue b/lms/nladmin-ui/src/views/wms/basedata/st/ivt/index.vue
index b3ed8ec6f..c358cdd50 100644
--- a/lms/nladmin-ui/src/views/wms/basedata/st/ivt/index.vue
+++ b/lms/nladmin-ui/src/views/wms/basedata/st/ivt/index.vue
@@ -295,6 +295,8 @@
+
+
diff --git a/lms/nladmin-ui/src/views/wms/stat/inbillquery/index2.vue b/lms/nladmin-ui/src/views/wms/stat/inbillquery/index2.vue
index ecdd40e65..e8eff1486 100644
--- a/lms/nladmin-ui/src/views/wms/stat/inbillquery/index2.vue
+++ b/lms/nladmin-ui/src/views/wms/stat/inbillquery/index2.vue
@@ -94,7 +94,7 @@
@keyup.enter.native="crud.toQuery"
/>
-
+
+