From 92206a6711c6e45b81e3653ef1a39553d1f23470 Mon Sep 17 00:00:00 2001
From: liuxy <lxy1605052545@163.com>
Date: Tue, 12 Jul 2022 14:48:33 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../org/nl/wms/basedata/master/wql/mdpb.xls   | Bin 199680 -> 199680 bytes
 .../pf/service/impl/FormulaServiceImpl.java   |  19 +++++++++++++++---
 .../impl/ProductmaterialsetServiceImpl.java   |   2 ++
 .../pf/wql/QPD_PD_PRODUCTMATERIALSET01.wql    |   1 +
 mes/qd/src/views/wms/pf/formula/PicDialog.vue |   4 ++--
 .../wms/pf/productmaterialset/SetMaterial.vue |   5 +++++
 6 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/mdpb.xls b/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/mdpb.xls
index bcc0d5f8e92a272ea3964d4fa8d114cdb2490e62..0d2f5442a36a00061b999b358450f1600f959560 100644
GIT binary patch
delta 8902
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
Pbl_?jPC7wHuut?K8<wU4

delta 8879
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
SsY&jK&sG)cQcXlVO#ct_E|LrY

diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/FormulaServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/FormulaServiceImpl.java
index 4c8622cb..30a718a0 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/FormulaServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/FormulaServiceImpl.java
@@ -500,15 +500,28 @@ public class FormulaServiceImpl implements FormulaService {
         JSONObject json98jj = paraTab.query("material_id = '" + material_id + "' and para_code = 'QM001'").uniqueResult(0);
         JSONObject json92jj = paraTab.query("material_id = '" + material_id + "' and para_code = 'QM002'").uniqueResult(0);
 
+        // 生成二维码
+        String create_time = jsonWork.getString("create_time");
+        BarcodeFormat qrCode = BarcodeFormat.QR_CODE;
+        BufferedImage imageCode = QrCodeUtil.generate(jsonWork.getString("workorder_id")+"#"+jsonMater.getString("ext_id")+"#"+jsonWork.getString("pcsn")+"#"+jsonWork.getString("workorder_qty")+"#"+create_time.substring(0,10), qrCode, 60, 60);
+        Workbook workbook = new Workbook();
+        // 获取模板地址
+        String template = SpringContextHolder.getBean(ParamServiceImpl.class).findByCode("EXCEL_PATH").getValue();
+        String code_template = SpringContextHolder.getBean(ParamServiceImpl.class).findByCode("CODE_EXCEL_PATH").getValue();
+
+        workbook.loadFromFile(template);
+        //获取第一张工作表并将二维码流put进去
+        Worksheet worksheet = workbook.getWorksheets().get(0);
+        worksheet.getPictures().add(1,1,imageCode);
+        workbook.saveToFile(code_template);
+
         // 设置文件名和防止乱码现象
         String fileName = URLEncoder.encode(jsonMater.getString("material_code")+"---"+jsonMst.getString("pcsn"), "UTF-8");
         response.setHeader("Content-Disposition", "attachment; filename*=UTf-8''"+fileName+".xlsx");
         // 获取输出流
         ServletOutputStream outputStream = response.getOutputStream();
-        String template = SpringContextHolder.getBean(ParamServiceImpl.class).findByCode("EXCEL_PATH").getValue();
-//        String template = "D:\\work\\工艺控制卡模板.xlsx";
         // 创建模板工作簿
-        ExcelWriter workBook = EasyExcel.write(outputStream, DataDto.class).withTemplate(template).build();
+        ExcelWriter workBook = EasyExcel.write(outputStream, DataDto.class).withTemplate(code_template).build();
         // 获取第一个sheet
         WriteSheet sheet = EasyExcel.writerSheet().build();
 
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/ProductmaterialsetServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/ProductmaterialsetServiceImpl.java
index 7492f84e..792e71c2 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/ProductmaterialsetServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/ProductmaterialsetServiceImpl.java
@@ -117,6 +117,7 @@ public class ProductmaterialsetServiceImpl implements ProductmaterialsetService
                 setJson.put("set_material_id", (String) json.getString("material_id"));
                 setJson.put("set_prior_level", (String) json.getString("set_prior_level"));
                 setJson.put("is_calculate_forming", json.getString("is_calculate_forming"));
+                setJson.put("add_rate", json.getString("add_rate"));
                 setTab.insert(setJson);
             }
         } else {
@@ -141,6 +142,7 @@ public class ProductmaterialsetServiceImpl implements ProductmaterialsetService
                 setJson.put("set_material_id", (String) json.getString("material_id"));
                 setJson.put("set_prior_level", (String) json.getString("set_prior_level"));
                 setJson.put("is_calculate_forming", json.getString("is_calculate_forming"));
+                setJson.put("add_rate", json.getString("add_rate"));
                 setTab.insert(setJson);
             }
         }
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/wql/QPD_PD_PRODUCTMATERIALSET01.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/wql/QPD_PD_PRODUCTMATERIALSET01.wql
index 85e929d5..3946cdce 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/wql/QPD_PD_PRODUCTMATERIALSET01.wql
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/wql/QPD_PD_PRODUCTMATERIALSET01.wql
@@ -99,6 +99,7 @@
 			    mset.set_type,
 			    mset.set_prior_level,
 			    mset.is_calculate_forming,
+			    mset.add_rate,
 			    c.class_name,
 			    ext.old_mark
             FROM
diff --git a/mes/qd/src/views/wms/pf/formula/PicDialog.vue b/mes/qd/src/views/wms/pf/formula/PicDialog.vue
index 1163976f..91ccd79f 100644
--- a/mes/qd/src/views/wms/pf/formula/PicDialog.vue
+++ b/mes/qd/src/views/wms/pf/formula/PicDialog.vue
@@ -15,7 +15,7 @@
 <!--        <el-input v-model="query.formula_id" clearable size="mini" placeholder="物料id" disabled style="width: 200px;" class="filter-item" @keyup.enter.native="crud.toQuery" />-->
       </div>
       <crudOperation :permission="permission">
-        <el-button
+<!--        <el-button
           slot="right"
           class="filter-item"
           type="warning"
@@ -26,7 +26,7 @@
           @click="printCard"
         >
           打印
-        </el-button>
+        </el-button>-->
       </crudOperation>
     </div>
     <!--表格渲染-->
diff --git a/mes/qd/src/views/wms/pf/productmaterialset/SetMaterial.vue b/mes/qd/src/views/wms/pf/productmaterialset/SetMaterial.vue
index 65876ac6..9bc8aa14 100644
--- a/mes/qd/src/views/wms/pf/productmaterialset/SetMaterial.vue
+++ b/mes/qd/src/views/wms/pf/productmaterialset/SetMaterial.vue
@@ -96,6 +96,11 @@
           </el-select>
         </template>
       </el-table-column>
+      <el-table-column prop="add_rate" label="允许添加量" align="center">
+        <template slot-scope="scope">
+          <el-input-number v-model="form.tableData[scope.$index].add_rate" :precision="2" :step="0.1" :max="100" :min="0" :placeholder="100.00" :controls="false"></el-input-number>
+        </template>
+      </el-table-column>
       <el-table-column v-permission="['admin','receivemst:edit','receivemst:del']" label="操作" width="80px" align="center">
         <template slot-scope="scope">
           <el-button