fix:新增接口字段

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;
+
     /**
      * 生产实际抗拉值
      */

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 <> ""

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);
             }

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"));

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

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

@@ -295,6 +295,8 @@
         <el-table-column prop="joint_type" label="接头数" min-width="150" />
         <el-table-column prop="sub_type" label="子卷状态" min-width="150" :formatter="formatSubType" />
         <el-table-column prop="produce_age" label="生产时长（天）" min-width="120" />
+        <el-table-column prop="demand_limit" label="客户需求抗拉下限" min-width="130" />
+        <el-table-column prop="demand_up" label="客户需求抗拉上限" min-width="130" />
         <el-table-column prop="paper_type" label="品质类型" min-width="150" />
         <el-table-column prop="paper_code" label="管件编码" min-width="150" />
         <el-table-column prop="paper_name" label="管件描述" min-width="250" />

lms/nladmin-ui/src/views/wms/stat/inbillquery/index2.vue

@@ -94,7 +94,7 @@
               @keyup.enter.native="crud.toQuery"
             />
           </el-form-item>
-          <el-form-item  label="订单行号">
+          <el-form-item label="订单行号">
             <el-input
               v-model="query.sale_order_name"
               size="mini"
@@ -209,6 +209,7 @@
         <el-table-column v-if="crud.query.is_all === '0'" show-overflow-tooltip prop="sap_pcsn" label="sap批次" :min-width="flexWidth('sap_pcsn',crud.data,'sap批次')" />
         <el-table-column show-overflow-tooltip prop="net_weight" label="净重" :formatter="crud.formatNum2" :min-width="flexWidth('net_weight',crud.data,'净重')" />
         <el-table-column show-overflow-tooltip prop="qty_unit_name" label="单位" :min-width="flexWidth('qty_unit_name',crud.data,'单位')" />
+        <el-table-column v-if="crud.query.is_all === '0'" show-overflow-tooltip prop="foil_container_name" label="生箔母卷" :min-width="flexWidth('foil_container_name',crud.data,'生箔母卷')" />
         <el-table-column show-overflow-tooltip prop="customer_name" label="客户编码" :min-width="flexWidth('customer_name',crud.data,'客户编码')" />
         <el-table-column show-overflow-tooltip prop="customer_description" label="客户名称" :min-width="flexWidth('customer_description',crud.data,'客户名称')" />
         <el-table-column show-overflow-tooltip prop="sale_order_name" label="销售订单" :min-width="flexWidth('sale_order_name',crud.data,'销售订单')" />