Merge branch 'master' of http://47.100.3.209:3000/gdc/yiliangyiyun-pc

src/api/V2/warehouse/index.js

@@ -88,6 +88,14 @@ export const API_POST_EXPORTOUT = '/warehouseBaseInfo/exportOut'
 export const API_GET_PRINT = '/commonConstantFalse/getInfo'
 // 仓位号
 export const API_GET_WAREHOUSE_BINNUMBER = '/warehouseBaseInfo/getWarehouse'
+//添加折转
+export const API_POST_TURNAROUND_ADD = '/turnInfo/api/addTurn'
+//折转列表
+export const API_GET_TURNAROUND_LIST = '/turnInfo/selectTurnInfo'
+//添加折转信息下拉
+export const API_GET_TURNAROUND_XIALA = '/turnInfo/getPositionAndGoodsName'
+//折转后货名
+export const API_get_goodsName_All = '/commonSysParameter/getInfo'
 
 
 

src/lang/zh.js

@@ -524,6 +524,7 @@ export default {
     warehouseManagementPerfectput: '编辑',
     warehouseManagementPutOut: '任务',
     warehouseManagementPutOutLook: '查看',
+    transformation: '折转',
     //客户管理
     customerList: '客户管理',
     //客户管理
@@ -4858,7 +4859,7 @@ export default {
     warehouseManagementNoWeightIn: '入库检斤',
     warehouseManagementPutOut: '任务',
     warehouseManagementPutOutLook: '查看',
-
+    transformation: '折转',
   },
   //贸易服务
   tradeServicesManagement:{

src/model/warehouse/index.js

@@ -42,7 +42,11 @@ import {
     API_POST_EXPORT,
     API_GET_PRINT,
     API_POST_EXPORTOUT,
-    API_GET_WAREHOUSE_BINNUMBER
+    API_GET_WAREHOUSE_BINNUMBER,
+    API_GET_TURNAROUND_LIST,
+    API_POST_TURNAROUND_ADD,
+    API_GET_TURNAROUND_XIALA,
+    API_get_goodsName_All,
 } from '@/api/V2/warehouse'
 // import { app } from 'electron'
 // 列表
@@ -127,7 +131,16 @@ export const postExport = appRx.post(API_POST_EXPORT)
 //导出出库
 export const postExportOut = appRx.post(API_POST_EXPORTOUT)
 //打印增量
-export const  printAdd = appRx.get(API_GET_PRINT,errorCatcher, errorHandle, filter)
+export const printAdd = appRx.get(API_GET_PRINT,errorCatcher, errorHandle, filter)
 //仓位号
-export const  getbinnumber = appRx.get(API_GET_WAREHOUSE_BINNUMBER,errorCatcher, errorHandle, filter)
+export const getbinnumber = appRx.get(API_GET_WAREHOUSE_BINNUMBER,errorCatcher, errorHandle, filter)
+//添加折转
+export const turnAroundAdd = appRx.post(API_POST_TURNAROUND_ADD,errorCatcher, errorHandle, filter)
+//折转列表
+export const turnAroundList = appRx.get(API_GET_TURNAROUND_LIST,errorCatcher, errorHandle, filter)
+//添加折转信息下拉
+export const turnAroundXiaLa = appRx.get(API_GET_TURNAROUND_XIALA,errorCatcher, errorHandle, filter)
+//折转后所有货名
+export const turnAroundGoodsNameAll = appRx.get(API_get_goodsName_All,errorCatcher, errorHandle, filter)
+
 

src/views/tranManagement/tranManagementShippingFeedback.vue

@@ -672,7 +672,9 @@ export default {
             obj.status = v.状态
             obj.shipType = v.类型
             console.log(obj)
-            _this.excelFreightspace.push(obj)
+            // if(obj.caseNo&&obj.titleNo&&obj.binNumber&&obj.positionWeight&&obj.loadNetWeight&&obj.loadingDate&&obj.status&&obj.shipType){
+                _this.excelFreightspace.push(obj)
+            // }
           })
           let _ispushData = true
           console.log(arr, _this.freightspace)
@@ -693,6 +695,9 @@ export default {
               _ispushData = true
             }
           }
+          // // 成功数量
+          // let _number = outdata.length - _this.excelFreightspace.length;
+          // _this.$message.success('共计'+outdata.length+'条,成功导入'+_this.excelFreightspace.length+'条,失败'+_number+'条!')
           _this.$forceUpdate()
         }
         reader.readAsArrayBuffer(f)

src/views/warehouse/component/router/index.js

@@ -387,7 +387,23 @@ const warehouseManagementRouter = {
         // module: 'procurement.sparepart.applDetail'
       },
       hidden: true
-    },                                     
+    }, 
+    // 折转
+    {
+      path: 'transformation',
+      component: () =>
+        import(/* webpackChunkName: "applDetail" */ '@/views/warehouse/transformation'),
+      name: 'transformation',
+      meta: {
+        title: 'transformation',
+        shortcutEntrance: 'transformation',
+        module: 'warehouseManagement.warehouse.warehouseInfo',
+        permissicon: [],
+        keepAlive: true
+        // module: 'procurement.sparepart.applDetail'
+      },
+      hidden: true
+    },                                    
   ],
 };
 export default warehouseManagementRouter;

src/views/warehouse/transformation.vue

@@ -0,0 +1,409 @@
+// 仓库折转
+<template>
+  <div class="container">
+    <el-row class="toptitle">
+      <el-col :span="12">
+        <h2 class="bg-left title">折转</h2>
+      </el-col>
+      <el-col :span="12" class="bg-right">
+        <el-button type="primary" size="small" @click="returnsales()">
+          <img
+            width="6"
+            height="10"
+            style="vertical-align: bottom; margin-right: 3px"
+            src="../../../public/img/lujing.png"
+            alt=""
+          />返回
+        </el-button>
+      </el-col>
+    </el-row>
+    <div class="center">
+      <el-row>
+        <el-col :span="12">
+          <div class="bg-left centertitle">
+            <h1>{{ warehouseName }}</h1>
+            <span class="temporary" v-show="warehouseType == 2">（临）</span>
+          </div>
+        </el-col>
+        <el-col :span="12" class="bg-right">
+          <el-button type="primary" size="small" @click="addTurnAround()">新增折转</el-button>
+        </el-col>
+      </el-row>
+      <el-table
+        class="forData"
+        :data="transformationList"
+        style="width: 100%; margin-top: 20px"
+        height="780">
+        <el-table-column type="index" label="序号" width="80">
+          <template scope="scope">
+            <span v-if="scope.$index < 9">0{{ scope.$index + 1 }}</span>
+            <span v-else>{{ scope.$index + 1 }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="beforeBinNo" label="折转前仓位"></el-table-column>
+        <el-table-column prop="beforeGoodsName" label="折转前货名"></el-table-column>
+        <el-table-column prop="beforeWeight" label="折转前重量（吨）"></el-table-column>
+        <el-table-column prop="afterBinNo" label="折转后仓位"></el-table-column>
+        <el-table-column prop="afterGoodsName" label="折转后货名"></el-table-column>
+        <el-table-column prop="afterWeight" label="折转后重量（吨）"></el-table-column>
+        <el-table-column prop="backOffice" label="操作人"></el-table-column>
+        <el-table-column prop="updateDate" label="操作时间"></el-table-column>
+      </el-table>
+    </div>
+    <el-dialog
+      title="折转"
+      :visible.sync="dialogShow"
+      width="40%"
+      top="35vh"
+      :before-close="dialogClose"
+    >
+      <div>
+        <span class="eject-warehouse">{{ warehouseName }}</span
+        ><span v-show="warehouseType == 2">（临）</span>
+      </div>
+      <table class="table_css">
+        <tr>
+          <td></td>
+          <td v-show="warehouseType != 2">仓位</td>
+          <td>货名</td>
+          <td>重量（吨）</td>
+        </tr>
+        <tr>
+          <td class="table_item">折转前</td>
+          <td v-show="warehouseType != 2">
+            <el-select
+              v-model="transformationAdd.beforeBinNo"
+              placeholder="请选择仓位号"
+              @change="binNo"
+            >
+              <el-option
+                v-for="(item, index) in binNoList"
+                :key="item.binNumber"
+                :label="item.binNumber"
+                :value="index"
+              >
+              </el-option>
+            </el-select>
+          </td>
+          <td>
+            <el-select
+              v-model="transformationAdd.beforeGoodsName"
+              placeholder="请选择货名"
+              @change="goodsNameChange">
+              <el-option
+                v-for="(item, index) in goodsNameList"
+                :key="item.goodsName"
+                :label="item.goodsName"
+                :value="index">
+              </el-option>
+            </el-select>
+          </td>
+          <td>
+            <el-input v-model="transformationAdd.beforeWeight" placeholder="请输入重量" type="number" :validate-event="true" maxlength="10"></el-input>
+          </td>
+        </tr>
+        <tr>
+          <td class="table_item">折转后</td>
+          <td v-show="warehouseType != 2">
+            <el-select
+              v-model="transformationAdd.afterBinNo"
+              placeholder="请选择仓位号"
+              @change="binNo1">
+              <el-option
+                v-for="(item, index) in binNoList"
+                :key="item.binNumber"
+                :label="item.binNumber"
+                :value="index">
+              </el-option>
+            </el-select>
+          </td>
+          <td>
+            <el-select v-model="transformationAdd.afterGoodsName" placeholder="请选择货名" @change="goodsNameChange1">
+              <el-option
+                v-for="(item, index) in goodsNameAllList"
+                :key="item.constValue"
+                :label="item.constValue"
+                :value="index">
+              </el-option>
+            </el-select>
+          </td>
+          <td>
+            <el-input v-model="transformationAdd.afterWeight"  placeholder="请输入重量" type="number"></el-input>
+          </td>
+        </tr>
+      </table>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="dialogClose">取 消</el-button>
+        <el-button type="primary" @click="submit">确 定 折 转</el-button>
+      </span>
+    </el-dialog>
+    <div style="text-align: center; padding: 10px">
+      <el-pagination
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+        :current-page="currentPage"
+        :page-size="deptCircularPage.pageSize"
+        layout="total, sizes, prev, pager, next, jumper"
+        :total="deptBudgetTotal"
+      >
+      </el-pagination>
+    </div>
+  </div>
+</template>
+<script>
+import {
+  turnAroundList,
+  turnAroundAdd,
+  turnAroundXiaLa,
+  turnAroundGoodsNameAll,
+  getbinnumber,
+} from '@/model/warehouse/index'
+export default {
+  data() {
+    return {
+      dialogShow: false,
+      transformationList: [],
+      warehouseId: '',
+      warehouseName: '',
+      goodsNameList: [],
+      goodsNameAllList: [],
+      binNoList: [],
+      binNumberId: '', //仓位Id
+      warehouseType: '',
+      compId: '',
+      transformationAdd: {},
+      //分页
+      currentPage: 1,
+      pageSize: 10,
+      deptCircularPage: {},
+      deptBudgetTotal: 0,
+      storage: '',
+    }
+  },
+  activated() {
+    this.compId = localStorage.getItem('ws-pf_compId')
+    this.binNumberId = this.$route.query.binNumberId //仓位Id
+    this.warehouseId = this.$route.query.warehouseId //仓库Id
+    this.warehouseName = this.$route.query.warehouseName //仓库名
+    this.warehouseType = this.$route.query.warehouseType //仓库类型
+    this.getList()
+  },
+  methods: {
+    returnsales() {
+      this.$router.go(-1)
+    },
+    goodsNameChange(e) {
+      this.transformationAdd.beforeGoodsName = this.goodsNameList[e].goodsName
+      this.transformationAdd.beforeGoodsNameKey = this.goodsNameList[e].goodsNameKey
+      this.storage = this.goodsNameList[e].storage
+    },
+    goodsNameChange1(e) {
+      this.transformationAdd.afterGoodsName = this.goodsNameAllList[e].constValue
+      this.transformationAdd.afterGoodsNameKey = this.goodsNameAllList[e].constKey
+    },
+    //新增折转
+    addTurnAround() {
+      if(this.warehouseType==2){
+        turnAroundXiaLa({
+        id: this.warehouseId,
+        })
+        .toPromise()
+        .then((response) => {
+          this.goodsNameList = response
+        })
+      }
+      turnAroundGoodsNameAll({
+        constId: 'CON2',
+      })
+        .toPromise()
+        .then((response) => {
+          this.goodsNameAllList = response
+        })
+      getbinnumber({
+        id: this.warehouseId,
+      })
+        .toPromise()
+        .then((response) => {
+          this.binNoList = response.warehousePositionInfoList
+        })
+      this.dialogShow = true
+    },
+    handleSizeChange(val) {
+      console.log(`每页 ${val} 条`)
+      this.pageSize = val
+      this.getList()
+    },
+    handleCurrentChange(val) {
+      this.currentPage = val
+      console.log(`当前页: ${val}`)
+      this.getList()
+    },
+    getList() {
+      // 列表
+      turnAroundList({
+        baseId: this.warehouseId,
+        currentPage: this.currentPage,
+        pageSize: this.pageSize,
+      })
+        .toPromise()
+        .then((response) => {
+          this.deptCircularPage.currentPage = response.current
+          this.deptCircularPage.pageSize = response.size
+          this.deptBudgetTotal = response.total
+          this.transformationList = response.records
+        })
+    },
+    binNo(e) {
+      if(this.warehouseType==1){
+        turnAroundXiaLa({
+        id: this.binNoList[e].id,
+      })
+        .toPromise()
+        .then((response) => {
+          this.goodsNameList = response
+        })
+      }
+      
+      this.transformationAdd.beforeBinNo = this.binNoList[e].binNumber
+      this.transformationAdd.positionId = this.binNoList[e].id
+    },
+    binNo1(e) {
+      this.transformationAdd.afterBinNo = this.binNoList[e].binNumber
+      this.transformationAdd.afterPositionId = this.binNoList[e].id
+    },
+    dialogClose() {
+      this.transformationAdd = {}
+      this.dialogShow = false
+    },
+    submit() {
+      if (!this.transformationAdd.beforeBinNo && this.warehouseType != 2) {
+        this.$message.error('请选择折转前仓位')
+        return
+      }
+      if (!this.transformationAdd.beforeGoodsName) {
+        this.$message.error('请选择折转前货名')
+        return
+      }
+      if (!this.transformationAdd.beforeWeight) {
+        this.$message.error('请选择折转前重量')
+        return
+      }
+      if (Number(this.transformationAdd.beforeWeight) > Number(this.storage)) {
+        this.$message.error('折转前重量不能超过现有储量')
+        return
+      }
+      if (!this.transformationAdd.afterBinNo && this.warehouseType != 2) {
+        this.$message.error('请选择折转后仓位')
+        return
+      }
+      if (!this.transformationAdd.afterGoodsName) {
+        this.$message.error('请选择折转后货名')
+        return
+      }
+      if (!this.transformationAdd.afterWeight) {
+        this.$message.error('请选择折转后重量')
+        return
+      }
+      if (Number(this.transformationAdd.afterWeight) > Number(this.transformationAdd.beforeWeight)) {
+        this.$message.error('折转后重量不可超过折转前重量')
+        return
+      }
+      this.$confirm(`确定提交折转信息？`, '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      }).then(() => {
+        this.transformationAdd.backOffice = localStorage.getItem('ws-pf_staffName')
+        // this.transformationAdd.compId = this.compId
+        this.transformationAdd.baseId = this.warehouseId
+        this.transformationAdd.warehouseName = this.warehouseName
+        turnAroundAdd(this.transformationAdd)
+          .toPromise()
+          .then((response) => {
+            if (response == 'OK') {
+              this.$notify({
+                title: '成功',
+                message: '折转信息提交成功！',
+                type: 'success',
+              })
+              this.transformationAdd = {}
+              this.dialogShow = false
+              this.getList()
+            }
+          })
+      })
+    },
+  },
+}
+</script>
+<style lang="scss" scoped>
+.toptitle {
+  background: #f6f7fc;
+}
+.bg-left {
+  padding-left: 30px;
+}
+.bg-right {
+  text-align: right;
+  padding: 16px 20px;
+}
+.top-title {
+  width: 50%;
+  display: flex;
+}
+.title {
+  position: relative;
+}
+
+.title::before {
+  content: '';
+  display: inline-block;
+  width: 5px;
+  height: 30px;
+  background: #5473e8;
+  position: absolute;
+  left: 0;
+}
+.container {
+  overflow: scroll;
+  height: 93vh;
+}
+.center {
+  padding: 0 5%;
+  margin: auto;
+}
+.centertitle {
+  display: flex;
+}
+.temporary {
+  line-height: 80px;
+  font-size: 20px;
+  color: #abaaaa;
+}
+/deep/.forData .cell {
+  text-align: center;
+}
+//弹出框
+.eject-warehouse {
+  font-size: 20px;
+  margin-left: 15px;
+  font-weight: 600;
+}
+.table_css {
+  margin: 20px auto;
+  tr {
+    height: 50px;
+  }
+  .table_item {
+    min-width: 70px;
+  }
+  td {
+    text-align: center;
+    font-size: 18px;
+    font-weight: 600;
+  }
+  .el-select {
+    width: 90%;
+  }
+}
+</style>

src/views/warehouse/warehouseManagementList.vue

@@ -135,6 +135,8 @@
             <div class="adjustment" v-hasPermission="
            `warehouseManagement.warehouse.warehouseInfo.view`
           " @click="mintor(scope.row)">监控</div>
+           <div v-hasPermission="
+           `warehouseManagement.warehouse.warehouseInfo.turn`" class="adjustment" @click="transformation(scope.row)">折转</div>
           </template>
         </el-table-column>
       </el-table>
@@ -203,6 +205,8 @@
             <div class="adjustment" v-if="scope.row.clearStatusFlag == 3">
               已清仓
             </div>
+              <div v-hasPermission="
+           `warehouseManagement.warehouse.warehouseInfo.turn`" class="adjustment" @click="transformation(scope.row)">折转</div>
           </template>
         </el-table-column>
       </el-table>
@@ -344,8 +348,14 @@
       this.getList()
       this.showType = this.isShow
     },
-
     methods: {
+      // 折转
+      transformation(row){
+        this.$router.push({
+          path: 'transformation', 
+          query:{warehouseId:row.warehouseId,warehouseName:row.warehouseName,binNumberId:row.binNumberId,warehouseType:this.warehouseType}//warehouseType 1常用 2临时
+        })
+      },
       getSummaries(param) {
         const {
           columns,

src/views/warehouse/warehouseManagementRecord.vue

@@ -131,7 +131,7 @@
 					<el-table-column prop="deductionWeight" label="扣重（吨）"> </el-table-column>
 					<el-table-column prop="netWeight" label="净重（吨）"></el-table-column>
 					<el-table-column prop="pureWeight" label="纯重（吨）"> </el-table-column>
-					<el-table-column prop="deductionAmount" label="扣款（元/吨）" width="100"> </el-table-column>
+					<el-table-column prop="deductionAmount" label="扣款（元/吨）" width="100"></el-table-column>
 					<el-table-column prop="grade" label="品级" width="80px">
 						<template slot-scope="scope">
 							<span v-if="scope.row.grade == '一等品'" class="top-grade">{{
@@ -184,8 +184,7 @@
 						<template slot-scope="scope">
 							<!-- <img width="18" height="20" style="vertical-align: text-top; position: relative; top: -1px"
 								src="../../../public/img/fujian.png" @click="fujian(scope.row)" alt="" /> -->
-          					<el-button @click="print(scope.row)" v-if="scope.row.inOutType != '收购入库'&&scope.row.inOutType != '期初'"  v-hasPermission="`acquisitionManagement.acquisitionWeight.print`">打印</el-button >
-
+          					<el-button @click="print(scope.row)" v-if="scope.row.inOutType != '收购入库'&&scope.row.inOutType != '期初'&& scope.row.inOutType != '折转入库'&& scope.row.inOutType != '折转出库'"  v-hasPermission="`acquisitionManagement.acquisitionWeight.print`">打印</el-button >
 						</template>
 					</el-table-column>
 					<el-table-column prop="createDate" label="录入时间">