diff --git a/src/api/systemFinished/systemFinished.js b/src/api/systemFinished/systemFinished.js
index 712caf18..4fc84200 100644
--- a/src/api/systemFinished/systemFinished.js
+++ b/src/api/systemFinished/systemFinished.js
@@ -9,6 +9,15 @@ export function listSystemFinished(query) {
});
}
+// 新增成品盘点单
+export function addOdsProductEmbryoInventory(data) {
+ return request({
+ url: '/wms/systemFinished/addOdsProductEmbryoInventory',
+ method: 'post',
+ params: data
+ });
+}
+
// 查询成品盘点单详细
export function getSystemFinished(ID) {
return request({
diff --git a/src/api/wms/detailed.js b/src/api/wms/detailed.js
index e42ad4ba..bfb9f3f8 100644
--- a/src/api/wms/detailed.js
+++ b/src/api/wms/detailed.js
@@ -8,7 +8,14 @@ export function listDetailed(query) {
params: query
});
}
-
+// 查询成品库存明细列表
+export function listDetailedunt(query) {
+ return request({
+ url: '/wms/detailed/listunt',
+ method: 'get',
+ params: query
+ });
+}
// 查询成品库存明细详细
export function getDetailed(storageId) {
return request({
diff --git a/src/views/wms/systemFinished/index.vue b/src/views/wms/systemFinished/index.vue
index 5eb9381a..7b1b6d69 100644
--- a/src/views/wms/systemFinished/index.vue
+++ b/src/views/wms/systemFinished/index.vue
@@ -21,6 +21,8 @@
@keyup.enter.native="handleQuery"
/>
+
+
-
+
关闭
@@ -145,11 +147,11 @@
-
+
-
+
@@ -189,7 +191,7 @@
size="mini"
type="text"
icon="el-icon-delete"
- @click="handleDelete(scope.row)"
+ @click="handleDeleteRW(scope.row)"
v-hasPermi="['systemFinished:systemFinished:remove']"
>删除
@@ -209,44 +211,86 @@
-
+
-
+
-
+
+
+
+
+
+
+
-
+
+
+
-
+
-
+
+
+
-
-
-
+
+
+
+
+
-
+
-
+
+
+
+
-
-
+
-
+
+
+
+
+
+
-
+
+
+
+
-
+
+
+
+
+
-
+
+
@@ -256,29 +300,28 @@
- 清空
+ 清空
仓库/位置创建
- 物资创建
+ 物资创建
+
-
+
-
-
-
+
+
+
-
-
+
删除
-
-
+
+
+
+
+
+
@@ -300,19 +351,24 @@
import {
listSystemFinished,
getSystemFinished,
+ addOdsProductEmbryoInventory,
delSystemFinished,
addSystemFinished,
updateSystemFinished } from "@/api/systemFinished/systemFinished";
import ItemSelectWorkOrderk from "./selectWorkOrder.vue";
+ import ItemSelectWorkOrderkTwo from "./selectWorkOrderTwo.vue";
+ import {getBoardFactory} from "../../../api/kanban/Packagingline";
+ import {getlistCK} from "../../../api/wms/outorder";
export default {
name: "SystemFinished",
- components: { ItemSelectWorkOrderk},
+ components: { ItemSelectWorkOrderk,ItemSelectWorkOrderkTwo},
data() {
return {
// 遮罩层
loading: true,
-
+ //
+ selectedItemsList: [],
//
showFlags:false,
//
@@ -330,7 +386,9 @@
// 成品盘点单表格数据
systemFinishedList: [],
//
-
+ factoryOptions:[],
+ Optionlistck:[],
+ locCodelistck:[],
// 弹出层标题
title: "",
// 是否显示弹出层
@@ -430,6 +488,7 @@
// 取消按钮
cancel() {
this.open = false;
+ this.addoutorderList = []; // 清空表格数据
this.reset();
},
// 表单重置
@@ -479,7 +538,50 @@
this.resetForm("queryForm");
this.handleQuery();
},
- // 多选框选中数据
+ /** 提交按钮 */
+ // submitForm() {
+ // this.$refs["form"].validate(valid => {
+ // console.log("-"+valid)
+ // if (valid) {
+ // console.log("---"+this.form)
+ //
+ // // 使用 JSON.stringify() 将对象转换为字符串再打印
+ // console.log("--- Form Data:", JSON.stringify(this.form));
+ //
+ // }
+ // });
+ // console.log("---"+this.addoutorderList)
+ // this.addoutorderList.forEach(item => {
+ // console.log(item);
+ // });
+ //
+ // addOdsProductEmbryoInventory().then(response => {
+ //
+ // });
+ //
+ // },
+ submitForm() {
+ this.$refs["form"].validate(valid => {
+ if (valid) {
+ // 创建一个新对象formData并将form属性赋值给它
+ const formData = Object.assign({}, this.form);
+
+ // 将addoutorderList数组赋值给formData对象
+ formData.addoutorderList = this.addoutorderList;
+
+ // 打印整合后的数据对象
+ console.log("Merged Data:", formData);
+ const jsonData = JSON.stringify(formData);
+ // 调用接口并传递整合后的数据对象
+ addOdsProductEmbryoInventory(jsonData).then(response => {
+ // 处理接口返回结果
+ }).catch(error => {
+ // 处理接口请求错误
+ });
+ }
+ });
+ },
+ // 多选框选中数据
handleSelectionChange(selection) {
this.ids = selection.map(item => item.ID)
this.single = selection.length !== 1
@@ -490,7 +592,28 @@
this.reset();
this.open = true;
this.title = "盘点新增";
+ this.selectfactoryCodelist();
+ this.form.siteCode = '1000';
+ this.getselect();
},
+ getselect() {
+ // config.headers['poolName'] = localStorage.getItem('USER_POOL_NAME_CURRENT');
+ let factoryCode = localStorage.getItem('USER_POOL_NAME_CURRENT').substring(3)
+ let params = { factoryCode: factoryCode }; // 构造一个包含工厂代码的对象
+ let paramsJSON = JSON.stringify(params); // 将对象转换为JSON字符串
+ console.log(factoryCode)
+ getlistCK(paramsJSON).then(response => {
+ //this.Optionlistck = response.data
+ console.log(response)
+ if (response.data) {
+ this.Optionlistck = response.data.map(item => ({
+ value: item.userDefined1,
+ label: item.userDefined2
+ }));
+ }
+ // console.log(this.Optionlistck)
+ });
+ },
/** 修改按钮操作 */
handleUpdate(row) {
this.reset();
@@ -502,30 +625,69 @@
this.title = "修改成品盘点单";
});
},
- handleDeleteRW(row){
- let datas =this.addoutorderList
- for(var i=0;i {
+ console.log(response)
+ if (response.data) {
+ _this.factoryOptions = response.data.map(item => ({
+ value: item.parentName,
+ label: item.deptName
+ }));
+ }
+ })
+ .catch((error) => {
+ console.error("Failed to fetch factory data: ", error);
+ });
},
+
WarehouseLocationCreation(){
console.log("---sda")
this.$refs.ItemSelectWorkOrderk.showFlags = true;
console.log("---ssda")
},
- onSelectWorkOrder(obj) {
- this.form.orderNo = obj.workorderCode;
- this.form.materialName = obj.materialName;
- this.form.materialCode = obj.materialCode;
- this.form.quality = obj.quality;
- this.form.unit = obj.unit;
- this.form.incomeTime = obj.incomeTime;
- getBatchList(obj.workorderCode).then(response => {
- this.batchList = response;
- });
+ WarehouseLocationCreationTWO(){
+ console.log("---sda")
+ this.$refs.ItemSelectWorkOrderkTwo.showFlags = true;
+ console.log("---ssda")
+ },
+ Warehempty(){
+ this.addoutorderList = []; // 清空数据
+ },
+ onSelectWorkOrder(selectedData) {
+ console.log("----------;;"+selectedData.length)
+ // this.form.unit = selectedData.unit;
+ // this.form.productName = selectedData.productName;
+ // this.form.productCode = selectedData.productCode;
+ // this.form.amount = selectedData.amount;
+ // this.form.wlCode = selectedData.wlCode;
+ // this.form.sn = selectedData.sn;
+ // 将选择的数据添加到 addoutorderList 数组中
+ // this.addoutorderList.push(selectedData);
+ this.addoutorderList.push(...selectedData);
+ //查询库存--精确到库位
+ // getBatchList(obj.workorderCode).then(response => {
+ // this.batchList = response;
+ // });
},
MaterialCreation(){
diff --git a/src/views/wms/systemFinished/selectWorkOrder.vue b/src/views/wms/systemFinished/selectWorkOrder.vue
index b85b7d46..0f6ab7c6 100644
--- a/src/views/wms/systemFinished/selectWorkOrder.vue
+++ b/src/views/wms/systemFinished/selectWorkOrder.vue
@@ -1,5 +1,5 @@
-
-
-
+
+
+
搜索
重置
-
-
-
-
-
-
-
-
-
-
- {{ parseTime(scope.row.incomeTime, '{y}-{m}-{d}') }}
-
-
+
+
+
+
+
+
+
-
+import {listDetailed, listDetailedunt} from "../../../api/wms/detailed";
+
export default {
name: "itemSelectWorkOrder",
data() {
@@ -85,7 +81,8 @@ export default {
queryParams: {
pageNum: 1,
pageSize: 10,
- workorderCode: ''
+ wlCode: null,
+ activeFlag:'1'
},
selectionRow:{}
};
@@ -100,20 +97,20 @@ export default {
return cellValue.slice(7,18); //返回值
},
//订单编码格式化
- orderCodeFormate(row, column, cellValue){
- if(cellValue !=null){
- return cellValue.slice(3,18); //返回值
- }
- },
+ // orderCodeFormate(row, column, cellValue){
+ // if(cellValue !=null){
+ // return cellValue.slice(3,18); //返回值
+ // }
+ // },
/** 查询表格列表*/
getList() {
this.loading = true;
- // getWorkOrder(this.queryParams).then(response => {
- // this.itemList = response.rows;
- // this.total = response.total;
- // this.loading = false;
- // }
- // );
+ listDetailedunt(this.queryParams).then(response => {
+ this.itemList = response.rows;
+ this.total = response.total;
+ this.loading = false;
+ }
+ );
},
/** 搜索按钮操作 */
@@ -131,17 +128,20 @@ export default {
// 多选框选中数据
handleBomSelectionChange(selection) {
+ //
+ // console.log("------"+selection.length)
+ // if(selection.length>0){
+ this.selectionRow = selection
- if(selection.length>1){
- this.$modal.msgSuccess("只能选一个");
- }
-
- this.selectionRow = selection[0]
+ // }
},
-
+ //弹窗组件中的 submitLLOrderForm() 方法中将选择的数据传递给父组件：
submitLLOrderForm() {
- this.$emit('onSelected', this.selectionRow);
+ console.log("------"+this.selectionRow.length)
+ if (this.selectionRow.length>0){
+ this.$emit('onSelected', this.selectionRow);
+ }
this.showFlags = false;
}
}
diff --git a/src/views/wms/systemFinished/selectWorkOrderTwo.vue b/src/views/wms/systemFinished/selectWorkOrderTwo.vue
new file mode 100644
index 00000000..41263030
--- /dev/null
+++ b/src/views/wms/systemFinished/selectWorkOrderTwo.vue
@@ -0,0 +1,149 @@
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+ 重置
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+