Merge remote-tracking branch 'origin/0.8.X' into 0.8.X

klp-ui/src/api/wms/coil.js

@@ -174,4 +174,13 @@ export function exportCoilData(coilIds) {
       coilIds
     }
   })
+}
+
+// 报表查询使用的post类型的查询，查询所有符合条件的钢卷
+export function listCoilWithIds(data) {
+  return request({
+    url: '/wms/materialCoil/listByPost',
+    method: 'post',
+    data
+  })
 }

klp-ui/src/views/wms/coil/box2.vue

@@ -88,6 +88,7 @@
               <el-table-column prop="warehouseName" label="仓库名称" align="center" min-width="150"></el-table-column>
               <el-table-column prop="currentCoilNo" label="当前卷号" align="center" min-width="120"></el-table-column>
               <el-table-column prop="enterCoilNo" label="入场卷号" align="center" min-width="180"></el-table-column>
+              <el-table-column prop="supplierCoilNo" label="厂家卷号" align="center" min-width="180"></el-table-column>
               <el-table-column label="物料类型" align="center" prop="itemType">
                 <template slot-scope="scope">
                   {{ scope.row.itemType == 'product' ? '成品' : '原料' }}

klp-ui/src/views/wms/coil/do/warehousing.vue

@@ -476,6 +476,16 @@ export default {
         this.form.itemType = 'raw_material';
       }
     },
+    handleMaterialTypeChangeInEdit(value) {
+      // 清空物品选择
+      this.editCoil.form.itemId = null;
+      // 根据材料类型设置物品类型
+      if (value === '成品') {
+        this.editCoil.form.itemType = 'product';
+      } else if (value === '原料' || value === '废品') {
+        this.editCoil.form.itemType = 'raw_material';
+      }
+    },
     remoteMethod(query) {
       listDeliveryPlan({ planName: query, pageNum: 1, pageSize: 5, planType: 1 }).then(res => {
         this.planList = res.rows

klp-ui/src/views/wms/coil/panels/DrillDownTable.vue

@@ -40,6 +40,7 @@
         <el-table-column label="实际库区" align="center" prop="actualWarehouseName" v-if="!hideWarehouseQuery"/>
         <el-table-column prop="currentCoilNo" label="当前卷号" align="center" min-width="120"></el-table-column>
         <el-table-column prop="enterCoilNo" label="入场卷号" align="center"></el-table-column>
+        <el-table-column prop="supplierCoilNo" label="厂家卷号" align="center"></el-table-column>
         <el-table-column label="物料类型" align="center" prop="itemType">
           <template slot-scope="scope">
             {{ scope.row.itemType == 'product' ? '成品' : '原料' }}

klp-ui/src/views/wms/coil/panels/base.vue

@@ -158,7 +158,7 @@
         <el-form-item label="当前钢卷号" prop="currentCoilNo">
           <el-input v-model="form.currentCoilNo" placeholder="请输入当前钢卷号" />
         </el-form-item>
-        <el-form-item v-if="!form.coilId" label="厂家原料卷号" prop="supplierCoilNo">
+        <el-form-item label="厂家原料卷号" prop="supplierCoilNo">
           <el-input v-model="form.supplierCoilNo" placeholder="请输入厂家原料卷号" />
         </el-form-item>
         <el-form-item label="所在库位" prop="warehouseId">

klp-ui/src/views/wms/report/delivery.vue

@@ -3,11 +3,11 @@
     <el-row>
       <el-form label-width="80px" inline>
         <el-form-item label="开始时间" prop="startTime">
-          <el-date-picker style="width: 200px;" v-model="queryParams.byCreateTimeStart" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
+          <el-date-picker style="width: 200px;" v-model="queryParams.byExportTimeStart" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
             placeholder="选择开始时间"></el-date-picker>
         </el-form-item>
         <el-form-item label="结束时间" prop="endTime">
-          <el-date-picker style="width: 200px;" v-model="queryParams.byCreateTimeEnd" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
+          <el-date-picker style="width: 200px;" v-model="queryParams.byExportTimeEnd" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
             placeholder="选择结束时间"></el-date-picker>
         </el-form-item>
         <el-form-item label="入场钢卷号" prop="endTime">
@@ -91,7 +91,7 @@
 </template>
 
 <script>
-import { listMaterialCoil } from "@/api/wms/coil";
+import { listCoilWithIds } from "@/api/wms/coil";
 import ProductInfo from "@/components/KLPService/Renderer/ProductInfo";
 import RawMaterialInfo from "@/components/KLPService/Renderer/RawMaterialInfo";
 import CoilNo from "@/components/KLPService/Renderer/CoilNo.vue";
@@ -128,8 +128,8 @@ export default {
         pageNum: 1,
         pageSize: 9999,
         status: 1,
-        byCreateTimeStart: startTime,
+        byExportTimeStart: startTime,
-        byCreateTimeEnd: endTime,
+        byExportTimeEnd: endTime,
         selectType: 'product',
         enterCoilNo: '',
         currentCoilNo: '',
@@ -158,7 +158,7 @@ export default {
   methods: {
     getList() {
       this.loading = true
-      listMaterialCoil({
+      listCoilWithIds({
         ...this.queryParams
       }).then(res => {
         this.list = res.rows

klp-ui/src/views/wms/report/receive.vue

@@ -89,7 +89,7 @@
 </template>
 
 <script>
-import { listMaterialCoil } from "@/api/wms/coil";
+import { listCoilWithIds } from "@/api/wms/coil";
 import {
   listPendingAction,
 } from '@/api/wms/pendingAction';
@@ -164,8 +164,8 @@ export default {
         actionType: 401,
         pageSize: 999,
         pageNum: 1,
-        byCreateTimeStart: this.queryParams.byCreateTimeStart,
+        startTime: this.queryParams.byCreateTimeStart,
-        byCreateTimeEnd: this.queryParams.byCreateTimeEnd,
+        endTime: this.queryParams.byCreateTimeEnd,
       }).then(res => {
         const actions = res.rows
         const coilIds = actions.map(item => item.coilId).join(',')
@@ -178,7 +178,7 @@ export default {
           this.loading = false
           return
         }
-        listMaterialCoil({
+        listCoilWithIds({
           ...this.queryParams,
           coilIds: coilIds,
         }).then(res => {

klp-ui/src/views/wms/report/zha.vue

@@ -89,7 +89,7 @@
 </template>
 
 <script>
-import { listMaterialCoil } from "@/api/wms/coil";
+import { listCoilWithIds } from "@/api/wms/coil";
 import {
   listPendingAction,
 } from '@/api/wms/pendingAction';
@@ -162,7 +162,7 @@ export default {
       this.loading = true
       Promise.all([
         // 酸连轧成品库
-        listMaterialCoil({
+        listCoilWithIds({
           ...this.queryParams,
           pageSize: 9999,
           pageNum: 1,
@@ -172,7 +172,7 @@ export default {
           warehouseId: '1988150099140866050'
         }),
         // 镀锌原料库
-        listMaterialCoil({
+        listCoilWithIds({
           ...this.queryParams,
           pageSize: 9999,
           pageNum: 1,
@@ -182,7 +182,7 @@ export default {
           warehouseId: '1988150263284953089'
         }),
         // 脱脂原料库
-        listMaterialCoil({
+        listCoilWithIds({
           ...this.queryParams,
           pageSize: 9999,
           pageNum: 1,
@@ -191,7 +191,7 @@ export default {
           warehouseId: '1988150545175736322'
         }),
         // 酸连轧纵剪分条原料库1988150150521090049
-        listMaterialCoil({
+        listCoilWithIds({
           ...this.queryParams,
           pageSize: 9999,
           pageNum: 1,
@@ -227,7 +227,7 @@ export default {
       //     this.loading = false
       //     return
       //   }
-      //   listMaterialCoil({
+      //   listCoilWithIds({
       //     coilIds: coilIds,
       //   }).then(res => {
       //     this.list = res.rows