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 bcc0d5f8..0d2f5442 100644
Binary files a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/mdpb.xls and b/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/mdpb.xls differ
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