diff --git a/.env.development b/.env.development
index a216fad1..9acfffb3 100644
--- a/.env.development
+++ b/.env.development
@@ -1,4 +1,4 @@
-VITE_BASE_URL=http://172.21.32.14:81/api/admin-api
+VITE_BASE_URL=http://192.168.0.128:12080/admin-api
VITE_BASE_URL_IMAGE=http://172.21.32.14:81/admin-api
# 租户配置
diff --git a/src/api/request2.js b/src/api/request2.js
index 41be514a..f6aeba3c 100644
--- a/src/api/request2.js
+++ b/src/api/request2.js
@@ -4384,4 +4384,24 @@ export function getPrintTemplateList(params) {
url: baseApi + "/wms/print/modelList",
method: "post"
});
+}
+
+
+
+//获取物料变更信息
+export function getSpareitemcode(params) {
+ return request({
+ url: baseApi + "/wms/productionitemcode-spareitemcode/getRelation",
+ method: "get",
+ data: params,
+ });
+}
+
+//获取物料变更信息
+export function getProductreceiptDetailbByPackingNumber(packingNumber ) {
+ return request({
+ url: baseApi + "/wms/productreceipt-detailb/getProductreceiptDetailbByPackingNumber?packingNumber="+packingNumber ,
+ method: "get",
+ data: {},
+ });
}
\ No newline at end of file
diff --git a/src/mycomponents/package/PackageAndItemCard.vue b/src/mycomponents/package/PackageAndItemCard.vue
index 82eb0b42..502e14c8 100644
--- a/src/mycomponents/package/PackageAndItemCard.vue
+++ b/src/mycomponents/package/PackageAndItemCard.vue
@@ -5,6 +5,7 @@
+
{{productionLineName}}
-
@@ -58,10 +58,11 @@
-
+
数量:
- ({{getUomInfo(uom)}})
+
+ ({{getUomInfo(uom)}})
@@ -265,7 +266,7 @@
productionLineName: "",
productionLineCode: "", //生产线
itemCode: this.itemCode,
- itemName:this.itemName,
+ itemName: this.itemName,
uom: this.getUomInfo(this.uom),
batch: this.batch,
packUnitName: this.packUnitName,
@@ -354,8 +355,8 @@
},
showSelectItemCode() {
- if (!this.planDate) {
- this.showErrorMessage('请先选择计划日期');
+ if (!this.productionLineCode) {
+ this.showErrorMessage('请先选择生产线');
return;
}
uni.showLoading({
diff --git a/src/pages/fg/fgChange.vue b/src/pages/fg/fgChange.vue
new file mode 100644
index 00000000..22fcb03f
--- /dev/null
+++ b/src/pages/fg/fgChange.vue
@@ -0,0 +1,482 @@
+
+
+
+
+
+
+
+
+
+
+
+ 变更前包装信息
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 唯一码
+ {{item.remark}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/pages/fg/receiptByPlan.vue b/src/pages/fg/receiptByPlan.vue
index 1960ec8a..5384eb70 100644
--- a/src/pages/fg/receiptByPlan.vue
+++ b/src/pages/fg/receiptByPlan.vue
@@ -49,19 +49,13 @@
{{dataContent.handleQty}}/
{{dataContent.packQtyHint}}
-
-
-
-
-
-
@@ -80,7 +74,6 @@
-
diff --git a/src/pages/fg/receiptNoPlan.vue b/src/pages/fg/receiptNoPlan.vue
index a373b0bb..a06faeff 100644
--- a/src/pages/fg/receiptNoPlan.vue
+++ b/src/pages/fg/receiptNoPlan.vue
@@ -132,7 +132,6 @@
index: 1,
loadingType: "",
pageSize: 20
-
};
},
@@ -163,14 +162,12 @@
},
methods: {
-
openFg() {
setTimeout(res => {
if (this.$refs.comNoReceiptPopup) {
this.$refs.comNoReceiptPopup.openRequestPopup();
}
}, 600)
-
},
requestConfirm(result) {
this.dataContent = {