diff --git a/src/pages.json b/src/pages.json
index cfc7b68..ae795b9 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -647,8 +647,17 @@
"navigationStyle": "custom",
"navigationBarTextStyle": "white"
}
+ },
+ {
+ "path": "pages/wms/WhiteManagement/WhiteRawInstorage/index",
+ "style": {
+ "navigationBarTitleText": "白胚原材料入库",
+ "navigationStyle": "custom",
+ "navigationBarTextStyle": "white"
+ }
}
+
],
diff --git a/src/pages/login/login/index.vue b/src/pages/login/login/index.vue
index 6f34ad1..4593b92 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.133'; //正式版本号
+ version = '0.0.134'; //正式版本号
//version = '0.0.14'; //测试版本号
//***************标志修改区域：是否是测试标志： false 正式版本； true 测试版本****************
//isTest = true;
diff --git a/src/pages/wms/WhiteManagement/WhiteRawInstorage/index.vue b/src/pages/wms/WhiteManagement/WhiteRawInstorage/index.vue
new file mode 100644
index 0000000..dc4bcd2
--- /dev/null
+++ b/src/pages/wms/WhiteManagement/WhiteRawInstorage/index.vue
@@ -0,0 +1,591 @@
+
+
+
+
+
+
+
+
+ 工单号:
+
+
+
+ 查询
+
+
+
+
+
+
+
+
+
+ 生产工单:
+ {{ orderNoItemList && orderNoItemList.procureCode }}
+
+
+ 产品编码:
+ {{ orderNoItemList && orderNoItemList.materialCode }}
+
+
+ 产品名称:
+ {{ orderNoItemList && orderNoItemList.materialName }}
+
+
+
+ 计划数量:
+ {{ orderNoItemList && orderNoItemList.planNumber }}
+
+
+ 单位:
+ {{ orderNoItemList && orderNoItemList.unit }}
+
+
+
+
+ 价格:
+ {{ orderNoItemList && orderNoItemList.price }}
+
+
+ 供应商:
+ {{ orderNoItemList && orderNoItemList.supplyName }}
+
+
+
+ 数量:
+
+
+
+
+
+
+
+
+
+
+
+ 入库确认
+
+
+
+ 返回
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/wms/WhiteManagement/WhiteRawInstorage/model.ts b/src/pages/wms/WhiteManagement/WhiteRawInstorage/model.ts
new file mode 100644
index 0000000..ae1f544
--- /dev/null
+++ b/src/pages/wms/WhiteManagement/WhiteRawInstorage/model.ts
@@ -0,0 +1,72 @@
+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.WhiteManagement.WhiteRawInstorage',
+})
+// http.defaults.headers.common['poolName'] = session.PoolName;
+export class WhiteRawInstorage extends VuexModule {
+ WlList = [];
+ orderNoItemList: any = {};
+ Picilist: any = [];
+ @MutationAction
+ async queryOrderNo(orderNo: any) {
+ const result: any = await http.post(url.lanjuwms.WhiteManagement.WhiteRawInstorage.selectWmsOdsWhiteEmbryoInhAnd, {
+ procureCode: 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.WhiteManagement.WhiteRawInstorage.addtWmsOdsWhiteEmbryoInhAnd, 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(WhiteRawInstorage);
diff --git a/src/utils/url.ts b/src/utils/url.ts
index 346e525..0ddb515 100644
--- a/src/utils/url.ts
+++ b/src/utils/url.ts
@@ -200,6 +200,10 @@ export const url = {
queryMaterialInfor: qianzhuione + '/wms/WmsToWCSmission/queryMaterialInfor',
WhiteBilletReturnConfir: qianzhuione + '/wms/WmsToWCSmission/WhiteBilletReturnConfir',
},
+ WhiteRawInstorage: {
+ selectWmsOdsWhiteEmbryoInhAnd: qianzhuione + '/wms/WmsToWCSmission/selectByprocureCode',
+ addtWmsOdsWhiteEmbryoInhAnd: qianzhuione + '/wms/WmsToWCSmission/addBpRawMaterialInDetail',
+ },
},
FGmanagement: {
PalletShift: {