Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/api/kanban/quality.js
#	src/views/kanban/quality/kanban1.vue

src/api/wms/outorderfc.js

@@ -248,3 +248,19 @@ export function batchSapTl(data) {
     data: data
   });
 }
+
+export function submitTransferPosting(data) {
+  return request({
+    url: '/wms/outorder/submitTransferPosting',
+    method: 'post',
+    data: data
+  });
+}
+
+export function submitReversePosting(data) {
+  return request({
+    url: '/wms/outorder/submitReversePosting',
+    method: 'post',
+    data: data
+  });
+}

src/views/energy/powerUse/Energystatistics/index.vue

@@ -95,6 +95,16 @@
               >导出</el-button
             >
           </el-col>
+          <el-col :span="1.5">
+            <el-button
+              type="primary"
+              plain
+              icon="el-icon-upload2"
+              size="mini"
+              @click="upload.open = true"
+              >补录</el-button
+            >
+          </el-col>
           <div class="total">
             <div class="number">合计电量:</div>
             <div class="alltotal">
@@ -253,6 +263,36 @@
         <el-button @click="canceltwo">取 消</el-button>
       </div>
     </el-dialog>
+
+
+    <el-dialog :title="'补录数据'" :visible.sync="upload.open" width="400px" append-to-body>
+      <el-upload
+        ref="upload"
+        :limit="1"
+        accept=".xlsx, .xls"
+        :headers="upload.headers"
+        :action="upload.importUrl"
+        :disabled="upload.isUploading"
+        :on-progress="handleFileUploadProgress"
+        :on-success="handleFileSuccess"
+        :auto-upload="false"
+        drag
+      >
+        <i class="el-icon-upload"></i>
+        <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
+        <div class="el-upload__tip text-center" slot="tip">
+          <span>仅允许导入xls、xlsx格式文件。</span>
+          <el-link type="primary" :underline="false" style="font-size:12px;vertical-align: baseline;"
+                   @click="importTemplate">下载模板
+          </el-link>
+        </div>
+      </el-upload>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitImport">确 定</el-button>
+        <el-button @click="upload.open = false">取 消</el-button>
+      </div>
+    </el-dialog>
+
   </div>
 </template>
 
@@ -321,21 +361,6 @@ export default {
         children: "children",
         label: "lable",
       },
-      // 用户导入参数
-      upload: {
-        // 是否显示弹出层（用户导入）
-        open: false,
-        // 弹出层标题（用户导入）
-        title: "",
-        // 是否禁用上传
-        isUploading: false,
-        // 是否更新已经存在的用户数据
-        updateSupport: 0,
-        // 设置上传的请求头部
-        headers: { Authorization: "Bearer " + getToken() },
-        // 上传的地址
-        url: process.env.VUE_APP_BASE_API + "/system/user/importData",
-      },
       // 查询参数
       queryParams: {
         pageNum: NaN,
@@ -409,6 +434,19 @@ export default {
       },
       // 合计电量
       number: "",
+      upload: {
+        // 是否显示弹出层
+        open: false,
+        // 弹出层标题
+        title: "",
+        // 是否禁用上传
+        isUploading: false,
+        // 设置上传的请求头部
+        headers: {poolName: localStorage.getItem("USER_POOL_NAME_CURRENT"), Authorization: "Bearer " + getToken()},
+        // 上传的地址
+        importUrl: process.env.VUE_APP_BASE_API + "/energy/report/analysis/energyImport",
+        templateUrl:""
+      }
     };
   },
   watch: {
@@ -635,6 +673,27 @@ export default {
     handleExport() {
       handleExport("bootstrap-table", "能耗统计", true);
     },
+
+    // 导入-下载模板
+    importTemplate() {
+      this.download('/energy/report/analysis/energyTemplate', {}, `能耗补录模版_${new Date().getTime()}.xlsx`)
+    },
+
+    // 导入-文件上传中处理
+    handleFileUploadProgress(event, file, fileList) {
+      this.upload.isUploading = true;
+    },
+    // 导入-文件上传成功处理
+    handleFileSuccess(response, file, fileList) {
+      this.upload.open = false;
+      this.upload.isUploading = false;
+      this.$refs.upload.clearFiles();
+      this.$alert("<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" + response.msg + "</div>", "导入结果", {dangerouslyUseHTMLString: true});
+      this.getList();
+    },
+    submitImport(){
+      this.$refs.upload.submit();
+    }
   },
 };
 </script>

src/views/mes/prepare/index.vue

@@ -731,7 +731,7 @@ export default {
         this.refreshNewWorkerTable = true // 立即将refreshProTable设置为true，显示表格
         this.newWorkerLoading = false // 设置加载状态为false，表示加载完成
 
-        this.generateBarcode(this.printData.productDate); //条码 根据打印日期生成
+        this.generateBarcode("ZC_"+this.printData.productDate); //条码 根据打印日期生成
       })
     },
 	}

src/views/quality/report/bpDefectItem/index.vue

@@ -34,7 +34,7 @@
 			    <el-form ref="form" :model="form" label-width="80px">
 					<el-row>
 						<el-col :span="24" style="text-align:center">
-							<h2>{{form.column080090}} 年 {{form.column090100}} 月 份 白 坯 不 良 排 列 图</h2>
+							<h2>{{ parseTime(queryParams.yearMonthDate,'{y}-{m}')}}  白 坯 不 良 排 列 图</h2>
 						</el-col>
 					</el-row>
 					<el-descriptions title="" border :column="3" :contentStyle="content_style" :label-style="label_style">
@@ -57,7 +57,6 @@
 						<template v-for="(column, index) in showTitles">
 							<el-table-column align="center" min-width="120" :prop="column.id" :key="column.id" :label="column.titleName"/>
 						</template>
-					</el-table-column>
 				</el-table>
 			</el-tab-pane>
 		</el-tabs>
@@ -68,6 +67,7 @@
 import {getDefectItemTitle,getDefectItemData,getDefectItemLine} from "@/api/quality/qcTable";
 import moment from 'moment';
 import * as echarts from "echarts";
+import {parseTime} from "../../../../utils/ruoyi";
 export default {
 	name: "BpDefectItem",
 	data() {
@@ -142,6 +142,7 @@ export default {
 		this.getList();
 	},
 	methods: {
+    parseTime,
         /**获取默认查询时间段**/
 		getDate() {
 			let start = this.Fungetdate (0);

src/views/quality/report/bpDefectItemPC/index.vue

@@ -34,7 +34,7 @@
 			    <el-form ref="form" :model="form" label-width="80px">
 					<el-row>
 						<el-col :span="24" style="text-align:center">
-							<h2> {{queryParams.yearMonthDate}} 黑蚊香白坯性能不良排列图</h2>
+							<h2> {{ parseTime(queryParams.yearMonthDate,'{y}-{m}')}}  黑蚊香白坯性能不良排列图</h2>
 						</el-col>
 					</el-row>
 					<el-descriptions title="" border :column="3" :contentStyle="content_style" :label-style="label_style">
@@ -53,11 +53,10 @@
 			<el-tab-pane label="报表" name="second">
 				<el-table v-loading="loading" :data="itemProList" border>
 					<el-table-column label="序号" type="index" align="center" :index="indexMethod" fixed/>
-					<el-table-column label="项目" align="center" prop="dataType" min-width="100" fixed>
+					<el-table-column label="项目" align="center" prop="dataType" min-width="100" fixed/>
 						<template v-for="(column, index) in showTitles">
 							<el-table-column align="center" min-width="120" :prop="column.id" :key="column.id" :label="column.titleName"/>
 						</template>
-					</el-table-column>
 				</el-table>
 			</el-tab-pane>
 		</el-tabs>
@@ -182,6 +181,7 @@ export default {
             //获取Table数据
 			getDefectItemDataPC(this.queryParams).then(response => {
 				this.itemProList = response;
+        this.itemProList.push("其他")
 			    this.getTbody();
 				this.loading = false;
 			});

src/views/wms/outorderzs/index.vue

@@ -40,9 +40,16 @@
 				<el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
 					v-hasPermi="['wms:outorder:export']">导出</el-button>
 			</el-col>
+      <el-col :span="1.5">
+        <el-button type="success" plain icon="el-icon-edit" size="mini" @click="clickShowPostingList('ZC')">转储过账</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="success" plain icon="el-icon-edit" size="mini" @click="clickShowPostingList('X')">反冲过账</el-button>
+      </el-col>
 			<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
 		</el-row>
 		<el-table v-loading="loading" :data="outorderList" @selection-change="handleSelectionChange"
+              :selectable="checkSelectable"
 			:tree-props="{ children: 'list', hasChildren: 'hasChildren' }" row-key="id" border :default-expand-all="false">
 			<el-table-column type="selection" width="55" align="center" />
 			<el-table-column label="序号" type="index"  v-if="false" />
@@ -168,6 +175,39 @@
 				<el-button @click="cancel">取 消</el-button>
 			</div>
 		</el-dialog>
+
+    <!--  过账列表对话框  -->
+    <el-dialog title="过账" :visible.sync="showPostingList" width="1200px" append-to-body>
+      <el-table :data="orderList" row-key="id" border >
+        <el-table-column label="物料编码" align="center" prop="materialCode" width="150">
+          <template slot-scope="scope">
+            <span>{{ formatProductCode(scope.row.materialCode) }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="物料名称" align="center" prop="materialDesc"/>
+        <el-table-column label="计划数量" align="center" prop="planNumber" width="150"/>
+        <el-table-column label="出库数量" align="center" prop="outNumber" width="150" >
+          <template slot-scope="scope">
+            <el-input v-model="scope.row.outNumber" />
+          </template>
+        </el-table-column>
+        <el-table-column label="反冲标识" align="center" prop="userDefined3" width="150"/>
+        <el-table-column label="操作" align="center" prop="option" width="180">
+          <template slot-scope="scope">
+            <el-button size="mini" type="danger" @click="deletePosting(scope.$index)">删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitPostingForm">确 定</el-button>
+        <el-button @click="cancelPostingForm">取 消</el-button>
+      </div>
+
+    </el-dialog>
+
+
+
   </div>
 </template>
 
@@ -182,7 +222,7 @@ import {
   OutboundPostingSAP,
   OutboundPostingzcSAP,
   listOutorderZC,
-  listOutorderZU
+  listOutorderZU, submitReversePosting, submitTransferPosting
 } from '@/api/wms/outorderfc'
 
 export default {
@@ -438,6 +478,9 @@ export default {
 			stationNo: '',
 			addoutorderList: [],
       produceCodeTEM:  '',
+      orderList:[],
+      postingType:undefined,
+      showPostingList:false
 		};
 	},
 	created() {
@@ -702,6 +745,82 @@ export default {
 			this.download('wms/outorder/export', {
 				...this.queryParams
 			}, `outorder_${new Date().getTime()}.xlsx`)
+		},
+    checkSelectable(item){
+      return item.userDefined10 !== '2'
+    },
+    clickShowPostingList(postingType){
+      const orderList = this.selectabletrows
+      //只取未过账物料
+      for (const order of orderList){
+        if (order.userDefined10 !== '2'){
+          this.orderList.push(order)
+        }
+      }
+
+      if (this.orderList.length === 0){
+        this.$modal.msgError("请选择物料！");
+        return;
+      }
+
+      this.postingType = postingType
+      this.showPostingList = true
+    },
+    deletePosting(index){
+      this.orderList.splice(index, 1);
+      this.$message.success("删除成功！");
+    },
+    submitPostingForm(){
+
+      if (this.orderList.length === 0){
+        this.$message.error("请选择过账物料！");
+        return;
+      }
+
+      for (const item of this.orderList){
+        if (!item.outNumber || item.outNumber+"" === "0"){
+          this.$message.error("物料名称:"+item.materialDesc+"的出库数量为0！");
+          return
+        }
+
+        if (item.userDefined3 !== this.postingType){
+          if (this.postingType === "ZC"){
+            this.$message.error("物料名称:"+item.materialDesc+"为反冲物料！");
+            return
+          }
+          if (this.postingType === "X"){
+            this.$message.error("物料名称:"+item.materialDesc+"不是反冲物料！");
+            return
+          }
+        }
+      }
+
+      if (this.postingType === "ZC"){
+        submitTransferPosting(this.orderList).then(res=>{
+          if (res.code === 200){
+            this.$message.success("操作成功！");
+          }
+        }).finally(()=>{
+          this.showPostingList = false;
+          this.orderList = []
+          this.getList();
+        })
+      }
+      if (this.postingType === "X"){
+        submitReversePosting(this.orderList).then(res=>{
+          if (res.code === 200){
+            this.$message.success("操作成功！");
+          }
+        }).finally(()=>{
+          this.showPostingList = false;
+          this.orderList = []
+          this.getList();
+        })
+      }
+    },
+    cancelPostingForm(){
+      this.showPostingList = false;
+      this.orderList = []
     }
 	}
 };