diff --git a/fe/PDA/api/index.js b/fe/PDA/api/index.js
index 7066dae35..27e659aff 100644
--- a/fe/PDA/api/index.js
+++ b/fe/PDA/api/index.js
@@ -580,7 +580,7 @@ export const checkjobbypacking = (params) => request(
})
//创建叫料申请
-export const materialrequest = (params) => request(
+export const issueRequest = (params) => request(
devUrl + "/api/pda/store/material-request", { //
data: params,
method: "post"
@@ -1193,6 +1193,14 @@ export const returnBeforePutaway = (params) => request(
// method: "get"
// });
+//获取位置码信息
+//查询器具是否存在
+export const getPositionCodeInfo = (code) => request(
+ devUrl + "/api/pda/position-code/" + code, { //
+ data: {},
+ method: "get"
+ });
+
//获取产品标签信息inventorylabel
export const getInventoryLabel = (code) => request(
diff --git a/fe/PDA/common/new_style.css b/fe/PDA/common/new_style.css
index d02a5c519..778eb06b3 100644
--- a/fe/PDA/common/new_style.css
+++ b/fe/PDA/common/new_style.css
@@ -257,6 +257,9 @@ uni-page-head .uni-page-head__title {
font-size: 0.875rem;
padding: 8rpx 10rpx;
border-radius: 8rpx;
+ display: flex;
+ align-items: center;
+
}
.photo_btn text {
diff --git a/fe/PDA/common/pdabasic.css b/fe/PDA/common/pdabasic.css
index 067d2f617..69008152d 100644
--- a/fe/PDA/common/pdabasic.css
+++ b/fe/PDA/common/pdabasic.css
@@ -229,7 +229,7 @@
.uni-popup-view {
background-color: #fff;
- border-radius: 10px;
+ border-radius: 15rpx;
}
.uni-popup-button-box {
diff --git a/fe/PDA/mycomponents/coms/comUnPacking.vue b/fe/PDA/mycomponents/coms/comUnPacking.vue
new file mode 100644
index 000000000..92923437e
--- /dev/null
+++ b/fe/PDA/mycomponents/coms/comUnPacking.vue
@@ -0,0 +1,190 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/fe/PDA/mycomponents/wincom/winScanByPosition.vue b/fe/PDA/mycomponents/wincom/winScanByPosition.vue
new file mode 100644
index 000000000..ac0262f48
--- /dev/null
+++ b/fe/PDA/mycomponents/wincom/winScanByPosition.vue
@@ -0,0 +1,164 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/fe/PDA/pages.js b/fe/PDA/pages.js
index 6664b21bb..a832aabde 100644
--- a/fe/PDA/pages.js
+++ b/fe/PDA/pages.js
@@ -271,6 +271,13 @@ module.exports = () => ({
"enablePullDownRefresh": true
}
},
+ {
+ "path": "pages/request/issueRequest",
+ "style": {
+ "navigationBarTitleText": "人工叫料申请",
+ "enablePullDownRefresh": true
+ }
+ },
// {
// "path": "pages/instruments/index",
// "style": {
diff --git a/fe/PDA/pages.json b/fe/PDA/pages.json
index 8a6706e6c..e61fd70ef 100644
--- a/fe/PDA/pages.json
+++ b/fe/PDA/pages.json
@@ -284,6 +284,14 @@
"enablePullDownRefresh": true
}
},
+ {
+ "path": "pages/request/issueRequest",
+ "style": {
+ "navigationBarTitleText": "人工叫料申请",
+ "enablePullDownRefresh": true
+ }
+ },
+
// {
// "path": "pages/instruments/index",
// "style": {
@@ -335,6 +343,7 @@
"enablePullDownRefresh": true
}
},
+
{
"path": "pages/task/issueByFIFO",
"style": {
diff --git a/fe/PDA/pages/login/index.vue b/fe/PDA/pages/login/index.vue
index ea466c74a..9127528da 100644
--- a/fe/PDA/pages/login/index.vue
+++ b/fe/PDA/pages/login/index.vue
@@ -58,7 +58,7 @@
- version : {{version}}
+
diff --git a/fe/PDA/pages/request/issueRequest.vue b/fe/PDA/pages/request/issueRequest.vue
new file mode 100644
index 000000000..dc7c3c264
--- /dev/null
+++ b/fe/PDA/pages/request/issueRequest.vue
@@ -0,0 +1,264 @@
+
+
+
+
+
+
+
+
+
+
+
+ 位置码 : {{dataContent.code}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.partCode }}
+
+ {{ item.partName }}
+ {{ item.partDesc }}
+
+
+
+
+
+
+
+ 库位
+
+
+ {{ item.locationCode }}({{item.locationName}})
+
+
+
+
+ 数量
+
+
+
+
+
+
+
+
+ 单位
+
+
+ {{ item.basicUom }}
+
+
+
+
+ 标包数
+
+ {{item.stdPackQty }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/fe/PDA/pages/task/issue_detail.vue b/fe/PDA/pages/task/issue_detail.vue
index 708486e9d..f8af24184 100644
--- a/fe/PDA/pages/task/issue_detail.vue
+++ b/fe/PDA/pages/task/issue_detail.vue
@@ -19,6 +19,7 @@
{{ item.itemDesc1 }}
+
diff --git a/fe/PDA/pages/task/receipt_detail.vue b/fe/PDA/pages/task/receipt_detail.vue
index 20462f2ea..c24e83f18 100644
--- a/fe/PDA/pages/task/receipt_detail.vue
+++ b/fe/PDA/pages/task/receipt_detail.vue
@@ -45,10 +45,14 @@
-
- 拍照
+ 拍照
+
+
+ 拆箱
+
+
@@ -103,7 +110,8 @@
import winScanByPack from '@/mycomponents/wincom/winScanByPack.vue'
import receiptCheck from '@/pages/task/receipt_check.vue'
import comJobScanDetail from '@/mycomponents/comjob/comJobScanDetail.vue'
-
+ import comUnPacking from '@/mycomponents/coms/comUnPacking.vue'
+
export default {
name: 'receipt_detail',
components: {
@@ -111,7 +119,8 @@
winScanButton,
winScanByPack,
receiptCheck,
- comJobScanDetail
+ comJobScanDetail,
+ comUnPacking
},
data() {
return {
@@ -312,6 +321,14 @@
that.selectedItem = item;
that.$refs.receiptCheck.openReceiptCheckPopup(item.inspectPhotoJson);
},
+ unPacking(item) {
+ this.$refs.comUnPacking.openPopup3(item,item.handledQty,item.recommendQty,false);
+ },
+
+ getUnPackingCount(qty){
+ console.log(qty)
+ },
+
getPhotoResult(files) {
this.afterPurchase();
diff --git a/fe/PDA/static/config.json b/fe/PDA/static/config.json
index 498d677b0..917536d5f 100644
--- a/fe/PDA/static/config.json
+++ b/fe/PDA/static/config.json
@@ -29,7 +29,7 @@
"print_url": "http://dev.ccwin-in.com:59095",
"version_update_url": "http://dev.ccwin-in.com:60071",
"isScrapScanToLocation": false,
- "isReceiptToday": true,
+ "isReceiptToday": false,
"scrapReason": "ScrapReason",
"purchaseReturnReason": "PurReturnReason",
"returnBeforPutawayReason": "UnqualifiedReason",