From 546efbc5998645ef845cb8eac373aa2c043a77e7 Mon Sep 17 00:00:00 2001
From: liuxy <lxy1605052545@163.com>
Date: Fri, 10 Jun 2022 18:04:09 +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

---
 nladmin-system/pom.xml                        |   7 ++
 .../rest/ProduceshiftorderController.java     |  26 ++++
 .../service/ProduceshiftorderService.java     |   6 +
 .../dto/ProduceshiftorderdetailDto.java       |   3 +
 .../impl/ProduceshiftorderServiceImpl.java    |  60 +++++++++
 .../order/service/wql/QPRODUCESHIFTORDER.wql  |  17 +++
 .../org/nl/acs/order/service/wql/order.xls    | Bin 197120 -> 198144 bytes
 qd/src/views/acs/order/AddDialog.vue          | 119 ++++++++++++++++--
 8 files changed, 230 insertions(+), 8 deletions(-)

diff --git a/nladmin-system/pom.xml b/nladmin-system/pom.xml
index 2419605..5aba8f1 100644
--- a/nladmin-system/pom.xml
+++ b/nladmin-system/pom.xml
@@ -26,6 +26,13 @@
             <version>6.6</version>
         </dependency>
 
+        <!--       Excel打印-->
+        <dependency>
+            <groupId>e-iceblue</groupId>
+            <artifactId>spire.xls</artifactId>
+            <version>3.11.2</version>
+        </dependency>
+
         <dependency>
             <groupId>org.mongodb</groupId>
             <artifactId>mongo-java-driver</artifactId>
diff --git a/nladmin-system/src/main/java/org/nl/acs/order/rest/ProduceshiftorderController.java b/nladmin-system/src/main/java/org/nl/acs/order/rest/ProduceshiftorderController.java
index fb1221b..7b15465 100644
--- a/nladmin-system/src/main/java/org/nl/acs/order/rest/ProduceshiftorderController.java
+++ b/nladmin-system/src/main/java/org/nl/acs/order/rest/ProduceshiftorderController.java
@@ -2,17 +2,25 @@
 package org.nl.acs.order.rest;
 
 
+import cn.hutool.core.util.ObjectUtil;
+import com.alibaba.fastjson.JSONObject;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.nl.acs.order.service.ProduceshiftorderService;
 import org.nl.annotation.Log;
+import org.nl.domain.LocalStorage;
+import org.nl.exception.BadRequestException;
+import org.nl.service.LocalStorageService;
+import org.nl.utils.SecurityUtils;
+import org.nl.wql.core.bean.WQLObject;
 import org.springframework.data.domain.Pageable;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
@@ -30,6 +38,8 @@ import java.util.Map;
 public class ProduceshiftorderController {
 
     private final ProduceshiftorderService produceshiftorderService;
+    private final LocalStorageService localStorageService;
+
 
     @GetMapping
     @Log("查询工单")
@@ -185,6 +195,22 @@ public class ProduceshiftorderController {
         return new ResponseEntity<>(produceshiftorderService.selectTemplateList(),HttpStatus.OK);
     }
 
+    @Log("上传Excel模板")
+    @ApiOperation("上传Excel模板")
+    @PostMapping({"/pictures"})
+    public ResponseEntity<Object> uploadTemplate(@RequestParam MultipartFile file) {
+        LocalStorage localStorage = this.localStorageService.create((String) null, file);
+        return new ResponseEntity<>(localStorage,HttpStatus.OK);
+    }
+
+    @Log("打印")
+    @ApiOperation("打印")
+    @PostMapping("/print")
+    public ResponseEntity<Object> print(@RequestBody JSONObject whereJson) {
+        produceshiftorderService.print(whereJson);
+        return new ResponseEntity<>(HttpStatus.OK);
+    }
+
 
 
 }
diff --git a/nladmin-system/src/main/java/org/nl/acs/order/service/ProduceshiftorderService.java b/nladmin-system/src/main/java/org/nl/acs/order/service/ProduceshiftorderService.java
index 5669204..9cc7657 100644
--- a/nladmin-system/src/main/java/org/nl/acs/order/service/ProduceshiftorderService.java
+++ b/nladmin-system/src/main/java/org/nl/acs/order/service/ProduceshiftorderService.java
@@ -2,6 +2,7 @@
 package org.nl.acs.order.service;
 
 import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import org.nl.acs.order.service.dto.ProduceshiftorderDto;
 import org.springframework.data.domain.Pageable;
 
@@ -227,4 +228,9 @@ public interface ProduceshiftorderService {
      */
     JSONArray selectTemplateList();
 
+    /**
+     * 打印
+     * @param whereJson
+     */
+    void print(JSONObject whereJson);
 }
diff --git a/nladmin-system/src/main/java/org/nl/acs/order/service/dto/ProduceshiftorderdetailDto.java b/nladmin-system/src/main/java/org/nl/acs/order/service/dto/ProduceshiftorderdetailDto.java
index 4e7681d..e9c2286 100644
--- a/nladmin-system/src/main/java/org/nl/acs/order/service/dto/ProduceshiftorderdetailDto.java
+++ b/nladmin-system/src/main/java/org/nl/acs/order/service/dto/ProduceshiftorderdetailDto.java
@@ -214,4 +214,7 @@ public class ProduceshiftorderdetailDto implements Serializable {
 
     /** 结束时间 */
     private String end_time;
+
+    /** 模板id */
+    private String template_id;
 }
diff --git a/nladmin-system/src/main/java/org/nl/acs/order/service/impl/ProduceshiftorderServiceImpl.java b/nladmin-system/src/main/java/org/nl/acs/order/service/impl/ProduceshiftorderServiceImpl.java
index e2a2e1b..fa26716 100644
--- a/nladmin-system/src/main/java/org/nl/acs/order/service/impl/ProduceshiftorderServiceImpl.java
+++ b/nladmin-system/src/main/java/org/nl/acs/order/service/impl/ProduceshiftorderServiceImpl.java
@@ -6,9 +6,12 @@ import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.excel.EasyExcel;
+import com.alibaba.excel.ExcelWriter;
+import com.alibaba.excel.write.metadata.WriteSheet;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.spire.xls.Workbook;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.nl.acs.device_driver.hailiang.hailiang_feeding_trunk.HaiLiangFeedingTrunkDeviceDriver;
@@ -33,6 +36,10 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.servlet.http.HttpServletResponse;
+import java.awt.print.PageFormat;
+import java.awt.print.Paper;
+import java.awt.print.PrinterException;
+import java.awt.print.PrinterJob;
 import java.io.IOException;
 import java.util.*;
 
@@ -417,6 +424,8 @@ public class ProduceshiftorderServiceImpl implements ProduceshiftorderService, A
             String labeling_template = jsonObject.getString("labeling_template");
             //优先级
             String priority = jsonObject.getString("priority");
+            //优先级
+            String template_id = jsonObject.getString("template_id");
 
             ProduceshiftorderdetailDto detaildto = new ProduceshiftorderdetailDto();
             detaildto.setOrder_id(order_id);
@@ -442,6 +451,7 @@ public class ProduceshiftorderServiceImpl implements ProduceshiftorderService, A
             detaildto.setLettering_icon(lettering_icon);
             detaildto.setStrap_number(strap_number);
             detaildto.setStrap_tailint_number(strap_tailint_number);
+            detaildto.setTemplate_id(template_id);
             produceshiftorderdetailService.create(detaildto);
         }
     }
@@ -860,4 +870,54 @@ public class ProduceshiftorderServiceImpl implements ProduceshiftorderService, A
         return result;
     }
 
+    @Override
+    public void print(JSONObject whereJson) {
+        String order_id = whereJson.getString("order_id");
+        String template_id = whereJson.getString("template_id");
+
+        WQLObject mst = WQLObject.getWQLObject("acs_produceshiftorder"); // 主表
+
+        // 1.根据明细找主表
+        JSONObject jsonMst = mst.query("order_id = '" + order_id + "' and is_deleted ='0'").uniqueResult(0);
+
+        // 2.根据明细template_id 找到对应的模板
+        JSONObject jsonStor = WQL.getWO("QPRODUCESHIFTORDER").addParam("flag", "3").addParam("storage_id", template_id).process().uniqueResult(0);
+
+        // 3.创建模板工作簿 并指定储存路径
+        String path = jsonStor.getString("path");
+        String pathName = "D:\\work\\"+jsonStor.getString("name")+ jsonStor.getString("storage_id") + ".xlsx";
+        ExcelWriter workBook = EasyExcel.write(pathName).withTemplate(path).build();
+        // 获取第一个sheet
+        WriteSheet sheet = EasyExcel.writerSheet().build();
+
+        // 4.将主表当中的属性填充到excel当中
+        HashMap<String, String> map = new HashMap<>();
+        map.put("material_name",jsonMst.getString("material_code"));
+        map.put("qty",jsonMst.getString("qty"));
+        map.put("tttt",jsonMst.getString("qty"));
+        workBook.fill(map, sheet);
+        workBook.finish();
+
+        // 5.打印
+        Workbook workbook = new Workbook();
+        workbook.loadFromFile(pathName);
+        //创建 PrinterJob对象
+        PrinterJob printerJob = PrinterJob.getPrinterJob();
+        //指定打印页面为默认大小和方向
+        PageFormat pageFormat = printerJob.defaultPage();
+        //设置相关打印选项
+        Paper paper = pageFormat.getPaper();
+        paper.setSize(1240,1754);
+        paper.setImageableArea(0, 0, 1240, 1754);
+        pageFormat.setPaper(paper);
+        printerJob.setCopies(1);
+        printerJob.setPrintable(workbook, pageFormat);
+        try {
+            // 执行打印
+            printerJob.print();
+        } catch (PrinterException e) {
+            e.printStackTrace();
+        }
+    }
+
 }
\ No newline at end of file
diff --git a/nladmin-system/src/main/java/org/nl/acs/order/service/wql/QPRODUCESHIFTORDER.wql b/nladmin-system/src/main/java/org/nl/acs/order/service/wql/QPRODUCESHIFTORDER.wql
index f2f6cee..5d650c6 100644
--- a/nladmin-system/src/main/java/org/nl/acs/order/service/wql/QPRODUCESHIFTORDER.wql
+++ b/nladmin-system/src/main/java/org/nl/acs/order/service/wql/QPRODUCESHIFTORDER.wql
@@ -16,6 +16,7 @@
 	输入.flag					        TYPEAS s_string
     输入.template_code                   TYPEAS s_string
     输入.template_address                TYPEAS s_string
+    输入.storage_id                      TYPEAS s_string
 
 [临时表]
 	--这边列出来的临时表就会在运行期动态创建
@@ -68,4 +69,20 @@
     	ENDPAGEQUERY
      ENDIF
 
+	IF 输入.flag = "3"
+    	QUERY
+            SELECT
+    	        *
+            FROM
+    	        tool_local_storage
+            WHERE
+    	        1=1
+    	    OPTION 输入.storage_id <> ""
+    	        storage_id = 输入.storage_id
+    	    ENDOPTION
+
+    		ENDSELECT
+    	ENDQUERY
+     ENDIF
+
 
diff --git a/nladmin-system/src/main/java/org/nl/acs/order/service/wql/order.xls b/nladmin-system/src/main/java/org/nl/acs/order/service/wql/order.xls
index f34fb479e481fbb17227f001b3c95d882f64201f..1abfe24a396269c5ef34b12871e21cfa6b2591e1 100644
GIT binary patch
delta 9526
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
V2_|F2yxo#oO6KP!t$j=J{~MK+=so}d

delta 9318
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
Bhh_i(

diff --git a/qd/src/views/acs/order/AddDialog.vue b/qd/src/views/acs/order/AddDialog.vue
index 695413e..a763957 100644
--- a/qd/src/views/acs/order/AddDialog.vue
+++ b/qd/src/views/acs/order/AddDialog.vue
@@ -157,12 +157,19 @@
           </el-select>
         </template>
       </el-table-column>
-<!--      <el-table-column prop="priority" label="优先级" align="center">-->
-<!--        <template scope="scope">-->
-<!--          <el-input v-show="!scope.row.edit" v-model="scope.row.priority" size="mini" />-->
-<!--          <span v-show="scope.row.edit">{{ scope.row.priority }}</span>-->
-<!--        </template>-->
-<!--      </el-table-column>-->
+      <!--      <el-table-column prop="priority" label="优先级" align="center">-->
+      <!--        <template scope="scope">-->
+      <!--          <el-input v-show="!scope.row.edit" v-model="scope.row.priority" size="mini" />-->
+      <!--          <span v-show="scope.row.edit">{{ scope.row.priority }}</span>-->
+      <!--        </template>-->
+      <!--      </el-table-column>-->
+      <el-table-column prop="template_id" label="上传模板" align="center" width="200px">
+        <template scope="scope">
+          <el-input v-model="scope.row.template_id" size="mini" style="width: 140px" disabled>
+            <el-button slot="append" icon="el-icon-plus" @click="openDialog(scope)" />
+          </el-input>
+        </template>
+      </el-table-column>
 
       <el-table-column v-if="crud.status.cu > 0" align="center" label="操作" width="170" fixed="right">
         <template scope="scope">
@@ -195,6 +202,38 @@
       </el-table-column>
     </el-table>
 
+    <!--    Excel模板上传弹出框-->
+    <el-dialog
+      title="提示"
+      :visible.sync="dialogUpload"
+      append-to-body
+      width="30%"
+      @close="handleClose"
+    >
+      <el-upload
+        ref="upload"
+        :limit="1"
+        :headers="headers"
+        class="upload-demo"
+        :auto-upload="false"
+        drag
+        :action="baseApi +'/api/produceshiftorder/pictures'"
+        multiple
+        :before-upload="beforeUpload"
+        :on-exceed="handleExceed"
+        :on-error="handleError"
+        :on-success="handleSuccess"
+      >
+        <i class="el-icon-upload" />
+        <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
+        <div slot="tip" class="el-upload__tip">只能上传不超过50MB的文件！</div>
+      </el-upload>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="info" @click="dialogUpload = false">取消</el-button>
+        <el-button style="margin-left: 10px;" size="small" type="success" @click="submitUpload">上传到服务器</el-button>
+      </div>
+    </el-dialog>
+
     <MaterDtl
       :dialog-show.sync="materShow"
       :is-single="true"
@@ -212,10 +251,12 @@
 <script>
 import crudProduceshiftorder from '@/api/acs/order/order'
 import MaterDtl from '@/views/acs/order/MaterDialog'
+import { getToken } from '@/utils/auth'
+import { mapGetters } from 'vuex'
 import CustomerDtl from '@/views/acs/order/CustomerDialog'
 import CRUD, { crud, form } from '@crud/crud'
 const defaultForm = { tableData: [], order_code: null, material_code: null, material_spec: null,
-  outer_diameter: null, wall_thickness: null }
+  outer_diameter: null, wall_thickness: null, detail_count: 0 }
 
 export default {
   name: 'AddDialog',
@@ -240,10 +281,14 @@ export default {
   },
   data() {
     return {
+      headers: { 'Authorization': getToken() },
       dialogVisible: false,
       dialogVisible2: false,
+      dialogUpload: false,
       materShow: false,
       customerShow: false,
+      dtlJson: null,
+      dtlIndex: null,
       dtlShow: false,
       templateList: [],
       opendtlParam: null,
@@ -291,6 +336,12 @@ export default {
       }
     }
   },
+  computed: {
+    ...mapGetters([
+      'baseApi',
+      'fileUploadApi'
+    ])
+  },
   created() {
     debugger
     crudProduceshiftorder.selectTemplateList().then(data => {
@@ -363,13 +414,65 @@ export default {
       this.nowrow = row
     },
     async insertdtl() {
-      this.form.tableData.push({ material_code: '', priority: '1' })
+      this.form.tableData.push({ material_code: '', priority: '1', customer_code: '' })
       this.form.detail_count = this.form.tableData.length
     },
     deleteRow(index, rows) {
       this.form.total_qty = parseFloat(this.form.total_qty) - parseFloat(rows[index].plan_qty)
       rows.splice(index, 1)
       this.form.detail_count = this.form.tableData.length
+    },
+    openDialog(val) {
+      debugger
+      if (val.row.customer_code === '') {
+        return this.crud.notify('请选择客户', CRUD.NOTIFICATION_TYPE.INFO)
+      }
+      this.dtlJson = val.row
+      this.dtlIndex = val.$index
+      this.dialogUpload = true
+    },
+    handleClose() {
+      this.dialogUpload = false
+    },
+    beforeUpload(file) {
+      let isLt2M = true
+      isLt2M = file.size / 1024 / 1024 < 50
+      if (!isLt2M) {
+        this.loading = false
+        this.$message.error('上传文件大小不能超过 50MB!')
+      }
+      return isLt2M
+    },
+    handleExceed(files, fileList) {
+      this.crud.notify('当前限制最多能选择 1 个文件', CRUD.NOTIFICATION_TYPE.WARNING)
+    },
+    // 监听上传失败
+    handleError(e, file, fileList) {
+      const msg = JSON.parse(e.message)
+      this.$notify({
+        title: msg.message,
+        type: 'error',
+        duration: 2500
+      })
+      this.loading = false
+    },
+    handleSuccess(files, fileList) {
+      debugger
+      this.dtlJson.template_id = files.id
+      const arr = this.form.tableData
+      for (let i = 0; i < arr.length; i++) {
+        if (i === this.dtlIndex) {
+          arr[i] = this.dtlJson
+        }
+      }
+      this.form.tableData = arr
+      this.crud.notify('上传成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
+      this.$refs.upload.clearFiles()
+      this.dialogUpload = false
+      this.crud.toQuery()
+    },
+    submitUpload() {
+      const flag = this.$refs.upload.submit()
     }
   }
 }