diff --git a/.env.development b/.env.development
index 6bffb490..358cde95 100644
--- a/.env.development
+++ b/.env.development
@@ -1,7 +1,7 @@
-#VITE_BASE_URL=http://dev.ccwin-in.com:25300/api/admin-api
-#VITE_BASE_URL_IMAGE=http://dev.ccwin-in.com:25300/api/admin-api
+VITE_BASE_URL=http://dev.ccwin-in.com:25300/api/admin-api
+VITE_BASE_URL_IMAGE=http://dev.ccwin-in.com:25300/api/admin-api
-VITE_BASE_URL=http://172.21.32.13:81/api/admin-api
VITE_BASE_URL_IMAGE=http://172.21.32.13:81/admin-api
+#VITE_BASE_URL=http://172.21.32.13:81/api/admin-api
#VITE_BASE_URL_IMAGE=http://172.21.32.13:81/admin-api
# 租户配置
VITE_TENANT='[{"text":"长春","value":1},{"text":"成都","value":2}]'
# 是否是测试环境
diff --git a/src/mycomponents/package/packageRecordCard.vue b/src/mycomponents/package/packageRecordCard.vue
index cd166b2e..7c7a4c8f 100644
--- a/src/mycomponents/package/packageRecordCard.vue
+++ b/src/mycomponents/package/packageRecordCard.vue
@@ -64,6 +64,11 @@
type: Object,
default: {}
},
+ isShowStdPack:{
+ type: Boolean,
+ default: true
+ },
+
isShowContainer: {
type: Boolean,
default: true
diff --git a/src/mycomponents/scan/winScanLocation.vue b/src/mycomponents/scan/winScanLocation.vue
index 24f8dfc8..24515c2e 100644
--- a/src/mycomponents/scan/winScanLocation.vue
+++ b/src/mycomponents/scan/winScanLocation.vue
@@ -12,7 +12,7 @@
-
diff --git a/src/pages.json b/src/pages.json
index 9900c2ab..4915d014 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -646,6 +646,16 @@
}
}
},
+ {
+ "path": "pages/repleinsh/record/directRepleinshRecord",
+ "style": {
+ "navigationBarTitleText": "直接补料",
+ "enablePullDownRefresh": true,
+ "titleNView": {
+ "autoBackButton": "true"
+ }
+ }
+ },
{
"path": "pages/productionReturn/request/returnRequestCreate",
"style": {
diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue
index 867d449d..10bc33c0 100644
--- a/src/pages/index/index.vue
+++ b/src/pages/index/index.vue
@@ -366,7 +366,7 @@
console.log("包装规格获取失败", res)
})
- var switchCode="FgPutawayLocationCodeValidate,SemiPutawayLocationCodeValidate,PurchasePutawayToLocationCodeValidate,IssueToLocationCodeValidate";
+ var switchCode="FgPutawayLocationCodeValidate,SemiPutawayLocationCodeValidate,PurchasePutawayToLocationCodeValidate,IssueToLocationCodeValidate,fgProductReceipCommitValidate";
getSwitchByCode(switchCode).then(res=>{
uni.setStorageSync("switch", res.data)
diff --git a/src/pages/issue/record/directIssue.vue b/src/pages/issue/record/directIssue.vue
index d006d931..4d552454 100644
--- a/src/pages/issue/record/directIssue.vue
+++ b/src/pages/issue/record/directIssue.vue
@@ -388,7 +388,7 @@
issueRecordSubmit(params).then(res => {
uni.hideLoading()
if (res.data) {
- this.showCommitSuccessMessage("提交成功
生成采购上架记录
" + res.data)
+ this.showCommitSuccessMessage("提交成功
生成直接发料记录
" + res.data)
} else {
this.showErrorMessage("提交失败[" + res.msg + "]")
}
diff --git a/src/pages/productReceipt/job/fgProductReceiptDetail.vue b/src/pages/productReceipt/job/fgProductReceiptDetail.vue
index 104d5ae4..962054c7 100644
--- a/src/pages/productReceipt/job/fgProductReceiptDetail.vue
+++ b/src/pages/productReceipt/job/fgProductReceiptDetail.vue
@@ -84,6 +84,7 @@
goHome,
navigateBack,
getPackingNumberAndBatch,
+ getSwitchInfoByCode
} from '@/common/basic.js';
import {
@@ -219,7 +220,7 @@
that.jobContent = res.data;
that.subList = res.data.subList;
that.jobStatus = res.data.status
- that.jobToLocationCode = that.subList[0].toLocationCode
+ that.jobToLocationCode = that.subList[0].toLocationCode
if(that.jobContent.allowModifyLocation=='FALSE'){
that.toLocationCode = that.subList[0].toLocationCode
}
@@ -429,21 +430,27 @@
if (!this.checkLocation()) {
return
}
+ var valiDate =getSwitchInfoByCode("fgProductReceipCommitValidate")
this.detailSource.forEach(item => {
item.subList.forEach(subitem => {
- if (subitem.handleQty == undefined) {
- this.showMessage("还没扫码成品不能提交")
- } else {
- if (subitem.handleQty != subitem.packQty) {
- this.showQuestionMessage('制品数量不等于包装数量,是否继续提交?', res => {
- if (res) {
- this.submitJob();
- }
- });
+ if(valiDate){
+ if (subitem.handleQty == undefined) {
+ this.showMessage("还没扫码成品不能提交")
} else {
- this.submitJob();
+ if (subitem.handleQty != subitem.packQty) {
+ this.showQuestionMessage('制品数量不等于包装数量,是否继续提交?', res => {
+ if (res) {
+ this.submitJob();
+ }
+ });
+ } else {
+ this.submitJob();
+ }
}
+ }else {
+ this.submitJob();
}
+
})
})
},
diff --git a/src/pages/productReceipt/job/productReceiptJob.vue b/src/pages/productReceipt/job/productReceiptJob.vue
index 381b406b..40aa4911 100644
--- a/src/pages/productReceipt/job/productReceiptJob.vue
+++ b/src/pages/productReceipt/job/productReceiptJob.vue
@@ -21,7 +21,7 @@
-
+
diff --git a/src/pages/repleinsh/record/directRepleinshRecord.vue b/src/pages/repleinsh/record/directRepleinshRecord.vue
new file mode 100644
index 00000000..a18eec6b
--- /dev/null
+++ b/src/pages/repleinsh/record/directRepleinshRecord.vue
@@ -0,0 +1,551 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file