From b4adff68a07b783fc90da1c9370d8be5f383e700 Mon Sep 17 00:00:00 2001
From: 黎星凯 <13949086503@163.com>
Date: 星期三, 08 五月 2024 13:46:34 +0800
Subject: [PATCH] 20240528修改: bug41、42、43修改 领用单(分发单)，调拨单，流程优化

---
 consum-base/src/main/java/com/consum/base/util/ExcelStyleUtil.java                     |  187 +++++++++++
 consum-base/src/main/java/com/consum/base/service/core/LWhFormTransferCoreService.java |    3 
 deploy-jar-single/src/main/resources/import/调拨入库单old.xls                               |    0 
 admin-web/src/api/stock/transfer.js                                                    |   10 
 deploy-jar-single/src/main/resources/import/调拨入库单.xls                                  |    0 
 consum-base/src/main/java/com/consum/base/service/LWhFormTransferService.java          |    2 
 admin-web/src/views/mixins/listPage.js                                                 |   12 
 admin-web/src/views/stock/transfer/transferApplication/edit.vue                        |    2 
 admin-web/src/views/stock/transfer/transferApplication/uploadPage.vue                  |  185 +++++++++++
 admin-web/src/views/stock/transfer/transferissue/index.vue                             |    8 
 consum-base/src/main/java/com/consum/base/service/impl/LWhFormTransferServiceImpl.java |   21 +
 admin-web/src/views/stock/transfer/transferApplication/index.vue                       |   65 +++
 consum-base/src/main/java/com/consum/base/controller/LWhFormTransferController.java    |  216 +++++++++----
 deploy-jar-single/src/main/resources/import/调拨入库单1.xls                                 |    0 
 admin-web/src/views/departmentitem/itemdis/distribution/uploadPage.vue                 |  185 +++++++++++
 admin-web/src/views/departmentitem/itemdis/distribution/edit.vue                       |    3 
 admin-web/src/views/departmentitem/itemdis/distribution/index.vue                      |   28 +
 17 files changed, 843 insertions(+), 84 deletions(-)

diff --git a/admin-web/src/api/stock/transfer.js b/admin-web/src/api/stock/transfer.js
index 405b2dc..a033036 100644
--- a/admin-web/src/api/stock/transfer.js
+++ b/admin-web/src/api/stock/transfer.js
@@ -8,6 +8,16 @@
     data,
   });
 }
+
+// 鍗曟嵁瀵煎叆
+export function transferImport(data) {
+  return request({
+    url: '/pc/l/wh/form/transfer/import',
+    method: 'post',
+    data,
+  });
+}
+
 // 鍒楄〃
 export function transferList(params) {
   return request({
diff --git a/admin-web/src/views/departmentitem/itemdis/distribution/edit.vue b/admin-web/src/views/departmentitem/itemdis/distribution/edit.vue
index b5de415..d85c8d9 100644
--- a/admin-web/src/views/departmentitem/itemdis/distribution/edit.vue
+++ b/admin-web/src/views/departmentitem/itemdis/distribution/edit.vue
@@ -331,6 +331,7 @@
         operatorName: [{required: true, message: '璇峰～鍐欓鍙栦汉', trigger: 'blur'}],
         tel: [{required: true, message: '璇峰～鍐欒仈绯荤數璇�', trigger: 'blur'}],
         createTime: [{required: true, message: '璇烽�夋嫨鍒嗗彂鏃堕棿', trigger: 'change'}],
+        // 澧炲姞浜嗗垎鍙戠殑涓棿娴佺▼锛岃嫢鍚庢湡搴忓彿姝ゆ祦绋嬶紙涓嬭浇鍒嗗彂鍗曪紝涓婁紶鍒嗗彂鍗曪級鍒欐敞鎺塸rocureDoc
         procureDoc: [{required: true, message: '璇蜂笂浼犲鎵规墜缁�', trigger: 'change'}],
         baseCategoryIds: [{required: true, message: '璇烽�夋嫨', trigger: 'change'}],
         baseGoodsTemplateId: [{required: true, message: '璇烽�夋嫨', trigger: 'change'},{validator: checkGoodsTemplateId, trigger: ['blur', 'change']}],
@@ -557,7 +558,7 @@
               .catch((err) => {
                 this.loading = false
                 console.log('create err', err);
-                this.$message.error('淇濆瓨澶辫触');
+                //this.$message.error('淇濆瓨澶辫触');
               });
         } else {
           this.$message.error('鏍￠獙鏈�氳繃锛岃妫�鏌ャ��');
diff --git a/admin-web/src/views/departmentitem/itemdis/distribution/index.vue b/admin-web/src/views/departmentitem/itemdis/distribution/index.vue
index bda50a4..b994d13 100644
--- a/admin-web/src/views/departmentitem/itemdis/distribution/index.vue
+++ b/admin-web/src/views/departmentitem/itemdis/distribution/index.vue
@@ -21,8 +21,21 @@
                         <div class="card-header-left">
                           <span>鍒嗗彂鍗曞彿锛�</span>
                           <span class="value">{{ item.businessFormCode }}</span>
+
+                          <span style="padding-left: 30px">鍒嗗彂鐘舵�侊細</span>
+                          <span style="color: red" v-if="item.states === 0"  class="value">鏈垎鍙�</span>
+                          <span v-if="item.states === 2"  class="value">宸插垎鍙�</span>
                         </div>
                         <div class="card-header-right">
+                          <!-- 瀵煎嚭鍗曞瓙 -->
+                          <el-button v-if="item.states === 0" name="涓嬭浇" site="form" type="primary" size="mini" @click="handleDetail(item)">
+                            涓嬭浇
+                          </el-button>
+
+                          <el-button v-if="item.states === 0" name="涓婁紶" site="form" type="primary" size="mini" @click="handleUploadPage(item)">
+                            涓婁紶
+                          </el-button>
+
                           <el-button name="鏌ョ湅璇︽儏" site="form" type="primary" size="mini" @click="handleDetail(item)">
                             鏌ョ湅璇︽儏
                           </el-button>
@@ -32,7 +45,7 @@
                         <div class="box"><span class="span-two">閮ㄩ棬锛�</span>{{ item.inWarehouseName }}</div>
                         <div class="box"><span class="span-two">鍒嗗彂浜猴細</span>{{ item.outOperatorName }}</div>
                         <div class="box">
-                          <span class="span-two">鍒嗗彂鏃堕棿锛�</span>{{ item.createTime | formatTime }}
+                          <span class="span-two">鍒嗗彂鏃堕棿锛�</span>{{ item.inTime | formatTime }}
                         </div>
                       </div>
                       <div class="card-end">
@@ -67,6 +80,16 @@
         </el-row>
       </el-card>
     </el-container>
+
+    <!-- 涓婁紶鍒嗗彂鍗曟枃浠�-->
+    <uploadPage
+      v-if="uploadPageSetting.show"
+      :setting="uploadPageSetting"
+      ref="uploadRef"
+      @close="uploadPageSetting.show = false"
+      @search="refreshData"
+    ></uploadPage>
+
     <!--娣诲姞/缂栬緫寮圭獥-->
     <edit
         v-if="editSetting.show"
@@ -91,13 +114,14 @@
 import myImport from '@/views/components/myImport';
 import edit from './edit';
 import detail from './detail';
+import uploadPage from './uploadPage';
 import listPage from '@/views/mixins/listPage';
 import {getUserDetail} from "@/utils/auth";
 
 export default {
   name: 'index',
   mixins: [listPage],
-  components: {MyButton, myImport, edit, detail},
+  components: {MyButton, myImport, edit, detail,uploadPage},
   data() {
     return {
       loading: false,
diff --git a/admin-web/src/views/departmentitem/itemdis/distribution/uploadPage.vue b/admin-web/src/views/departmentitem/itemdis/distribution/uploadPage.vue
new file mode 100644
index 0000000..170f7b3
--- /dev/null
+++ b/admin-web/src/views/departmentitem/itemdis/distribution/uploadPage.vue
@@ -0,0 +1,185 @@
+<template>
+  <win-md class="stock-detail" title="瀵煎叆鍒嗗彂鍗曟枃浠�" @close="close" :width="'800px'" :loading="loading">
+
+    <upload ref="uploadRef" :values="fileList" :settings="uploadSettings" @on-change="uploadChange"></upload>
+
+
+    <el-button name="纭畾鍒嗗彂" style="float: right;margin-right: 50px;margin-top: 20px" site="form" type="primary" size="mini" @click="distribute()">
+      纭畾鍒嗗彂
+    </el-button>
+
+  </win-md>
+</template>
+<script>
+import winMd from '@/components/win/win-md';
+import * as DateFormatter from '@/utils/DateFormatter';
+import {getDownUrl, getUploadUrl} from '@/utils/base';
+import Viewer from 'viewerjs';
+import 'viewerjs/dist/viewer.css';
+import de from "element-ui/src/locale/lang/de";
+import upload from '@/components/upload/index';
+let viewer = null;
+
+
+import {transferAdd, transferImport} from '@/api/stock/transfer';
+
+export default {
+  computed: {
+    de() {
+      return de
+    }
+  },
+  components: {winMd,upload},
+  props: {
+    setting: {
+      type: Object,
+      default: () => {
+      },
+    },
+  },
+  data() {
+    return {
+      procureDoc:"",
+
+      uploadSettings: {
+        title: '涓婁紶',
+        max: 20, // 鏈�澶уぇ灏忥紝鍗曚綅M
+        num: 10, // 鏀寔涓婁紶鍥剧墖涓暟
+        tip: '', // 鎻愮ず 榛樿锛歚鍙兘涓婁紶${this.defaultSettings.num}涓�${this.defaultSettings.accept}鏂囦欢锛屼笖涓嶈秴杩�${this.defaultSettings.max}kb`
+        uploadUrl: getUploadUrl(), // 涓婁紶璺緞
+        multiple: true, // 鏄惁鏀寔鎵归噺涓婁紶
+        disabled: false, // 鏄惁绂佺敤
+      },
+
+
+      loading: true,
+      fileList: [],
+      detail: {
+        baseCategoryName: '',
+        businessFormCode: '',
+        goodsTemplateName: '',
+        procureDoc: '',
+        agencyId: '',
+        agencyName: '',
+        states: '',
+        createName: '',
+        time: '',
+        procureGoods: [{}, {}],
+        fileKey: Math.random(),
+      },
+    };
+  },
+  filters: {
+    formatTime(time) {
+      if (!time) return '-';
+      return DateFormatter.LongToDateTime(time);
+    },
+    formatPrice(price) {
+      return price / 100
+    }
+  },
+  created() {
+    this.loading = false
+    this.fileList = []
+  },
+  methods: {
+    initPreviewImg() {
+      if (viewer != null) {
+        viewer.destroy();
+      }
+      const ViewerDom = document.querySelector('#uploadPreviewImages');
+      viewer = new Viewer(ViewerDom, {});
+    },
+    handlePreview(file) {
+      if (!this.checkImg(file.name)) {
+        return false;
+      }
+      let index = 0;
+      for (let i = 0; i < this.fileList.length; i++) {
+        const f = this.fileList[i];
+        if (this.checkImg(f.name)) {
+          if (file.id == f.id) {
+            break;
+          }
+          index++;
+        }
+      }
+      // this.fileList.forEach((f, i) => {
+      //   if (file.uid == f.uid) {
+      //     index = i
+      //   }
+      // })
+      // document.querySelector('#uploadPreviewImages').children[0].click()
+      viewer.view(index);
+    },
+    checkImg(name) {
+      const suffix = name.substring(name.lastIndexOf('.'), name.length);
+      const imgArray = ['.jpg', '.jpeg', '.png', '.bmp'];
+      if (imgArray.indexOf(suffix) < 0) {
+        return false;
+      }
+      return true;
+    },
+    getUrl(path) {
+      if (path.substr(0, 7).toLowerCase() == 'http://' || path.substr(0, 8).toLowerCase() == 'https://') {
+        return path;
+      } else {
+        return getDownUrl() + path;
+      }
+    },
+    close() {
+      this.$emit('close');
+    },
+
+    // 涓婁紶
+    uploadChange() {
+      let arr = this.$refs.uploadRef.fileList;
+      let procureDoc = JSON.stringify(arr);
+      console.log(procureDoc)
+      this.procureDoc = procureDoc;
+
+      let pro = this.setting.id
+      console.log(pro)
+    },
+    /**
+     * 纭畾鍒嗗彂
+     */
+    distribute(){
+      let id = this.setting.id
+      let procureDoc = this.procureDoc
+      if(id == null || procureDoc === ''){
+        this.$message.error('璇蜂笂浼犲浘鐗囷紒');
+        return
+      }
+      let opTime = DateFormatter.formatDate(new Date(), 'yyyyMMddhhmmss');
+
+      transferImport({"idStr":id,"procureDoc":procureDoc,"opTime":opTime,"type":"1"})
+        .then((res) => {
+          this.loading = false
+          this.$message.success('淇濆瓨鎴愬姛锛�');
+          this.close();
+          this.$emit('search');
+        })
+        .catch((err) => {
+          this.loading = false
+          console.log('edit err', err);
+          this.$message.error('淇濆瓨澶辫触');
+        });
+
+
+    }
+
+
+  },
+};
+</script>
+<style lang="scss" scoped>
+@import url(../../../../styles/store.scss);
+
+.card3 {
+  padding: 10px;
+  margin-top: 10px;
+  border-radius: 2px;
+  background: #ffffff;
+}
+</style>
diff --git a/admin-web/src/views/mixins/listPage.js b/admin-web/src/views/mixins/listPage.js
index 5054212..c7fc1c5 100644
--- a/admin-web/src/views/mixins/listPage.js
+++ b/admin-web/src/views/mixins/listPage.js
@@ -16,6 +16,12 @@
         orgId: '',
         show: false,
       },
+      uploadPageSetting: {
+        title: '涓婁紶椤甸潰',
+        id: '',
+        orgId: '',
+        show: false,
+      },
       detailSetting: {
         title: '璇︽儏',
         id: '',
@@ -81,6 +87,12 @@
       this.detailSetting.title = '璇︽儏';
       this.detailSetting.show = true;
     },
+    // 瀵煎叆
+    handleUploadPage(row) {
+      this.uploadPageSetting.id = row.id;
+      this.uploadPageSetting.title = '瀵煎叆';
+      this.uploadPageSetting.show = true;
+    },
     // 鍒嗛〉
     handleSizeChange(pageSize) {
       this.pageSize = pageSize;
diff --git a/admin-web/src/views/stock/transfer/transferApplication/edit.vue b/admin-web/src/views/stock/transfer/transferApplication/edit.vue
index cc22615..d32845a 100644
--- a/admin-web/src/views/stock/transfer/transferApplication/edit.vue
+++ b/admin-web/src/views/stock/transfer/transferApplication/edit.vue
@@ -237,7 +237,7 @@
       rules: {
         outAgencyId: [{ required: true, message: '璇烽�夋嫨', trigger: 'change' }],
         createTime: [{ required: true, message: '璇烽�夋嫨', trigger: 'change' }],
-        procureDoc: [{ required: true, message: '璇蜂笂浼犺皟鎷ㄦ墜缁�', trigger: 'change' }],
+        // procureDoc: [{ required: true, message: '璇蜂笂浼犺皟鎷ㄦ墜缁�', trigger: 'change' }],
         baseCategoryIds: [{ required: true, message: '璇烽�夋嫨', trigger: 'change' }],
         baseGoodsTemplateId: [{ required: true, message: '璇烽�夋嫨', trigger: 'change' },{ validator: checkGoodsTemplateId, trigger: ['blur', 'change'] }],
         modelsIds: [{ required: true, message: '璇烽�夋嫨', trigger: 'change' }],
diff --git a/admin-web/src/views/stock/transfer/transferApplication/index.vue b/admin-web/src/views/stock/transfer/transferApplication/index.vue
index af1e2c1..3b16249 100644
--- a/admin-web/src/views/stock/transfer/transferApplication/index.vue
+++ b/admin-web/src/views/stock/transfer/transferApplication/index.vue
@@ -21,7 +21,8 @@
                         <div class="card-header-left">
                           <span>璋冩嫧鍗曞彿锛�</span>
                           <span class="value">{{ item.businessFormCode }}</span>
-                          <div v-if="item.states == 0" class="states states-warning">寰呭嚭搴�</div>
+                          <div v-if="item.states == 0 && item.procureDoc !=null" class="states states-warning">寰呭嚭搴�</div>
+                          <div v-if="item.states == 0 && item.procureDoc ==null" class="states states-warning">寰呮彁浜�</div>
                           <div v-if="item.states == 1" class="states states-warning">寰呮帴鏀�</div>
                           <div v-if="item.states == 2" class="states states-success">宸叉帴鏀�</div>
                           <div v-if="item.states == 4" class="states states-info">宸叉挙閿�</div>
@@ -35,6 +36,22 @@
                             @click="handleIncome(item)"
                             >鍏ュ簱</el-button
                           >
+
+                          <el-button v-if="item.states == 0 && item.procureDoc ==null" site="form" type="primary" size="mini"
+                                     @click="handleExport('transferExport',`璋冩嫧鍗�-${item.businessFormCode}`, {id:item.id,type:0})"
+                          >涓嬭浇
+                          </el-button
+                          >
+
+                          <el-button
+                            v-if="item.states == 0 && item.procureDoc ==null"
+                            site="form"
+                            type="primary"
+                            size="mini"
+                            @click="handleUploadPage(item)"
+                          >涓婁紶</el-button
+                          >
+
                           <el-button
                             v-if="item.states == 0"
                             site="form"
@@ -103,6 +120,16 @@
         </el-row>
       </el-card>
     </el-container>
+
+    <!-- 涓婁紶鍒嗗彂鍗曟枃浠�-->
+    <uploadPage
+      v-if="uploadPageSetting.show"
+      :setting="uploadPageSetting"
+      ref="uploadRef"
+      @close="uploadPageSetting.show = false"
+      @search="refreshData"
+    ></uploadPage>
+
     <!--娣诲姞/缂栬緫寮圭獥-->
     <edit
       v-if="editSetting.show"
@@ -129,11 +156,14 @@
 import listPage from '@/views/mixins/listPage';
 import transfer from '@/views/mixins/transfer';
 import SettingIplatform from '@/utils/settingIplatform';
+import uploadPage from './uploadPage';
+import * as dataExport from "@/api/exportExcel";
+import {downLoad} from "@/utils/base";
 
 export default {
   name: 'index',
   mixins: [listPage, transfer],
-  components: { MyButton, myImport, edit, detail },
+  components: { MyButton, myImport, edit, detail,uploadPage },
   data() {
     return {
       loading: false,
@@ -255,6 +285,37 @@
         });
       });
     },
+    // 瀵煎叆
+    handleUploadPage(row) {
+      this.uploadPageSetting.id = row.id;
+      this.uploadPageSetting.title = '瀵煎叆';
+      this.uploadPageSetting.show = true;
+    },
+    /**
+     * 瀵煎嚭璋冩嫧鍏ュ簱鍗�
+     * @param api
+     * @param fileName
+     * @param params
+     */
+    handleExport(api, fileName, params) {
+      let loading = this.$loading({
+        lock: true,
+        text: '瀵煎嚭涓紝璇风◢鍊�...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)',
+      });
+      // 鍒ゆ柇鎬绘潯鏁版槸鍚﹀ぇ浜庢渶澶ф敮鎸佹潯鏁�
+      dataExport[api](params)
+        .then((res) => {
+          console.log(res)
+          downLoad(res)
+          this.$message.success('瀵煎嚭鎴愬姛锛�');
+          loading.close();
+        })
+        .catch(() => {
+          loading.close();
+        });
+    },
   },
 };
 </script>
diff --git a/admin-web/src/views/stock/transfer/transferApplication/uploadPage.vue b/admin-web/src/views/stock/transfer/transferApplication/uploadPage.vue
new file mode 100644
index 0000000..b67cdb2
--- /dev/null
+++ b/admin-web/src/views/stock/transfer/transferApplication/uploadPage.vue
@@ -0,0 +1,185 @@
+<template>
+  <win-md class="stock-detail" title="涓婁紶璋冩嫧鎵嬬画" @close="close" :width="'800px'" :loading="loading">
+
+    <upload ref="uploadRef" :values="fileList" :settings="uploadSettings" @on-change="uploadChange"></upload>
+
+
+    <el-button name="涓婁紶璋冩嫧鎵嬬画" style="float: right;margin-right: 50px;margin-top: 20px" site="form" type="primary" size="mini" @click="allocationProcedures()">
+      涓婁紶璋冩嫧鎵嬬画
+    </el-button>
+
+  </win-md>
+</template>
+<script>
+import winMd from '@/components/win/win-md';
+import * as DateFormatter from '@/utils/DateFormatter';
+import {getDownUrl, getUploadUrl} from '@/utils/base';
+import Viewer from 'viewerjs';
+import 'viewerjs/dist/viewer.css';
+import de from "element-ui/src/locale/lang/de";
+import upload from '@/components/upload/index';
+let viewer = null;
+
+
+import {transferAdd, transferImport} from '@/api/stock/transfer';
+
+export default {
+  computed: {
+    de() {
+      return de
+    }
+  },
+  components: {winMd,upload},
+  props: {
+    setting: {
+      type: Object,
+      default: () => {
+      },
+    },
+  },
+  data() {
+    return {
+      procureDoc:"",
+
+      uploadSettings: {
+        title: '涓婁紶',
+        max: 20, // 鏈�澶уぇ灏忥紝鍗曚綅M
+        num: 2, // 鏀寔涓婁紶鍥剧墖涓暟
+        tip: '', // 鎻愮ず 榛樿锛歚鍙兘涓婁紶${this.defaultSettings.num}涓�${this.defaultSettings.accept}鏂囦欢锛屼笖涓嶈秴杩�${this.defaultSettings.max}kb`
+        uploadUrl: getUploadUrl(), // 涓婁紶璺緞
+        multiple: true, // 鏄惁鏀寔鎵归噺涓婁紶
+        disabled: false, // 鏄惁绂佺敤
+      },
+
+
+      loading: true,
+      fileList: [],
+      detail: {
+        baseCategoryName: '',
+        businessFormCode: '',
+        goodsTemplateName: '',
+        procureDoc: '',
+        agencyId: '',
+        agencyName: '',
+        states: '',
+        createName: '',
+        time: '',
+        procureGoods: [{}, {}],
+        fileKey: Math.random(),
+      },
+    };
+  },
+  filters: {
+    formatTime(time) {
+      if (!time) return '-';
+      return DateFormatter.LongToDateTime(time);
+    },
+    formatPrice(price) {
+      return price / 100
+    }
+  },
+  created() {
+    this.loading = false
+    this.fileList = []
+  },
+  methods: {
+    initPreviewImg() {
+      if (viewer != null) {
+        viewer.destroy();
+      }
+      const ViewerDom = document.querySelector('#uploadPreviewImages');
+      viewer = new Viewer(ViewerDom, {});
+    },
+    handlePreview(file) {
+      if (!this.checkImg(file.name)) {
+        return false;
+      }
+      let index = 0;
+      for (let i = 0; i < this.fileList.length; i++) {
+        const f = this.fileList[i];
+        if (this.checkImg(f.name)) {
+          if (file.id == f.id) {
+            break;
+          }
+          index++;
+        }
+      }
+      // this.fileList.forEach((f, i) => {
+      //   if (file.uid == f.uid) {
+      //     index = i
+      //   }
+      // })
+      // document.querySelector('#uploadPreviewImages').children[0].click()
+      viewer.view(index);
+    },
+    checkImg(name) {
+      const suffix = name.substring(name.lastIndexOf('.'), name.length);
+      const imgArray = ['.jpg', '.jpeg', '.png', '.bmp'];
+      if (imgArray.indexOf(suffix) < 0) {
+        return false;
+      }
+      return true;
+    },
+    getUrl(path) {
+      if (path.substr(0, 7).toLowerCase() == 'http://' || path.substr(0, 8).toLowerCase() == 'https://') {
+        return path;
+      } else {
+        return getDownUrl() + path;
+      }
+    },
+    close() {
+      this.$emit('close');
+    },
+
+    // 涓婁紶
+    uploadChange() {
+      let arr = this.$refs.uploadRef.fileList;
+      let procureDoc = JSON.stringify(arr);
+      console.log(procureDoc)
+      this.procureDoc = procureDoc;
+
+      let pro = this.setting.id
+      console.log(pro)
+    },
+    /**
+     * 纭畾鍒嗗彂
+     */
+    allocationProcedures(){
+      let id = this.setting.id
+      let procureDoc = this.procureDoc
+      if(id == null || procureDoc === ''){
+        this.$message.error('璇蜂笂浼犲浘鐗囷紒');
+        return
+      }
+      //let opTime = DateFormatter.formatDate(new Date(), 'yyyyMMddhhmmss');
+
+      transferImport({"idStr":id,"procureDoc":procureDoc,"type":"0"})
+        .then((res) => {
+          this.loading = false
+          this.$message.success('淇濆瓨鎴愬姛锛�');
+          this.close();
+          this.$emit('search');
+        })
+        .catch((err) => {
+          this.loading = false
+          console.log('edit err', err);
+          this.$message.error('淇濆瓨澶辫触');
+        });
+
+
+    }
+
+
+  },
+};
+</script>
+<style lang="scss" scoped>
+@import url(../../../../styles/store.scss);
+
+.card3 {
+  padding: 10px;
+  margin-top: 10px;
+  border-radius: 2px;
+  background: #ffffff;
+}
+</style>
diff --git a/admin-web/src/views/stock/transfer/transferissue/index.vue b/admin-web/src/views/stock/transfer/transferissue/index.vue
index a453d3d..a004a19 100644
--- a/admin-web/src/views/stock/transfer/transferissue/index.vue
+++ b/admin-web/src/views/stock/transfer/transferissue/index.vue
@@ -18,17 +18,15 @@
                         <div class="card-header-left">
                           <span>璋冩嫧鍗曞彿锛�</span>
                           <span class="value">{{ item.businessFormCode }}</span>
-                          <div v-if="item.states == 0" class="states states-warning">寰呭嚭搴�</div>
+                          <div v-if="item.states == 0  && item.procureDoc !=null" class="states states-warning">寰呭嚭搴�</div>
+                          <div v-if="item.states == 0  && item.procureDoc ==null" class="states states-warning">寰呮彁浜�</div>
                           <div v-if="item.states == 1" class="states states-warning">寰呮帴鏀�</div>
                           <div v-if="item.states == 2" class="states states-success">宸叉帴鏀�</div>
                           <div v-if="item.states == 4" class="states states-info">宸叉挙閿�</div>
                         </div>
                         <div class="card-header-right">
-                          <!--  <el-button v-if="item.states == 1" site="form" type="success" size="mini"
-                                >瀵煎嚭璋冩嫧鍑哄簱鍗�</el-button
-                              >-->
                           <el-button
-                              v-if="item.states == 0"
+                              v-if="item.states == 0 && item.procureDoc !=null"
                               site="form"
                               type="success"
                               size="mini"
diff --git a/consum-base/src/main/java/com/consum/base/controller/LWhFormTransferController.java b/consum-base/src/main/java/com/consum/base/controller/LWhFormTransferController.java
index a28a846..ba8e8dc 100644
--- a/consum-base/src/main/java/com/consum/base/controller/LWhFormTransferController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/LWhFormTransferController.java
@@ -9,19 +9,18 @@
 import java.util.Optional;
 import java.util.Set;
 import java.util.stream.Collectors;
-
 import javax.servlet.http.HttpServletResponse;
-
+import cn.hutool.core.convert.Convert;
+import cn.hutool.core.util.StrUtil;
+import com.alibaba.fastjson.JSONObject;
+import com.consum.base.util.ExcelStyleUtil;
 import org.apache.commons.compress.utils.Lists;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.poi.ss.usermodel.Workbook;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.*;
 import com.consum.base.BaseController;
 import com.consum.base.core.WhBusinessEnum;
 import com.consum.base.core.type.StatesType;
@@ -62,7 +61,6 @@
 import com.walker.infrastructure.utils.CollectionUtils;
 import com.walker.infrastructure.utils.DateUtils;
 import com.walker.web.ResponseValue;
-
 import cn.afterturn.easypoi.excel.ExcelExportUtil;
 import cn.afterturn.easypoi.excel.entity.TemplateExportParams;
 import cn.hutool.core.util.ReflectUtil;
@@ -104,6 +102,7 @@
     @ApiOperation(value = "鍗曟嵁鏂板", notes = "鍗曟嵁鏂板")
     @ApiImplicitParam(name = "param", value = "鍗曟嵁鏂板", required = true, dataType = "LWhFormTransferParam")
     @PostMapping("/add")
+    @Transactional(rollbackFor = Exception.class)
     public ResponseValue add() throws Exception {
         LWhFormTransferParam param = CommonUtil.getObjFromReqBody(LWhFormTransferParam.class);
         LWhFormTransferParam param2 = new LWhFormTransferParam();
@@ -118,24 +117,31 @@
         if (CollectionUtils.isEmpty(transferGoods)) {
             return ResponseValue.error("璋冩嫧鍗曚笉鑳戒负绌�");
         }
-        long id = this.lWhFormTransferService.add(param, this.getSysInfo());
+        long id = this.lWhFormTransferService.add(param, this.getSysInfo(), StrUtil.isEmpty(param.getProcureDoc()));
+        if(id == -1L){
+            return ResponseValue.error("鎮ㄤ笉鏄簱绠″憳");
+        }
+        if(id == -2L){
+            return ResponseValue.error("浠撳簱涓嶅瓨鍦�");
+        }
 
         Integer transferBusinessType = param.getTransferBusinessType();
         // 閮ㄩ棬鍒嗗彂涓氬姟闇�瑕佸鐞�
-        if (transferBusinessType == 1) {
+        // todo 鎷嗗垎 鏂伴�昏緫
+        if (transferBusinessType == 1 && !StrUtil.isEmpty(param.getProcureDoc())) {
             // 鍏堝嚭搴擄紝鍐嶅叆搴�
             // 鍑哄簱鍓� 璁剧疆鍑哄簱浠撳簱
             List<LWhProcureModel> modelByForm = lWhProcureModelService.getModelByForm(WhBusinessEnum.BUMENFENFA, id);
             Set<Long> baseModelIds =
-                modelByForm.stream().map(LWhProcureModel::getBaseGoodsModelsId).collect(Collectors.toSet());
+                    modelByForm.stream().map(LWhProcureModel::getBaseGoodsModelsId).collect(Collectors.toSet());
 
             FinSysTenantUser sysTenantUser = this.getSysInfo();
             String agencyId = sysTenantUser.getTenantId();
             List<BaseWarehouse> baseWarehouseList =
-                baseWarehouseService.getBaseWareHouseList(Long.valueOf(agencyId), StatesType.NORMAL.getValue());
+                    baseWarehouseService.getBaseWareHouseList(Long.valueOf(agencyId), StatesType.NORMAL.getValue());
             Set<Long> wareHouseIds = baseWarehouseList.stream().map(BaseWarehouse::getId).collect(Collectors.toSet());
             // 閫氳繃璋冩嫧鍗曚腑鐨勫瀷鍙穒d鏌ヨ鍑鸿鍨嬪彿鐗╁搧鎵�鍦ㄧ殑浠撳簱浣嶇疆
-            List<GoodsInfoDTO> goodsInfoDTOS = lWhGoodsService.queryGoodsInfo(baseModelIds, wareHouseIds,null);
+            List<GoodsInfoDTO> goodsInfoDTOS = lWhGoodsService.queryGoodsInfo(baseModelIds, wareHouseIds, null);
             GoodsInfoDTO goodsInfoDTO = goodsInfoDTOS.stream().findFirst().orElse(null);
             if (ObjectUtils.isEmpty(goodsInfoDTO)) {
                 return ResponseValue.error("璇ュ瀷鍙锋病鏈夊簱瀛樺彲浣跨敤");
@@ -147,27 +153,101 @@
             lWhFormTransfer.setOutWarehouseId(wareHouseId);
             lWhFormTransfer.setOutWarehouseName(warehouseName);
             lWhFormTransferService.update(lWhFormTransfer);
-            lWhFormTransferCoreService.doTransferOutPutNew(id, getCurrentUser(), WhBusinessEnum.BUMENFENFA);
-
+            Long l = lWhFormTransferCoreService.doTransferOutPutNew(id, getCurrentUser(), WhBusinessEnum.BUMENFENFA);
+            if(l == -1L){
+                return ResponseValue.error("浠撳簱鏁伴噺涓嶈冻");
+            }
             lWhFormTransferCoreService.doTransferInPut(id, getCurrentUser(), param.getOperatorName());
         }
 
         return ResponseValue.success();
     }
 
+
+    /**
+     * 涓婁紶鍒嗗彂鍗曪紙娴佺▼淇敼锛�
+     *
+     * @param idStr 璋冩嫧鍗昳d json
+     * @return
+     * @throws Exception
+     */
+    @ApiImplicitParams({@ApiImplicitParam(name = "id", value = "璋冩嫧鍗昳d", required = true, dataType = "Long"),})
+    @Transactional(rollbackFor = Exception.class)
+    @PostMapping("import")
+    public ResponseValue upload(@RequestBody String idStr) throws Exception {
+        Map<String, Object> map = JSONObject.parseObject(idStr, Map.class);
+        String type = map.get("type").toString();
+        Long id = Convert.toLong(map.get("idStr"));
+        String procureDoc = map.get("procureDoc").toString();
+        // [璋冩嫧]
+        if ("0".equals(type)) {
+            // 淇敼
+            LWhFormTransfer addLWhFormTransfer = new LWhFormTransfer();
+            addLWhFormTransfer.setId(id);
+            addLWhFormTransfer.setProcureDoc(procureDoc);
+            int update = lWhFormTransferService.update(addLWhFormTransfer);
+            if (update < 1) {
+                return ResponseValue.error();
+            }
+            return ResponseValue.success();
+        }
+
+        // [鍒嗗彂]
+        Long opTime = Convert.toLong(map.get("opTime"));
+        // 淇敼琛ㄧ殑鏂囦欢閫昏緫
+        LWHFromTransferExtendVO lwhFromTransferExtendVO = lWhFormTransferService.getById(id);
+        // 淇敼
+        LWhFormTransfer addLWhFormTransfer = new LWhFormTransfer();
+        addLWhFormTransfer.setId(id);
+        addLWhFormTransfer.setProcureDoc(procureDoc);
+        addLWhFormTransfer.setInTime(opTime);
+        addLWhFormTransfer.setOutputTime(opTime);
+        int update = lWhFormTransferService.update(addLWhFormTransfer);
+        if (update < 1) {
+            return ResponseValue.error();
+        }
+        // 涓诲垎鍙戦�昏緫
+        // 鍏堝嚭搴擄紝鍐嶅叆搴�
+        // 鍑哄簱鍓� 璁剧疆鍑哄簱浠撳簱
+        List<LWhProcureModel> modelByForm = lWhProcureModelService.getModelByForm(WhBusinessEnum.BUMENFENFA, id);
+        Set<Long> baseModelIds =
+                modelByForm.stream().map(LWhProcureModel::getBaseGoodsModelsId).collect(Collectors.toSet());
+        FinSysTenantUser sysTenantUser = this.getSysInfo();
+        String agencyId = sysTenantUser.getTenantId();
+        List<BaseWarehouse> baseWarehouseList =
+                baseWarehouseService.getBaseWareHouseList(Long.valueOf(agencyId), StatesType.NORMAL.getValue());
+        Set<Long> wareHouseIds = baseWarehouseList.stream().map(BaseWarehouse::getId).collect(Collectors.toSet());
+        // 閫氳繃璋冩嫧鍗曚腑鐨勫瀷鍙穒d鏌ヨ鍑鸿鍨嬪彿鐗╁搧鎵�鍦ㄧ殑浠撳簱浣嶇疆
+        List<GoodsInfoDTO> goodsInfoDTOS = lWhGoodsService.queryGoodsInfo(baseModelIds, wareHouseIds, null);
+        GoodsInfoDTO goodsInfoDTO = goodsInfoDTOS.stream().findFirst().orElse(null);
+        if (ObjectUtils.isEmpty(goodsInfoDTO)) {
+            return ResponseValue.error("璇ュ瀷鍙锋病鏈夊簱瀛樺彲浣跨敤");
+        }
+        Long wareHouseId = goodsInfoDTO.getWarehouseId();
+        String warehouseName = goodsInfoDTO.getWarehouseName();
+        LWhFormTransfer lWhFormTransfer = new LWhFormTransfer(id);
+        lWhFormTransfer.setOutWarehouseId(wareHouseId);
+        lWhFormTransfer.setOutWarehouseName(warehouseName);
+        lWhFormTransferService.update(lWhFormTransfer);
+        lWhFormTransferCoreService.doTransferOutPutNew(id, getCurrentUser(), WhBusinessEnum.BUMENFENFA);
+        lWhFormTransferCoreService.doTransferInPut(id, getCurrentUser(), lwhFromTransferExtendVO.getOperatorName());
+        return ResponseValue.success();
+    }
+
+
     /**
      * @Description 鍒楄〃鏌ヨ(璋冩嫧鏄庣粏)
      * @Author 鍗㈠簡闃�
      * @Date 2023/10/30
-     *       <p>
-     *       1.鏌ヨ璋冩嫧鍗�
-     *       <p>
-     *       2.鏌ヨ鐗╁搧鍨嬪彿
+     * <p>
+     * 1.鏌ヨ璋冩嫧鍗�
+     * <p>
+     * 2.鏌ヨ鐗╁搧鍨嬪彿
      */
     @ApiOperation(value = "鍗曟嵁鍒楄〃鏌ヨ", notes = "鍗曟嵁鍒楄〃鏌ヨ")
     @ApiImplicitParams({@ApiImplicitParam(name = "page", value = "椤电爜", required = true, dataType = "int"),
-        @ApiImplicitParam(name = "size", value = "姣忛〉鏉℃暟", required = true, dataType = "int"),
-        @ApiImplicitParam(name = "param", value = "鏉′欢鍙傛暟", required = true, dataType = "TransferQry"),})
+            @ApiImplicitParam(name = "size", value = "姣忛〉鏉℃暟", required = true, dataType = "int"),
+            @ApiImplicitParam(name = "param", value = "鏉′欢鍙傛暟", required = true, dataType = "TransferQry"),})
     @GetMapping("/list")
     public ResponseValue queryFormTransferList() {
         TransferQry param = CommonUtil.getObjFromReq(TransferQry.class);
@@ -190,7 +270,7 @@
 
                 // 鏌ヨ鍨嬪彿鏁伴噺
                 List<GoodsTemplateCountVO> goodsTemplateCount =
-                    lWhProcureModelService.getGoodsTemplateCountByBusinessId(item.getId());
+                        lWhProcureModelService.getGoodsTemplateCountByBusinessId(item.getId());
                 formTransferVO.setFromTransferTemplateInfoList(goodsTemplateCount);
 
                 result.add(formTransferVO);
@@ -293,16 +373,16 @@
 
         List<LWhProcureModel> modelByForm = lWhProcureModelService.getModelByForm(WhBusinessEnum.DIAOBO, id);
         Set<Long> baseModelIds =
-            modelByForm.stream().map(LWhProcureModel::getBaseGoodsModelsId).collect(Collectors.toSet());
+                modelByForm.stream().map(LWhProcureModel::getBaseGoodsModelsId).collect(Collectors.toSet());
 
         FinSysTenantUser sysTenantUser = this.getSysInfo();
         String agencyId = sysTenantUser.getTenantId();
         List<BaseWarehouse> baseWarehouseList =
-            baseWarehouseService.getBaseWareHouseList(Long.valueOf(agencyId), StatesType.NORMAL.getValue());
+                baseWarehouseService.getBaseWareHouseList(Long.valueOf(agencyId), StatesType.NORMAL.getValue());
         Set<Long> wareHouseIds = baseWarehouseList.stream().map(BaseWarehouse::getId).collect(Collectors.toSet());
 
         // 閫氳繃璋冩嫧鍗曚腑鐨勫瀷鍙穒d鏌ヨ鍑鸿鍨嬪彿鐗╁搧鎵�鍦ㄧ殑浠撳簱浣嶇疆
-        List<GoodsInfoDTO> goodsInfoDTOS = lWhGoodsService.queryGoodsInfo(baseModelIds, wareHouseIds,1);
+        List<GoodsInfoDTO> goodsInfoDTOS = lWhGoodsService.queryGoodsInfo(baseModelIds, wareHouseIds, 1);
         GoodsInfoDTO goodsInfoDTO = goodsInfoDTOS.stream().findFirst().orElse(null);
         if (ObjectUtils.isEmpty(goodsInfoDTO)) {
             return ResponseValue.error("璇ュ瀷鍙锋病鏈夊簱瀛樺彲浣跨敤");
@@ -320,26 +400,30 @@
 
     @ApiOperation(value = "璋冩嫧鍗曞鍑�", notes = "璋冩嫧鍗曞鍑�")
     @ApiImplicitParams({@ApiImplicitParam(name = "id", value = "璋冩嫧鍗昳d", required = true, dataType = "Long"),
-        @ApiImplicitParam(name = "type", value = "瀵煎嚭绫诲瀷 1 鍏ュ簱 2 鍑哄簱", required = true, dataType = "Integer"),})
+            @ApiImplicitParam(name = "type", value = "瀵煎嚭绫诲瀷 1 鍏ュ簱 2 鍑哄簱", required = true, dataType = "Integer"),})
     @GetMapping("/list/export")
     public ResponseValue<String> export(Long id, Integer type, HttpServletResponse response) throws Exception {
 
         TemplateExportParams params;
         String fileName;
-        if (type == 1) {
+        if (type == 0) {
             params = new TemplateExportParams("import/璋冩嫧鍏ュ簱鍗�.xls");
+            fileName = "璋冩嫧鍏ュ簱鍗�";
+        }else if (type == 1) {
+            params = new TemplateExportParams("import/璋冩嫧鍏ュ簱鍗�1.xls");
             fileName = "璋冩嫧鍏ュ簱鍗�";
         } else {
             params = new TemplateExportParams("import/璋冩嫧鍑哄簱鍗�.xls");
             fileName = "璋冩嫧鍑哄簱鍗�";
         }
         params.setHeadingStartRow(2);
+        params.setStyle(ExcelStyleUtil.class);
         List<TransferExcelTemplate> export = this.lWhFormTransferService.export(id, type);
 
         int countNum =
-            export.stream().filter(item -> item.getNum() != null).mapToInt(TransferExcelTemplate::getNum).sum();
+                export.stream().filter(item -> item.getNum() != null).mapToInt(TransferExcelTemplate::getNum).sum();
         double totalAmount = export.stream().filter(item -> item.getTotalAmount() != null)
-            .mapToDouble(TransferExcelTemplate::getAmount).sum();
+                .mapToDouble(TransferExcelTemplate::getAmount).sum();
         Optional<TransferExcelTemplate> first = export.stream().findFirst();
         TransferExcelTemplate entity = first.get();
         String businessFormCode = entity.getBusinessFormCode();
@@ -385,7 +469,7 @@
             param.setOutAgencyId(Long.valueOf(tenantId));
         }
         GenericPager<Map<String, Object>> transferInfoDetailsVoGenericPager =
-            this.lWhFormTransferService.queryTransferInfo(param);
+                this.lWhFormTransferService.queryTransferInfo(param);
         return ResponseValue.success(transferInfoDetailsVoGenericPager);
     }
 
@@ -408,7 +492,7 @@
         }
 
         Map<Long, List<ProcureModelInfoParam>> collect = param.getRecordInfoList().stream()
-            .collect(Collectors.groupingBy(ProcureModelInfoParam::getBaseGoodModelId));
+                .collect(Collectors.groupingBy(ProcureModelInfoParam::getBaseGoodModelId));
         for (Map.Entry<Long, List<ProcureModelInfoParam>> entry : collect.entrySet()) {
             Long baseGoodModelId = entry.getKey();
 
@@ -441,7 +525,7 @@
                     // 璁剧疆涓�涓嬪湪鐢ㄦ暟閲�
                     Long oldProcureModelId = item.getOldProcureModelId();
                     LWhProcureModelUser oldInfo =
-                        lWhProcureModelUserService.get(new LWhProcureModelUser(oldProcureModelId));
+                            lWhProcureModelUserService.get(new LWhProcureModelUser(oldProcureModelId));
                     lWhProcureModelUser.setUseCount(oldInfo.getUseCount());
                     procureModelUserList.add(lWhProcureModelUser);
                 }
@@ -476,52 +560,52 @@
         }
 
         List<GoodsUseRecordVO> goodsUseRecordList = useRecordDTOList.stream()
-            .collect(Collectors.groupingBy(UseRecordDTO::getId)).entrySet().stream().map(entry -> {
-                Long id = entry.getKey();
-                List<UseRecordDTO> useRecordList = entry.getValue();
-                UseRecordDTO useRecordDto = useRecordList.get(0);
+                .collect(Collectors.groupingBy(UseRecordDTO::getId)).entrySet().stream().map(entry -> {
+                    Long id = entry.getKey();
+                    List<UseRecordDTO> useRecordList = entry.getValue();
+                    UseRecordDTO useRecordDto = useRecordList.get(0);
 
-                GoodsUseRecordVO goodsUseRecordVO = new GoodsUseRecordVO();
-                goodsUseRecordVO.setId(id);
-                goodsUseRecordVO.setUpdateUserName(useRecordDto.getUpdateUserName());
-                goodsUseRecordVO.setUpdateTime(useRecordDto.getUpdateTime());
+                    GoodsUseRecordVO goodsUseRecordVO = new GoodsUseRecordVO();
+                    goodsUseRecordVO.setId(id);
+                    goodsUseRecordVO.setUpdateUserName(useRecordDto.getUpdateUserName());
+                    goodsUseRecordVO.setUpdateTime(useRecordDto.getUpdateTime());
 
-                List<UseRecordSkuVO> useRecordSkuList =
-                    useRecordList.stream().collect(Collectors.groupingBy(UseRecordDTO::getProcureModelId)).values()
-                        .stream().map(recordList -> {
-                            UseRecordDTO useRecordDTO = recordList.get(0);
-                            UseRecordSkuVO useRecordSkuVO = new UseRecordSkuVO();
-                            useRecordSkuVO.setBaseGoodModelId(useRecordDTO.getBaseGoodsModelsId());
-                            useRecordSkuVO.setBaseGoodModelName(useRecordDTO.getBaseGoodsModelsName());
-                            useRecordSkuVO.setUnit(useRecordDTO.getUnit());
-                            useRecordSkuVO.setProcureModelId(useRecordDTO.getProcureModelId());
+                    List<UseRecordSkuVO> useRecordSkuList =
+                            useRecordList.stream().collect(Collectors.groupingBy(UseRecordDTO::getProcureModelId)).values()
+                                    .stream().map(recordList -> {
+                                        UseRecordDTO useRecordDTO = recordList.get(0);
+                                        UseRecordSkuVO useRecordSkuVO = new UseRecordSkuVO();
+                                        useRecordSkuVO.setBaseGoodModelId(useRecordDTO.getBaseGoodsModelsId());
+                                        useRecordSkuVO.setBaseGoodModelName(useRecordDTO.getBaseGoodsModelsName());
+                                        useRecordSkuVO.setUnit(useRecordDTO.getUnit());
+                                        useRecordSkuVO.setProcureModelId(useRecordDTO.getProcureModelId());
 
-                            List<RecordUserInfoVO> recordUserInfoList = recordList.stream().map(userInfo -> {
-                                RecordUserInfoVO recordUserInfoVO = new RecordUserInfoVO();
-                                recordUserInfoVO.setOldProcureModelId(userInfo.getOldProcureModelId());
-                                recordUserInfoVO.setUseName(userInfo.getUseName());
-                                recordUserInfoVO.setPhone(userInfo.getPhone());
-                                recordUserInfoVO.setNum(userInfo.getNum());
-                                return recordUserInfoVO;
-                            }).collect(Collectors.toList());
+                                        List<RecordUserInfoVO> recordUserInfoList = recordList.stream().map(userInfo -> {
+                                            RecordUserInfoVO recordUserInfoVO = new RecordUserInfoVO();
+                                            recordUserInfoVO.setOldProcureModelId(userInfo.getOldProcureModelId());
+                                            recordUserInfoVO.setUseName(userInfo.getUseName());
+                                            recordUserInfoVO.setPhone(userInfo.getPhone());
+                                            recordUserInfoVO.setNum(userInfo.getNum());
+                                            return recordUserInfoVO;
+                                        }).collect(Collectors.toList());
 
-                            useRecordSkuVO.setRecordUserInfos(recordUserInfoList);
-                            return useRecordSkuVO;
-                        }).collect(Collectors.toList());
+                                        useRecordSkuVO.setRecordUserInfos(recordUserInfoList);
+                                        return useRecordSkuVO;
+                                    }).collect(Collectors.toList());
 
-                goodsUseRecordVO.setRecordSkuDtoList(useRecordSkuList);
-                return goodsUseRecordVO;
+                    goodsUseRecordVO.setRecordSkuDtoList(useRecordSkuList);
+                    return goodsUseRecordVO;
 
-            }).sorted(Comparator.comparing(GoodsUseRecordVO::getUpdateTime, Comparator.nullsFirst(Long::compareTo))
-                .reversed())
-            .collect(Collectors.toList());
+                }).sorted(Comparator.comparing(GoodsUseRecordVO::getUpdateTime, Comparator.nullsFirst(Long::compareTo))
+                        .reversed())
+                .collect(Collectors.toList());
 
         return ResponseValue.success(goodsUseRecordList);
     }
 
     @ApiOperation(value = "鏌ヨ閮ㄩ棬涓嬬殑鍒嗗彂鍗�", notes = "鏌ヨ閮ㄩ棬涓嬬殑鍒嗗彂鍗�")
     @ApiImplicitParams({
-        @ApiImplicitParam(name = "agencyId", value = "鏈烘瀯id", required = true, dataType = "Long", paramType = "query")})
+            @ApiImplicitParam(name = "agencyId", value = "鏈烘瀯id", required = true, dataType = "Long", paramType = "query")})
     @GetMapping("/query/transfList")
     public ResponseValue queryDepartmentTransferOrderList() {
 
diff --git a/consum-base/src/main/java/com/consum/base/service/LWhFormTransferService.java b/consum-base/src/main/java/com/consum/base/service/LWhFormTransferService.java
index a80af48..7f823d7 100644
--- a/consum-base/src/main/java/com/consum/base/service/LWhFormTransferService.java
+++ b/consum-base/src/main/java/com/consum/base/service/LWhFormTransferService.java
@@ -14,7 +14,7 @@
 
 public interface LWhFormTransferService extends BaseService {
 
-    long add(LWhFormTransferParam param, FinSysTenantUser sysInfo) throws Exception;
+    long add(LWhFormTransferParam param, FinSysTenantUser sysInfo,boolean isHaveDoc) throws Exception;
 
     GenericPager<LWhFormTransfer> queryFormTransferList(TransferQry param);
 
diff --git a/consum-base/src/main/java/com/consum/base/service/core/LWhFormTransferCoreService.java b/consum-base/src/main/java/com/consum/base/service/core/LWhFormTransferCoreService.java
index 9630567..5315f90 100644
--- a/consum-base/src/main/java/com/consum/base/service/core/LWhFormTransferCoreService.java
+++ b/consum-base/src/main/java/com/consum/base/service/core/LWhFormTransferCoreService.java
@@ -230,7 +230,8 @@
                     log.error("鍑哄簱澶辫触锛佸瀷鍙穥} 鐨勬暟閲忎笉瓒筹紝闇�瑕佽皟鎷▄}涓紝浠撳簱涓幇瀛榹}涓�", baseGoodsModelsId, counts, goodsModelNum);
                     // 鎵嬪姩鍥炴粴
                     TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-                    throw new RuntimeException("鍑哄簱澶辫触!鍨嬪彿鏁伴噺涓嶈冻");
+                    //throw new RuntimeException("鍑哄簱澶辫触!鍨嬪彿鏁伴噺涓嶈冻");
+                    return -1L;
                 }
                 whGoodsRecord.setInitialCount(goodsModelNum);
                 whGoodsRecord.setEndCount(goodsModelNum - counts);
diff --git a/consum-base/src/main/java/com/consum/base/service/impl/LWhFormTransferServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/impl/LWhFormTransferServiceImpl.java
index 931b13b..9977d08 100644
--- a/consum-base/src/main/java/com/consum/base/service/impl/LWhFormTransferServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/service/impl/LWhFormTransferServiceImpl.java
@@ -13,6 +13,7 @@
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
 import org.springframework.util.CollectionUtils;
 
@@ -96,7 +97,8 @@
      * @Author 鍗㈠簡闃�
      * @Date 2023/10/30
      */
-    public long add(LWhFormTransferParam param, FinSysTenantUser sysInfo) throws Exception {
+    @Transactional(rollbackFor = Exception.class)
+    public long add(LWhFormTransferParam param, FinSysTenantUser sysInfo,boolean isHaveDoc) throws Exception {
         // 1.鏂板璋冩嫧鍗曡褰�
         LWhFormTransfer lWhFormTransfer = new LWhFormTransfer();
         // 璋冩嫧鍗昳d
@@ -123,7 +125,8 @@
             BaseWarehouse warehouse = baseWarehouseService.getWarehouseByAgencyId(Long.valueOf(tenantId), null);
             if (warehouse == null) {
                 log.error("浠撳簱涓嶅瓨鍦�");
-                throw new Exception("浠撳簱涓嶅瓨鍦�");
+                //throw new Exception("浠撳簱涓嶅瓨鍦�");
+                return -2L;
             }
             lWhFormTransfer.setInWarehouseId(warehouse.getId());
             lWhFormTransfer.setInWarehouseName(warehouse.getWarehouseName());
@@ -142,7 +145,8 @@
             List<BaseWarehouseManager> managerList = baseWarehouseManagerService.select(manager);
             if (CollectionUtils.isEmpty(managerList)) {
                 log.error("璇ョ敤鎴蜂笉鏄簱绠″憳");
-                throw new Exception("璇ョ敤鎴蜂笉鏄簱绠″憳");
+                //throw new Exception("璇ョ敤鎴蜂笉鏄簱绠″憳");
+                return -1L;
             }
             BaseWarehouseManager baseWarehouseManager = managerList.stream().findFirst().orElse(null);
             Long baseWarehouseId = baseWarehouseManager.getBaseWarehouseId();
@@ -154,7 +158,11 @@
             lWhFormTransfer.setInWarehouseId(param.getDepartmentId());
             lWhFormTransfer.setInWarehouseName(param.getDepartmentName());
             lWhFormTransfer.setInOperatorName(param.getOperatorName());
-            lWhFormTransfer.setInTime(param.getCreateTime());
+
+            if(!isHaveDoc){
+                lWhFormTransfer.setInTime(param.getCreateTime());
+            }
+
 
             lWhFormTransfer.setOutWarehouseType(WareHouseType.TENANT.getValue());
             lWhFormTransfer.setOutWarehouseId(warehouse.getId());
@@ -162,7 +170,10 @@
 
             lWhFormTransfer.setOutOperatorId(sysInfo.getId());
             lWhFormTransfer.setOutOperatorName(sysInfo.getUserName());
-            lWhFormTransfer.setOutputTime(param.getCreateTime());
+
+            if(!isHaveDoc) {
+                lWhFormTransfer.setOutputTime(param.getCreateTime());
+            }
             lWhFormTransfer.setTel(param.getTel());
 
         }
diff --git a/consum-base/src/main/java/com/consum/base/util/ExcelStyleUtil.java b/consum-base/src/main/java/com/consum/base/util/ExcelStyleUtil.java
new file mode 100644
index 0000000..4e2ad3a
--- /dev/null
+++ b/consum-base/src/main/java/com/consum/base/util/ExcelStyleUtil.java
@@ -0,0 +1,187 @@
+package com.consum.base.util;
+
+import cn.afterturn.easypoi.excel.entity.params.ExcelExportEntity;
+import cn.afterturn.easypoi.excel.entity.params.ExcelForEachParams;
+import cn.afterturn.easypoi.excel.export.styler.IExcelExportStyler;
+import org.apache.poi.ss.usermodel.*;
+
+/**
+ * 鍔熻兘鎻忚堪: Excel鏍峰紡璁剧疆
+ *
+ * @author lxk
+ * @date  2024/5/8 13:41
+ * @version 1.0
+ **/
+public class ExcelStyleUtil implements IExcelExportStyler {
+
+    private static final short STRING_FORMAT = (short) BuiltinFormats.getBuiltinFormat("TEXT");
+    private static final short FONT_SIZE_TEN = 10;
+    private static final short FONT_SIZE_ELEVEN = 11;
+    private static final short FONT_SIZE_TWELVE = 12;
+
+    // 鏍囬澶存牱寮�
+    private CellStyle headerStyle;
+    // 鏁版嵁鍒楁爣棰樻牱寮�
+    private CellStyle titleStyle;
+    // 鏁版嵁琛屾牱寮�
+    private CellStyle styles;
+
+    public ExcelStyleUtil(Workbook workbook) {
+        this.init(workbook);
+    }
+
+    /**
+     * 鍒濆鍖栨牱寮�
+     *
+     * @param workbook
+     */
+    private void init(Workbook workbook) {
+        this.headerStyle = initHeaderStyle(workbook);
+        this.titleStyle = initTitleStyle(workbook);
+        this.styles = initStyles(workbook);
+    }
+
+    /**
+     * 鏍囬澶存牱寮�
+     *
+     * @param color
+     * @return
+     */
+    @Override
+    public CellStyle getHeaderStyle(short color) {
+        return headerStyle;
+    }
+
+    /**
+     * 鏁版嵁鍒楁爣棰樻牱寮�
+     *
+     * @param color
+     * @return
+     */
+    @Override
+    public CellStyle getTitleStyle(short color) {
+        return titleStyle;
+    }
+
+    /**
+     * 鏁版嵁琛屾牱寮�
+     *
+     * @param parity            琛ㄧず濂囧伓琛�
+     * @param excelExportEntity 鏁版嵁鍐呭
+     * @return
+     */
+    @Override
+    public CellStyle getStyles(boolean parity, ExcelExportEntity excelExportEntity) {
+        return styles;
+    }
+
+    /**
+     * 鏁版嵁琛屾牱寮�
+     *
+     * @param cell              鍗曞厓鏍�
+     * @param dataRow           鏁版嵁琛�
+     * @param excelExportEntity 鏁版嵁鍐呭
+     * @param obj               瀵硅薄
+     * @param data              鏁版嵁
+     * @return
+     */
+    @Override
+    public CellStyle getStyles(Cell cell, int dataRow, ExcelExportEntity excelExportEntity, Object obj, Object data) {
+        return getStyles(true, excelExportEntity);
+    }
+
+    /**
+     * 妯℃澘浣跨敤鐨勬牱寮忚缃�
+     *
+     * @param b
+     * @param excelForEachParams
+     * @return
+     */
+    @Override
+    public CellStyle getTemplateStyles(boolean b, ExcelForEachParams excelForEachParams) {
+        return null;
+    }
+
+    /**
+     * 鍒濆鍖�--鏍囬澶存牱寮�
+     *
+     * @param workbook
+     * @return
+     */
+    private CellStyle initHeaderStyle(Workbook workbook) {
+        CellStyle style = getBaseCellStyle(workbook);
+        style.setFont(getFont(workbook, FONT_SIZE_TWELVE, true));
+        return style;
+    }
+
+    /**
+     * 鍒濆鍖�--鏁版嵁鍒楁爣棰樻牱寮�
+     *
+     * @param workbook
+     * @return
+     */
+    private CellStyle initTitleStyle(Workbook workbook) {
+        CellStyle style = getBaseCellStyle(workbook);
+        style.setFont(getFont(workbook, FONT_SIZE_ELEVEN, false));
+        // 鑳屾櫙鑹�
+        style.setFillForegroundColor(IndexedColors.GREY_25_PERCENT.getIndex());
+        style.setFillPattern(FillPatternType.SOLID_FOREGROUND);
+        return style;
+    }
+
+    /**
+     * 鍒濆鍖�--鏁版嵁琛屾牱寮�
+     *
+     * @param workbook
+     * @return
+     */
+    private CellStyle initStyles(Workbook workbook) {
+        CellStyle style = getBaseCellStyle(workbook);
+        style.setFont(getFont(workbook, FONT_SIZE_TEN, false));
+        style.setDataFormat(STRING_FORMAT);
+        return style;
+    }
+
+    /**
+     * 鍩虹鏍峰紡
+     *
+     * @return
+     */
+    private CellStyle getBaseCellStyle(Workbook workbook) {
+        CellStyle style = workbook.createCellStyle();
+        // 涓嬭竟妗�
+        style.setBorderBottom(BorderStyle.THIN);
+        // 宸﹁竟妗�
+        style.setBorderLeft(BorderStyle.THIN);
+        // 涓婅竟妗�
+        style.setBorderTop(BorderStyle.THIN);
+        // 鍙宠竟妗�
+        style.setBorderRight(BorderStyle.THIN);
+        // 姘村钩灞呬腑
+        style.setAlignment(HorizontalAlignment.CENTER);
+        // 涓婁笅灞呬腑
+        style.setVerticalAlignment(VerticalAlignment.CENTER);
+        // 璁剧疆鑷姩鎹㈣
+        style.setWrapText(true);
+
+        return style;
+    }
+
+    /**
+     * 瀛椾綋鏍峰紡
+     *
+     * @param size   瀛椾綋澶у皬
+     * @param isBold 鏄惁鍔犵矖
+     * @return
+     */
+    private Font getFont(Workbook workbook, short size, boolean isBold) {
+        Font font = workbook.createFont();
+        // 瀛椾綋鏍峰紡
+        font.setFontName("瀹嬩綋");
+        // 鏄惁鍔犵矖
+        font.setBold(isBold);
+        // 瀛椾綋澶у皬
+        font.setFontHeightInPoints(size);
+        return font;
+    }
+}
\ No newline at end of file
diff --git "a/deploy-jar-single/src/main/resources/import/\350\260\203\346\213\250\345\205\245\345\272\223\345\215\225.xls" "b/deploy-jar-single/src/main/resources/import/\350\260\203\346\213\250\345\205\245\345\272\223\345\215\225.xls"
index 03a5809..f232fdb 100644
--- "a/deploy-jar-single/src/main/resources/import/\350\260\203\346\213\250\345\205\245\345\272\223\345\215\225.xls"
+++ "b/deploy-jar-single/src/main/resources/import/\350\260\203\346\213\250\345\205\245\345\272\223\345\215\225.xls"
Binary files differ
diff --git "a/deploy-jar-single/src/main/resources/import/\350\260\203\346\213\250\345\205\245\345\272\223\345\215\2251.xls" "b/deploy-jar-single/src/main/resources/import/\350\260\203\346\213\250\345\205\245\345\272\223\345\215\2251.xls"
new file mode 100644
index 0000000..af7c14e
--- /dev/null
+++ "b/deploy-jar-single/src/main/resources/import/\350\260\203\346\213\250\345\205\245\345\272\223\345\215\2251.xls"
Binary files differ
diff --git "a/deploy-jar-single/src/main/resources/import/\350\260\203\346\213\250\345\205\245\345\272\223\345\215\225old.xls" "b/deploy-jar-single/src/main/resources/import/\350\260\203\346\213\250\345\205\245\345\272\223\345\215\225old.xls"
new file mode 100644
index 0000000..30004e1
--- /dev/null
+++ "b/deploy-jar-single/src/main/resources/import/\350\260\203\346\213\250\345\205\245\345\272\223\345\215\225old.xls"
Binary files differ

--
Gitblit v1.9.1