diff --git a/src/pages.json b/src/pages.json
index 8711d8b..7381186 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -519,6 +519,22 @@
"navigationStyle": "custom",
"navigationBarTextStyle": "white"
}
+ },
+ {
+ "path": "pages/wms/FGmanagement/FinishedProCheck/index",
+ "style": {
+ "navigationBarTitleText": "成品盘点",
+ "navigationStyle": "custom",
+ "navigationBarTextStyle": "white"
+ }
+ },
+ {
+ "path": "pages/wms/product/BatchOfflineStorage/index",
+ "style": {
+ "navigationBarTitleText": "批量下线入库",
+ "navigationStyle": "custom",
+ "navigationBarTextStyle": "white"
+ }
}
diff --git a/src/pages/wms/FGmanagement/FinishedProCheck/index.vue b/src/pages/wms/FGmanagement/FinishedProCheck/index.vue
new file mode 100644
index 0000000..94a723d
--- /dev/null
+++ b/src/pages/wms/FGmanagement/FinishedProCheck/index.vue
@@ -0,0 +1,727 @@
+
+
+
+
+
+
+
+
+ 盘点单号:
+
+
+
+
+
+
+
+
+
+
+ 盘点仓库:
+ {{ orderNoItemList && orderNoItemList.userDefined1 }}
+
+
+ 实盘数量:
+ {{ unit }}
+
+
+
+
+
+
+
+
+
+
+
+
+ 物料编码:
+ {{ scandata && scandata.materialCode }}
+
+
+ 物料名称:
+ {{ scandata && scandata.materialDesc }}
+
+
+
+ 托盘号:
+ {{ scandata && scandata.userDefined2 }}
+
+
+ 库存位置:
+ {{ scandata && scandata.locCode }}
+
+
+
+
+ 应盘数量:
+ {{ scandata && scandata.userDefined3 == 0 ? scandata.locNumber : '**' }}
+
+
+ 单位:
+ {{ scandata && scandata.unit }}
+
+
+
+
+
+ 实盘数量:
+
+
+
+ 确认
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 托盘号:
+ {{ item.userDefined2 }}
+
+
+ 库位:
+ {{ item.locCode }}
+
+
+
+
+ 物料编码:
+ {{ item.materialCode }}
+
+
+ 物料名称:
+ {{ item.materialDesc }}
+
+
+
+
+ 应盘数量:
+ {{ item.locNumber }}
+
+
+ 实盘数量:
+ {{ item.realityNumber }}
+
+
+
+
+
+ 删除
+
+
+
+
+
+
+
+
+
+
+ 返回
+
+
+
+ 盘点完成
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/wms/FGmanagement/FinishedProCheck/model.ts b/src/pages/wms/FGmanagement/FinishedProCheck/model.ts
new file mode 100644
index 0000000..9393924
--- /dev/null
+++ b/src/pages/wms/FGmanagement/FinishedProCheck/model.ts
@@ -0,0 +1,94 @@
+import { getModule, Module, MutationAction, VuexModule } from 'vuex-module-decorators';
+import store from '@/store';
+import http from '@/utils/request';
+import { url } from '@/utils/url';
+import { session } from '@/store/modules/session';
+@Module({
+ namespaced: true,
+ dynamic: true,
+ store,
+ name: 'page.FGmanagement.FinishedProCheck',
+})
+export class FinishedProCheck extends VuexModule {
+ orderNoItemList: any = [];
+ @MutationAction
+ async showProduceCode(orderNo: any) {
+ const result: any = await http.post(url.lanjuwms.FGmanagement.FinishedProCheck.selectOdsProductEmbryoInventory, {
+ orderCode: orderNo,
+ siteCode: session.FactoryCode,
+ });
+ // http.defaults.headers.common['Accept-Language'] = session.PoolName;
+ const orderNoItemList = result.data;
+ return { orderNoItemList };
+ }
+ information: any = [];
+ @MutationAction
+ async queryinformation(item) {
+ console.log(item);
+ const result: any = await http.get(url.lanjuwms.product.SaleOutWH.queryinformation + '/' + item.orderNo + '/' + item.value, {});
+ const information = result.data;
+ return { information };
+ }
+ TraysList: any = [];
+ @MutationAction
+ async showTrays(item: any) {
+ const result: any = await http.get(url.lanjuwms.product.SaleOutWH.showTrays + '/' + item.orderNo + '/' + item.value, {});
+ const TraysList = result.data;
+ return { TraysList };
+ }
+ SubmitCode: any = '';
+ scanreturndata: any = {};
+ @MutationAction
+ async selloutconntray(params: any) {
+ const result: any = await http.post(url.lanjuwms.FGmanagement.FinishedProCheck.selectScanningTray, params);
+ let scanreturndata: any;
+ if (result.data) {
+ scanreturndata = result.data;
+ } else {
+ scanreturndata = null;
+ }
+
+ const SubmitCode = result.code;
+ return { scanreturndata, SubmitCode };
+ }
+ confirmcode: any = '';
+ @MutationAction
+ async confirmscan(params: any) {
+ const result: any = await http.post(url.lanjuwms.FGmanagement.FinishedProCheck.confirmInventory, params);
+ const confirmcode = result.code;
+ return { confirmcode };
+ }
+ //查询盘点数据接口
+ seleconfirmcode: any = '';
+ selectscandataobj: any = [];
+ @MutationAction
+ async selectscandata(params: string) {
+ const result: any = await http.post(url.lanjuwms.FGmanagement.FinishedProCheck.selectOdsProductEmbryoInventoryCorrelation, {
+ orderCode: params,
+ siteCode: session.FactoryCode,
+ });
+ console.log('e32dwedc', result);
+ const seleconfirmcode = result.code;
+ const selectscandataobj = result.data;
+
+ return { seleconfirmcode, selectscandataobj };
+ }
+ @MutationAction
+ async deleteTray(item: string) {
+ console.log(item);
+ const result: any = await http.post(url.lanjuwms.FGmanagement.FinishedProCheck.cancelInventory, {
+ siteCode: session.FactoryCode,
+ id: item,
+ });
+ const SubmitCode = result.code;
+ return { SubmitCode };
+ }
+ @MutationAction
+ async check(params: any) {
+ const result: any = await http.post(url.lanjuwms.FGmanagement.FinishedProCheck.confirmCompletion, params);
+ const SubmitCode = result.code;
+ return { SubmitCode };
+ }
+}
+
+export default getModule(FinishedProCheck);
diff --git a/src/pages/wms/product/BatchOfflineStorage/index.vue b/src/pages/wms/product/BatchOfflineStorage/index.vue
new file mode 100644
index 0000000..4c6abf0
--- /dev/null
+++ b/src/pages/wms/product/BatchOfflineStorage/index.vue
@@ -0,0 +1,763 @@
+
+
+
+
+
+
+
+
+ 报工单号:
+
+
+
+
+
+
+
+
+
+
+
+ 生产订单:
+ {{ orderNoItemList && orderNoItemList.productOrder }}
+
+
+ 产品编码:
+ {{ orderNoItemList && orderNoItemList.productCode }}
+
+
+ 产品名称:
+ {{ orderNoItemList && orderNoItemList.productName }}
+
+
+ 批次号:
+ {{ orderNoItemList && orderNoItemList.batchNumber }}
+
+
+
+ 订单数量:
+ {{ orderNoItemList && orderNoItemList.planQuantity }}
+
+
+ 单位:
+ {{ orderNoItemList && orderNoItemList.unitOfMeasure }}
+
+
+
+ 入库数量:
+
+
+
+
+ 出库仓库:
+
+
+
+
+
+
+
+ 入库
+
+
+
+
+
+
+
+
+
+
+
+
+ 箱数:
+ {{ item.number }}
+
+
+
+
+ 库位码:
+ {{ item.wlCode }}
+
+
+ 托盘码:
+ {{ item.sn }}
+
+
+
+
+
+ 删除
+
+
+
+
+
+
+
+
+
+
+ 入库确认
+
+
+
+ 返回
+
+
+
+
+
+
+
+ 托盘号：
+
+
+
+ 入库库位：
+
+
+
+ 箱数：
+
+
+
+
+
+ 确定
+
+ 取消
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/wms/product/BatchOfflineStorage/model.ts b/src/pages/wms/product/BatchOfflineStorage/model.ts
new file mode 100644
index 0000000..e14f03c
--- /dev/null
+++ b/src/pages/wms/product/BatchOfflineStorage/model.ts
@@ -0,0 +1,71 @@
+import { getModule, Module, MutationAction, VuexModule } from 'vuex-module-decorators';
+import store from '@/store';
+import http from '@/utils/request';
+import { url } from '@/utils/url';
+import { session } from '@/store/modules/session';
+@Module({
+ namespaced: true,
+ dynamic: true,
+ store,
+ name: 'page.product.BatchOfflineStorage',
+})
+// http.defaults.headers.common['poolName'] = session.PoolName;
+export class BatchOfflineStorage extends VuexModule {
+ WlList = [];
+ orderNoItemList: any = [];
+ @MutationAction
+ async queryOrderNo(orderNo: any) {
+ const result: any = await http.post(url.lanjuwms.product.OfflineStorage.queryinformation, {
+ workOrder: orderNo,
+ factoryCode: session.FactoryCode,
+ // headers: {
+ // poolName: session.PoolName,
+ // },
+ });
+ // http.defaults.headers.common['Accept-Language'] = session.PoolName;
+ const orderNoItemList = result.data;
+ return { orderNoItemList };
+ }
+ productCodeList: any = [];
+ @MutationAction
+ async list(orderNo: any) {
+ const result: any = await http.get(url.lanjuwms.product.OfflineStorage.list + '/' + orderNo, {});
+ const productCodeList = result.data;
+ return { productCodeList };
+ }
+ SubmitCode: any = '';
+ @MutationAction
+ async insertTary(params: any) {
+ const result: any = await http.post(url.lanjuwms.product.OfflineStorage.insertTary, params);
+ const SubmitCode = result.code;
+ return { SubmitCode };
+ }
+ @MutationAction
+ async deleteTray(item: any) {
+ console.log(item);
+ const result: any = await http.delete(url.lanjuwms.product.OfflineStorage.deleteTray + '/' + item.sn + '/' + item.orderNo);
+ const SubmitCode = result.code;
+ return { SubmitCode };
+ }
+ @MutationAction
+ async handPut(params: any) {
+ const result: any = await http.post(url.lanjuwms.product.OfflineStorage.WmsProductPutByWorkOrderConfirm, params);
+ const SubmitCode = result.code;
+ return { SubmitCode };
+ }
+ warehouselist: any = [];
+ @MutationAction
+ async getwarehouselist() {
+ const result = await http.post(url.lanjuwms.raw.ProductionREQ.warehouselist, {
+ factoryCode: session.FactoryCode,
+ });
+ const warehouselist = result.data.map((element: any) => ({
+ label: element.warehouseName,
+ value: element.warehouseCode,
+ ...element,
+ }));
+ return { warehouselist };
+ }
+}
+
+export default getModule(BatchOfflineStorage);
diff --git a/src/pages/wms/product/SaleOutWH/index.vue b/src/pages/wms/product/SaleOutWH/index.vue
index bf91808..e416eec 100644
--- a/src/pages/wms/product/SaleOutWH/index.vue
+++ b/src/pages/wms/product/SaleOutWH/index.vue
@@ -369,6 +369,33 @@ export default class SaleOutWH extends BasePage {
}
async tidan() {
//提单方法
+ // if (this.orderNo == '' || this.orderNo.length == 0) {
+ // (this.$refs.uToast as any).show({
+ // title: '请输入备货单号',
+ // // url: '/pages/user/index'
+ // });
+ // return;
+ // }
+ let item = {
+ factoryCode: session.FactoryCode,
+ //deliveryOrder: this.orderNo,
+ createBy: session.loginName,
+ };
+ await this.model.selectFinishedProductSales(item);
+ if (this.model.tidancode == '200') {
+ (this.$refs.uToast as any).show({
+ title: '提单成功',
+ type: 'success',
+ });
+ //this.list = [];
+ this.query();
+ //this.productCodebiaozhiwei = '';
+ } else {
+ (this.$refs.uToast as any).show({
+ title: '提单失败',
+ type: 'error',
+ });
+ }
}
}
diff --git a/src/pages/wms/product/SaleOutWH/model.ts b/src/pages/wms/product/SaleOutWH/model.ts
index d614552..fbde8ed 100644
--- a/src/pages/wms/product/SaleOutWH/model.ts
+++ b/src/pages/wms/product/SaleOutWH/model.ts
@@ -66,6 +66,13 @@ export class SaleOutWH extends VuexModule {
}));
return { warehouselist };
}
+ tidancode: any = '';
+ @MutationAction
+ async selectFinishedProductSales(params) {
+ const result: any = await http.post(url.lanjuwms.product.SaleOutWH.selectFinishedProductSales, params);
+ const tidancode = result.code;
+ return { tidancode };
+ }
}
export default getModule(SaleOutWH);
diff --git a/src/utils/page.ts b/src/utils/page.ts
index 423921e..5819504 100644
--- a/src/utils/page.ts
+++ b/src/utils/page.ts
@@ -43,5 +43,7 @@ export const page = {
SalesReturndetail: '/pages/wms/product/SalesReturn/detail',
TransferWarehouse: '/pages/wms/product/TransferWarehouse/index',
PalletShift: '/pages/wms/FGmanagement/PalletShift/index',
+ FinishedProCheck: '/pages/wms/FGmanagement/FinishedProCheck/index',
+ BatchOfflineStorage: '/pages/wms/product/BatchOfflineStorage/index',
},
};
diff --git a/src/utils/url.ts b/src/utils/url.ts
index 1aa7dc3..dc841af 100644
--- a/src/utils/url.ts
+++ b/src/utils/url.ts
@@ -73,6 +73,8 @@ export const url = {
selectQueryFinishedProductSales: qianzhuione + '/wms/WmsToWCSmission/selectQueryFinishedProductSales',
//销售出库确认
confirmFinishedProductSales: qianzhuione + '/wms/WmsToWCSmission/confirmFinishedProductSales',
+ //提单接口
+ selectFinishedProductSales: qianzhuione + '/wms/WmsToWCSmission/selectFinishedProductSales',
},
SalesReturn: {
FinishedProductSalesReturn: qianzhuione + '/wms/WmsToWCSmission/FinishedProductSalesReturn',
@@ -144,6 +146,14 @@ export const url = {
palletScanning: qianzhuione + '/wms/WmsToWCSmission/palletScanning',
palletTransferConfirmation: qianzhuione + '/wms/WmsToWCSmission/palletTransferConfirmation',
},
+ FinishedProCheck: {
+ selectOdsProductEmbryoInventory: qianzhuione + '/wms/WmsToWCSmission/selectOdsProductEmbryoInventory',
+ selectScanningTray: qianzhuione + '/wms/WmsToWCSmission/selectScanningTray',
+ confirmInventory: qianzhuione + '/wms/WmsToWCSmission/confirmInventory',
+ cancelInventory: qianzhuione + '/wms/WmsToWCSmission/cancelInventory',
+ selectOdsProductEmbryoInventoryCorrelation: qianzhuione + '/wms/WmsToWCSmission/selectOdsProductEmbryoInventoryCorrelation',
+ confirmCompletion: qianzhuione + '/wms/WmsToWCSmission/confirmCompletion',
+ },
},
},
// 设备管理