diff --git a/src/pages.json b/src/pages.json
index ae795b9..d57cfb2 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -655,6 +655,14 @@
"navigationStyle": "custom",
"navigationBarTextStyle": "white"
}
+ },
+ {
+ "path": "pages/wms/product/SpecialDelivery/index",
+ "style": {
+ "navigationBarTitleText": "成品特殊出库",
+ "navigationStyle": "custom",
+ "navigationBarTextStyle": "white"
+ }
}
diff --git a/src/pages/login/login/index.vue b/src/pages/login/login/index.vue
index 9bcd854..a5ed6de 100644
--- a/src/pages/login/login/index.vue
+++ b/src/pages/login/login/index.vue
@@ -142,7 +142,7 @@ export default class LoginPage extends BasePage {
// console.log('Version////', this.Version);
}
///********版本号修改区域**********
- version = '0.0.140'; //正式版本号
+ version = '0.0.141'; //正式版本号
//version = '0.0.14'; //测试版本号
//***************标志修改区域：是否是测试标志： false 正式版本； true 测试版本****************
//isTest = true;
diff --git a/src/pages/wms/product/SpecialDelivery/index.vue b/src/pages/wms/product/SpecialDelivery/index.vue
new file mode 100644
index 0000000..4248564
--- /dev/null
+++ b/src/pages/wms/product/SpecialDelivery/index.vue
@@ -0,0 +1,836 @@
+
+
+
+
+
+
+
+
+ 备货单:
+
+
+
+ 提单
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 产品编码:
+ {{ orderNoItemList && orderNoItemList.productCode }}
+
+
+ 产品名称:
+ {{ orderNoItemList && orderNoItemList.productName }}
+
+
+
+ 计划数量:
+ {{ orderNoItemList && orderNoItemList.planQuantity }}
+
+
+ 单位:
+ {{ orderNoItemList && orderNoItemList.unitOfMeasure }}
+
+
+
+
+ 出库数量:
+ {{ orderNoItemList && orderNoItemList.outQuantity }}
+
+
+ 出库仓库:
+ {{ loc.userDefined2 }}
+
+
+
+ 订单类型:
+ {{ orderNoItemList && orderNoItemList.attr1 }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 批次:
+ {{ item.batchNumber }}
+
+
+
+ 产品名称:
+ {{ item.productName }}
+
+
+
+ 产品编码:
+ {{ item.productCode }}
+
+
+
+ 已经出库数量:
+ {{ item.userDefined2 }}
+
+
+ 状态:
+ {{ item.userDefined1 === '0' ? '未出库' : item.userDefined1 === '1' ? '正在出库' : '出库完成' }}
+
+
+
+
+
+ 库区:
+ {{ item.waCode }}
+
+
+ 数量:
+
+
+
+
+
+
+
+ 删除
+
+
+
+
+
+
+
+
+
+
+ 出库
+
+
+
+ 返回
+
+
+
+
+
+
+
+
diff --git a/src/pages/wms/product/SpecialDelivery/model.ts b/src/pages/wms/product/SpecialDelivery/model.ts
new file mode 100644
index 0000000..14c7b4e
--- /dev/null
+++ b/src/pages/wms/product/SpecialDelivery/model.ts
@@ -0,0 +1,78 @@
+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.SpecialDelivery',
+})
+export class SpecialDelivery extends VuexModule {
+ orderNoItemList: any = [];
+ @MutationAction
+ async showProduceCode(orderNo: any) {
+ const result: any = await http.post(url.lanjuwms.product.SpecialDelivery.selectQueryFinishedProductSales, {
+ deliveryOrder: orderNo,
+ factoryCode: session.FactoryCode,
+ });
+ const orderNoItemList = result.data;
+ return { orderNoItemList };
+ }
+
+ SubmitCode: any = '';
+ @MutationAction
+ async selloutconntray(params: any) {
+ const result: any = await http.post(url.lanjuwms.product.SaleOutWH.selloutconntray, params);
+ const SubmitCode = result.code;
+ return { SubmitCode };
+ }
+ @MutationAction
+ async out(params: any) {
+ const result: any = await http.post(url.lanjuwms.product.SpecialDelivery.confirmFinishedProductSales, params);
+ const SubmitCode = result.code;
+ return { SubmitCode };
+ }
+ scanCode: any = '';
+ scandatalist: any = [];
+ scandata: any = {};
+ //整托
+ @MutationAction
+ async ScanCodeWholePallet(params: any) {
+ const result: any = await http.post(url.lanjuwms.product.SaleOutWH.ScanCodeWholePallet, params);
+ const scanCode = result.code;
+ const scandatalist = result.data;
+ return { scanCode, scandatalist };
+ }
+ //单箱
+ @MutationAction
+ async ScanCodeSingleBox(params: any) {
+ const result: any = await http.post(url.lanjuwms.product.SaleOutWH.ScanCodeSingleBox, params);
+ const scanCode = result.code;
+ const scandata = result.data;
+ return { scanCode, scandata };
+ }
+ 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.userDefined2,
+ value: element.userDefined1,
+ ...element,
+ }));
+ 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(SpecialDelivery);
diff --git a/src/utils/url.ts b/src/utils/url.ts
index 0ddb515..2f4472f 100644
--- a/src/utils/url.ts
+++ b/src/utils/url.ts
@@ -79,6 +79,10 @@ export const url = {
//提单接口
selectFinishedProductSales: qianzhuione + '/wms/WmsToWCSmission/selectFinishedProductSales',
},
+ SpecialDelivery: {
+ selectQueryFinishedProductSales: qianzhuione + '/wms/WmsToWCSmission/selectQueryFinishedProductSalesTS',
+ confirmFinishedProductSales: qianzhuione + '/wms/WmsToWCSmission/confirmFinishedProductSalesTS',
+ },
SalesReturn: {
FinishedProductSalesReturn: qianzhuione + '/wms/WmsToWCSmission/FinishedProductSalesReturn',
FinishedProductSalesReturnConfirm: qianzhuione + '/wms/WmsToWCSmission/FinishedProductSalesReturnConfirm',