2022-02-23 0:27

imcs-ui/src/api/prepareProductMgr/receive.js

@@ -0,0 +1,143 @@
+/******************** 【原材料接收管理】API ***********************/
+import axiosApi from '../AxiosApi.js'
+
+const apiList = {
+	getList: {
+    method: 'POST',
+    url: `/authority/meterialReceiveLog/all`
+  },
+  page: {
+    method: 'POST',
+    url: `/authority/meterialReceiveLog/page`
+  },
+  update: {
+    method: 'POST',
+    url: `/authority/meterialReceiveLog/update`
+  },
+  save: {
+    method: 'POST',
+    url: `/authority/meterialReceiveLog`
+  },
+  updateStatus: {
+    method: 'POST',
+    url: `/authority/meterialReceiveLog/status`
+  },
+  remove: {
+    method: 'DELETE',
+    url: `/authority/meterialReceiveLog`
+  },
+  delete: {
+    method: 'POST',
+    url: `/authority/meterialReceiveLog/delete`
+  },
+  list: {
+    method: 'POST',
+    url: `/authority/meterialReceiveLog/query`
+  },
+  // 工具原材料规格-批量查询
+  listSpecs: {
+    method: 'POST',
+    url: `/authority/meterialReceiveLogSpecs/getSpecsList`
+  },
+  preview: {
+    method: 'POST',
+    url: `/authority/meterialReceiveLog/preview`
+  },
+  export: {
+    method: 'POST',
+    url: `/authority/meterialReceiveLog/export`
+  },
+  import: {
+    method: 'POST',
+    url: `/authority/meterialReceiveLog/import`
+  }
+}
+
+export default {
+	getList (data) {
+    return axiosApi({
+      ...apiList.getList,
+      data
+    })
+  },
+  page (data) {
+    return axiosApi({
+      ...apiList.page,
+      data
+    })
+  },
+  save (data) {
+    return axiosApi({
+      ...apiList.save,
+      data
+    })
+  },
+  update (data) {
+    return axiosApi({
+      ...apiList.update,
+      data
+    })
+  },
+  updateStatus (data) {
+    return axiosApi({
+      ...apiList.updateStatus,
+      data
+    })
+  },
+  remove (data) {
+    return axiosApi({
+      ...apiList.remove,
+      data
+    })
+  },
+  delete (data) {
+    return axiosApi({
+      ...apiList.remove,
+      data
+    })
+  },
+  list (data) {
+    return axiosApi({
+      ...apiList.list,
+      data
+    })
+  },
+  listSpecs (data) {
+    return axiosApi({
+      ...apiList.listSpecs,
+      data
+    })
+  },
+  check (code) {
+    return axiosApi({
+      method: 'GET',
+      url: `/authority/meterialReceiveLog/check/${code}`
+    })
+  },
+  checkField (data) {
+    return axiosApi({
+      method: 'POST',
+      url: `/authority/meterialReceiveLog/check`,
+      data
+    })
+  },
+  preview (data) {
+    return axiosApi({
+      ...apiList.preview,
+      data
+    })
+  },
+  export (data) {
+    return axiosApi({
+      ...apiList.export,
+      responseType: "blob",
+      data
+    })
+  },
+  import (data) {
+    return axiosApi({
+      ...apiList.import,
+      data
+    })
+  }
+}

imcs-ui/src/views/zuihou/prepareProductMgr/material/Index.vue

@@ -102,7 +102,7 @@
         width="120px"
       >
         <template slot-scope="{ row }">
-        	<a href="javascript:;" style="color: #2db7f5;" @click="trayOne(row)">接收</a>
+        	<a href="javascript:;" style="color: #2db7f5;" @click="tray(row)">接收</a>
         	<a href="javascript:;" style="color: #2db7f5;" @click="view(row)">接收记录</a>
         </template>
       </el-table-column>
@@ -368,11 +368,15 @@
 	      this.dialog.title = this.$t("common.edit")
 	      this.dialog.isVisible = true
 	    },
-	    // 【设置可存放托盘】表头上Btn-事件
-	    trayOne() {
+	    // 【接收】表头上Btn-事件
+	    trayOne(row) {
 	    	if (!this.selection.length) {
 		    	// 新增
-	    		this.addTray();
+	    		// this.addTray();
+	    		this.$message({
+	          message: this.$t("tips.noDataSelected"),
+	          type: "warning"
+	        })
 		    	return
 	      }
 	    	if (this.selection.length > 1) {
@@ -390,7 +394,7 @@
 	    tray(row) {
 	    	this.$refs.editTray.setTenant(row)
 	      this.$refs.editTray.type = "edit"
-	      this.dialogTray.title = "修改接收"
+	      this.dialogTray.title = "接收"
 	      this.dialogTray.isVisible = true
 	    },
 	    

imcs-ui/src/views/zuihou/prepareProductMgr/material/components/Receive.vue

@@ -19,24 +19,24 @@
 			    </el-option>
 			  </el-select>
 		  </el-form-item>-->
-		  <el-form-item label='原料炉批号：' prop="name">
-        <el-input v-model.trim="tenant.name" :placeholder='$t("common.pleaseEnter")'/>
+		  <el-form-item label='原料炉批号：' prop="furnaceBatchNo">
+        <el-input v-model.trim="tenant.furnaceBatchNo" :placeholder='$t("common.pleaseEnter")'/>
       </el-form-item>
-      <el-form-item label='零件批号：' prop="name2">
-        <el-input v-model.trim="tenant.name2" :placeholder='$t("common.pleaseEnter")'/>
+      <el-form-item label='零件批号：' prop="bomBatchNo">
+        <el-input v-model.trim="tenant.bomBatchNo" :placeholder='$t("common.pleaseEnter")'/>
       </el-form-item>
-      <el-form-item label='批量标准：' prop="name3">
-        <el-input v-model.trim="tenant.name3" :placeholder='$t("common.pleaseEnter")'/>
+      <el-form-item label='批量标准：' prop="batchStand">
+        <el-input v-model.trim="tenant.batchStand" :placeholder='$t("common.pleaseEnter")'/>
       </el-form-item>
-      <el-form-item label='毛坯生产厂：' prop="name4">
-        <el-input v-model.trim="tenant.name4" :placeholder='$t("common.pleaseEnter")'/>
+      <el-form-item label='毛坯生产厂：' prop="factory">
+        <el-input v-model.trim="tenant.factory" :placeholder='$t("common.pleaseEnter")'/>
       </el-form-item>
-      <el-form-item label='毛坯批号：' prop="name5">
-        <el-input v-model.trim="tenant.name5" :placeholder='$t("common.pleaseEnter")'/>
+      <el-form-item label='毛坯批号：' prop="meterialBatchNo">
+        <el-input v-model.trim="tenant.meterialBatchNo" :placeholder='$t("common.pleaseEnter")'/>
       </el-form-item>
-      <el-form-item label='入厂日期：' prop="joinDate">        
+      <el-form-item label='入厂日期：' prop="factoryDate">        
         <el-date-picker
-            v-model="tenant.joinDate"
+            v-model="tenant.factoryDate"
             type="date"
             value-format="yyyy-MM-dd"            
             placeholder="">
@@ -52,8 +52,8 @@
 <script>
 // 【仓库类型管理】-API
 import warehouseTypeMgrApi from "@/api/modelingCenter/warehouseTypeMgr"
-// 【原材料管理】-API
-import MaterialApi from "@/api/prepareProductMgr/material"
+// 【原材料接收管理】-API
+import ReceiveApi from "@/api/prepareProductMgr/receive"
 // 【库位管理】-API
 import locationMgrApi from "@/api/lineSideLibrary/locationMgr"
 export default {
@@ -95,19 +95,19 @@ export default {
         }],
       roles: [],
       rules: {
-      	name: [
+      	furnaceBatchNo: [
         	{ required: true, message: this.$t("rules.require"), trigger: 'blur' }
         ],
-        name2: [
+        bomBatchNo: [
         	{ required: true, message: this.$t("rules.require"), trigger: 'blur' }
         ],
-        name3: [
+        batchStand: [
         	{ required: true, message: this.$t("rules.require"), trigger: 'change' }
         ],
-        name4: [
+        factory: [
         	{ required: true, message: this.$t("rules.require"), trigger: 'change' }
         ],
-        name5: [
+        meterialBatchNo: [
         	{ required: true, message: this.$t("rules.require"), trigger: 'change' }
         ]
       }
@@ -139,13 +139,13 @@ export default {
   methods: {
     initTenant () {
       return {
-        id: '',
-        trayList: [],
-        no: '',
-        name: '',
-        shelvesId: '',
-        storgeTypeId: '',
-        status: '1'
+      	meterialId: '',
+        furnaceBatchNo: '',
+        bomBatchNo: '',
+        batchStand: '',
+        factory: '',
+        meterialBatchNo: '',
+        factoryDate: ''
       }
     },
     initWidth () {
@@ -160,7 +160,8 @@ export default {
     },
     setTenant (val) {
     	if(val){
-    		this.tenant = { ...val }
+    		// 原材料ID
+    		this.tenant.meterialId = val.id;
     	}
     },
     close () {
@@ -176,18 +177,18 @@ export default {
       this.$refs.form.validate((valid) => {
         if (valid) {
           this.confirmDisabled = true
-          if (this.type === 'add') {
-            this.save()
-          } else {
+          //if (this.type === 'add') {
+            this.save(); // 只有新增
+          /*} else {
             this.update()
-          }
+          }*/
         } else {
           return false
         }
       })
     },
     save () {
-      locationMgrApi.save(this.tenant)
+      ReceiveApi.save(this.tenant)
         .then((response) => {
           const res = response.data
           if (res.isSuccess) {
@@ -207,7 +208,7 @@ export default {
         })
     },
     update () {
-      locationMgrApi.update(this.tenant)
+      ReceiveApi.update(this.tenant)
         .then((response) => {
           const res = response.data
           if (res.isSuccess) {

imcs-ui/src/views/zuihou/prepareProductMgr/material/components/View.vue

@@ -30,16 +30,16 @@
 	      </el-table-column>
 	      <!-- CheckBox -->
 	      <el-table-column align="center" type="selection" width="50" :reserve-selection="true" />
-	      <el-table-column prop="no" label='原炉（批）号' :show-overflow-tooltip="true" width="150px"></el-table-column>
-	      <el-table-column prop="name" label='物料编码' :show-overflow-tooltip="true" width="200px"></el-table-column>
-	      <el-table-column prop="model" label='材料牌号' :show-overflow-tooltip="true"></el-table-column>
+	      <el-table-column prop="furnaceBatchNo" label='原炉（批）号' :show-overflow-tooltip="true" width="150px"></el-table-column>
+	      <el-table-column prop="meterialCode" label='物料编码' :show-overflow-tooltip="true" width="200px"></el-table-column>
+	      <el-table-column prop="tradeMark" label='材料牌号' :show-overflow-tooltip="true" width="150px"></el-table-column>
 		  	<el-table-column prop="heatNo" label='供应方名称' :show-overflow-tooltip="true" width="150px"></el-table-column>
-	      <el-table-column prop="materialNo" label='毛坯批号' :show-overflow-tooltip="true" width="150px"></el-table-column>
-	      <el-table-column prop="brand.data" label='入厂日期' :show-overflow-tooltip="true" width="150px"></el-table-column>
-	      <el-table-column prop="brand.data" label='接收数量' :show-overflow-tooltip="true" width="150px"></el-table-column>
-	      <el-table-column prop="brand.data" label='操作人员' :show-overflow-tooltip="true" width="150px"></el-table-column>
-	      <el-table-column prop="brand.data" label='操作时间' :show-overflow-tooltip="true" width="150px"></el-table-column>
-	      <el-table-column prop="brand.data" label='订单消耗数量' :show-overflow-tooltip="true" width="150px"></el-table-column>
+	      <el-table-column prop="meterialBatchNo" label='毛坯批号' :show-overflow-tooltip="true" width="150px"></el-table-column>
+	      <el-table-column prop="factoryDate" label='入厂日期' :show-overflow-tooltip="true" width="150px"></el-table-column>
+	      <el-table-column prop="batchStand" label='接收数量' :show-overflow-tooltip="true" width="150px"></el-table-column>
+	      <el-table-column prop="createUser" label='操作人员' :show-overflow-tooltip="true" width="150px"></el-table-column>
+	      <el-table-column prop="createTime" label='操作时间' :show-overflow-tooltip="true" width="150px"></el-table-column>
+	      <el-table-column prop="bomBatchNo" label='订单消耗数量' :show-overflow-tooltip="true" width="150px"></el-table-column>
 	    </el-table>
 	    
 	    <!-- 分页组件 -->
@@ -59,6 +59,8 @@
 	import Pagination from "@/components/Pagination"
 	// 【原材料管理】-API
 	import MaterialApi from "@/api/prepareProductMgr/material"
+	// 【原材料接收管理】-API
+	import ReceiveApi from "@/api/prepareProductMgr/receive"
 	// 【共通-工具】
 	import { initQueryParams } from '@/utils/commons'
 	export default {
@@ -121,6 +123,8 @@
 	    // 接收来自其他组件的-函数
 	    setTenant (val) {
 	      this.tenant = { ...val }
+	      // 获取列表数据
+    		this.fetch();
 	    },
 	    
 	    // 【关闭】当前弹出框
@@ -143,9 +147,9 @@
 				//
 	      this.queryParams.current = params.current ? params.current : this.queryParams.current
 	      this.queryParams.size = params.size ? params.size : this.queryParams.size
-	      // 搜索条件添加
-	      this.queryParams.model.brand = this.brand
-	      MaterialApi.page(this.queryParams).then(response => {
+	      // 搜索条件添加-材料的id
+	      this.queryParams.model.meterialId = this.tenant.id;
+	      ReceiveApi.page(this.queryParams).then(response => {
 	        const res = response.data
 	        if (res.isSuccess) {
 	          this.tableData = res.data