Skip to content

E
electron-printer
Commit 44895c66 by linjinhong
Options

fix：兼容新流程pod

parent e4af5316
Showing with 102 additions and 78 deletions
src/config/index.js
...@@ -4,20 +4,24 @@ export const pathMap = { ...@@ -4,20 +4,24 @@ export const pathMap = {
CN: "factory/podJomallOrderProductCn/getProductCnByFactorySubOrderNumber", CN: "factory/podJomallOrderProductCn/getProductCnByFactorySubOrderNumber",
US: "factory/podJomallOrderProductUs/getProductUsByFactorySubOrderNumber", US: "factory/podJomallOrderProductUs/getProductUsByFactorySubOrderNumber",
GC: "factory/podJomallOrderProduct/getSubOrderByThirdSubOrderNumber", GC: "factory/podJomallOrderProduct/getSubOrderByThirdSubOrderNumber",
OP: "factory/podOrderOperation/getByOperationNo",
}, },
//下载素材接口 //下载素材接口
downloadBySubOrderNumber: { downloadBySubOrderNumber: {
CN: "factory/podJomallOrderProductCn/downloadDesignImages", CN: "factory/podJomallOrderProductCn/downloadDesignImages",
US: "factory/podJomallOrderProductUs/downloadDesignImages", US: "factory/podJomallOrderProductUs/downloadDesignImages",
GC: "factory/podJomallOrder/downloadByProduction", GC: "factory/podJomallOrder/downloadByProduction",
OP: "factory/podOrderOperation/downloadDesignImages",
USHLC: "factory/podJomallOrderProductUs/downloadCompatibleDesignImages", USHLC: "factory/podJomallOrderProductUs/downloadCompatibleDesignImages",
CNHLC: "factory/podJomallOrderProductCn/downloadCompatibleDesignImages", CNHLC: "factory/podJomallOrderProductCn/downloadCompatibleDesignImages",
OPHLC: "factory/podOrderOperation/downloadCompatibleDesignImages",
}, },
//生产完成接口 //生产完成接口
completeDelivery: { completeDelivery: {
CN: "factory/podJomallOrderProductCn/completeDelivery", CN: "factory/podJomallOrderProductCn/completeDelivery",
US: "factory/podJomallOrderProductUs/completeDelivery", US: "factory/podJomallOrderProductUs/completeDelivery",
GC: "factory/podJomallOrderProduct/completeDelivery", GC: "factory/podJomallOrderProduct/completeDelivery",
OP: "factory/podOrderOperation/printerCompleteDelivery",
}, },
//惠立彩素材下载接口 //惠立彩素材下载接口
processTransparentBackground: { processTransparentBackground: {
......
src/server/entity/function.js
...@@ -163,10 +163,12 @@ export default { ...@@ -163,10 +163,12 @@ export default {
url = url =
params.orderType == "CN" params.orderType == "CN"
? downloadBySubOrderNumber["CNHLC"] ? downloadBySubOrderNumber["CNHLC"]
: params.orderType == "OP"
? downloadBySubOrderNumber["OPHLC"]
: downloadBySubOrderNumber["USHLC"]; : downloadBySubOrderNumber["USHLC"];
postUrl = `${env}/${url}?forceProduction=${forceProduction}`; postUrl = `${env}/${url}?forceProduction=${forceProduction}`;
} }
console.log("postUrl", postUrl);
const { data } = await axios.post(postUrl, [...params.ids], { const { data } = await axios.post(postUrl, [...params.ids], {
headers: { "jwt-token": token }, headers: { "jwt-token": token },
}); });
...@@ -214,24 +216,14 @@ export default { ...@@ -214,24 +216,14 @@ export default {
const params = req.body; const params = req.body;
try { try {
const urlArr = { const fieldMap = {
CN: { CN: "factorySubOrderNumber",
field: "factorySubOrderNumber", US: "factorySubOrderNumber",
url: GC: "thirdSubOrderNumber",
"factory/podJomallOrderProductCn/getProductCnByFactorySubOrderNumber", OP: "operationNo",
},
US: {
field: "factorySubOrderNumber",
url:
"factory/podJomallOrderProductUs/getProductUsByFactorySubOrderNumber",
},
GC: {
field: "thirdSubOrderNumber",
url: "factory/podJomallOrderProduct/getSubOrderByThirdSubOrderNumber",
},
}; };
let url = urlArr[params.orderType].url; let url = pathMap["findByPodProductionNo"][params.orderType];
let paramsField = urlArr[params.orderType].field; let paramsField = fieldMap[params.orderType];
let { data } = await axios.get(`${env}/${url}`, { let { data } = await axios.get(`${env}/${url}`, {
params: { params: {
...@@ -263,32 +255,21 @@ export default { ...@@ -263,32 +255,21 @@ export default {
env = getHostApi().apiApiHost; env = getHostApi().apiApiHost;
const token = req.headers["jwt-token"]; const token = req.headers["jwt-token"];
const params = req.body; const params = req.body;
const urlArr = { const fieldMap = {
CN: { CN: {
data: { id: params.id,
id: params.id, podJomallOrderCnId: params.podJomallOrderCnId || "",
podJomallOrderCnId: params.podJomallOrderCnId || "",
},
url: "factory/podJomallOrderProductCn/completeDelivery",
}, },
US: { US: {
data: { id: params.id,
id: params.id, podJomallOrderUsId: params.podJomallOrderUsId || "",
podJomallOrderUsId: params.podJomallOrderUsId || "",
},
url: "factory/podJomallOrderProductUs/completeDelivery",
},
GC: {
data: { id: params.id },
url: "factory/podJomallOrderProduct/completeDelivery",
}, },
GC: { id: params.id },
OP: { ...params.data },
}; };
let url = urlArr[params.orderType].url;
let postData = urlArr[params.orderType].data;
// console.log("postData", postData);
// console.log("240url", url);
let url = pathMap["completeDelivery"][params.orderType];
let postData = fieldMap[params.orderType];
try { try {
let { data } = await axios.post(`${env}/${url}`, postData, { let { data } = await axios.post(`${env}/${url}`, postData, {
headers: { "jwt-token": token }, headers: { "jwt-token": token },
......
src/views/design/detail/index.vue
...@@ -324,7 +324,7 @@ export default { ...@@ -324,7 +324,7 @@ export default {
<div class="div-content"> <div class="div-content">
<div :title="detail.podProductionNo" class="div-item"> <div :title="detail.podProductionNo" class="div-item">
<span>生产单号</span> <span>{{ orderType == "OP" ? "工厂订单号" : "生产单号" }}</span>
<p>{{ detail.factorySubOrderNumber }}</p> <p>{{ detail.factorySubOrderNumber }}</p>
<p <p
style="margin-left: 5px" style="margin-left: 5px"
......
src/views/design/head/index.vue
...@@ -231,7 +231,7 @@ export default { ...@@ -231,7 +231,7 @@ export default {
}, },
async setData(data) { async setData(data) {
if (!data) return this.$message.warning("请扫描生产单号"); if (!data) return this.$message.warning("请扫描生产单号");
const params = { let params = {
id: data.id, id: data.id,
orderType: this.orderType, orderType: this.orderType,
}; };
...@@ -239,6 +239,8 @@ export default { ...@@ -239,6 +239,8 @@ export default {
params.podJomallOrderCnId = data.podJomallOrderCnId; params.podJomallOrderCnId = data.podJomallOrderCnId;
} else if (this.orderType === "US") { } else if (this.orderType === "US") {
params.podJomallOrderUsId = data.podJomallOrderUsId; params.podJomallOrderUsId = data.podJomallOrderUsId;
} else if (this.orderType === "OP") {
params.data = { ...data };
} }
//如果为惠立彩则判断当前saveImgList字段中的power是否全是true 是则生产完成 //如果为惠立彩则判断当前saveImgList字段中的power是否全是true 是则生产完成
const canCallApi = const canCallApi =
...@@ -615,29 +617,22 @@ export default { ...@@ -615,29 +617,22 @@ export default {
//判断生产单号是US CN GC(老pod),并设置 setOrderType //判断生产单号是US CN GC(老pod),并设置 setOrderType
if (this.productionNo.includes("_")) { if (this.productionNo.includes("_")) {
const parts = this.productionNo.split("_"); this.$store.commit(
const pscPart = parts.find((part) => part.includes("PSC")); "setOrderType",
if (pscPart) { this.classifyField(this.productionNo),
this.$store.commit( );
"setOrderType",
this.classifyField(this.productionNo),
);
} else {
this.$store.commit(
"setOrderType",
this.classifyField(this.productionNo),
);
}
} else { } else {
let str; let str;
if (this.productionNo.includes("PSC")) { if (this.productionNo.includes("PSC")) {
str = this.productionNo.split("PSC")[0]; str = this.productionNo.split("PSC")[0];
} else if (this.productionNo.includes("OP")) {
str = "OP";
} else { } else {
str = "GC"; str = "GC";
} }
this.$store.commit("setOrderType", str); this.$store.commit("setOrderType", str);
} }
this.templateProductionNo = this.productionNo; this.templateProductionNo = this.productionNo;
try { try {
//查询当前生产单号是否在本地数据 //查询当前生产单号是否在本地数据
...@@ -702,15 +697,9 @@ export default { ...@@ -702,15 +697,9 @@ export default {
}, },
classifyField(field) { classifyField(field) {
// 第一类：以"AAAF-CNPSC"开头 if (field.includes("CN")) return "CN";
if (field.includes("CN")) { if (field.includes("US")) return "US";
return "CN"; if (field.includes("OP")) return "OP";
}
// 第二类：以"AAAF-USPSC"开头
if (field.includes("US")) {
return "US";
}
// 第三类：所有其他情况
return "GC"; return "GC";
}, },
changeActionIndex(t) { changeActionIndex(t) {
......
src/views/design/main/index.vue
...@@ -1465,10 +1465,23 @@ export default { ...@@ -1465,10 +1465,23 @@ export default {
生产单信息 生产单信息
</div> </div>
<div class="div-content"> <div class="div-content">
<div :title="detail.podProductionNo" class="div-item"> <div
<div class="item-label">生产单号：</div> :title="
orderType == `OP`
? detail.factoryOrderNumber
: detail.factorySubOrderNumber
"
class="div-item"
>
<div class="item-label">
{{ orderType == "OP" ? "工厂订单号" : "生产单号" }}:
</div>
<div class="item-value"> <div class="item-value">
{{ detail.factorySubOrderNumber }} {{
orderType == "OP"
? detail.factoryOrderNumber
: detail.factorySubOrderNumber
}}
<div <div
style="margin-left: 5px" style="margin-left: 5px"
v-if="detail.podProductionNo" v-if="detail.podProductionNo"
...@@ -1480,17 +1493,44 @@ export default { ...@@ -1480,17 +1493,44 @@ export default {
</div> </div>
</div> </div>
</div> </div>
<div :title="detail.factorySubOrderNumber" class="div-item"> <div
<div class="item-label">工厂单号：</div> :title="
<div class="item-value">{{ detail.factorySubOrderNumber }}</div> orderType == `OP`
? detail.detail.factorySubOrderNumber
: detail.factorySubOrderNumber
"
class="div-item"
>
<div class="item-label">
{{ orderType == "OP" ? "工厂操作单号" : "工厂单号" }}:
</div>
<div class="item-value">
{{
orderType == "OP"
? detail.detail.factorySubOrderNumber
: detail.factorySubOrderNumber
}}
</div>
</div> </div>
<div :title="detail.processName" class="div-item"> <div
:title="orderType == `OP` ? detail.craftName : detail.processName"
class="div-item"
>
<div class="item-label">生产工艺：</div> <div class="item-label">生产工艺：</div>
<div class="item-value">{{ detail.processName }}</div> <div class="item-value">
{{ orderType == "OP" ? detail.craftName : detail.processName }}
</div>
</div> </div>
<div :title="detail.baseSku" class="div-item"> <div
<div class="item-label">基版：</div> :title="orderType == `OP` ? detail.thirdskucode : detail.baseSku"
<div class="item-value">{{ detail.baseSku }}</div> class="div-item"
>
<div class="item-label">
{{ orderType == "OP" ? "库存SKU" : "基版" }}：
</div>
<div class="item-value">
{{ orderType == "OP" ? detail.thirdskucode : detail.baseSku }}
</div>
</div> </div>
<div :title="detail.size" class="div-item"> <div :title="detail.size" class="div-item">
<div class="item-label">尺寸：</div> <div class="item-label">尺寸：</div>
...@@ -1502,7 +1542,9 @@ export default { ...@@ -1502,7 +1542,9 @@ export default {
</div> </div>
<div :title="detail.num" class="div-item"> <div :title="detail.num" class="div-item">
<div class="item-label">数量：</div> <div class="item-label">数量：</div>
<div class="item-value">{{ detail.num }}</div> <div class="item-value">
{{ orderType == "OP" ? detail.quantity : detail.num }}
</div>
</div> </div>
<div :title="detail.supplierItemNo" class="div-item"> <div :title="detail.supplierItemNo" class="div-item">
<div class="item-label">货号：</div> <div class="item-label">货号：</div>
...@@ -1511,7 +1553,15 @@ export default { ...@@ -1511,7 +1553,15 @@ export default {
<div :title="detail.color" class="div-item"> <div :title="detail.color" class="div-item">
<div class="item-label">颜色：</div> <div class="item-label">颜色：</div>
<div class="item-value"> <div class="item-value">
{{ detail.baseSku ? detail.baseSku.split("_")[1] : null }} {{
orderType == "OP"
? detail.thirdskucode
? detail.thirdskucode.split("_")[1]
: null
: detail.baseSku
? detail.baseSku.split("_")[1]
: null
}}
</div> </div>
</div> </div>
...@@ -2290,12 +2340,12 @@ img { ...@@ -2290,12 +2340,12 @@ img {
margin-bottom: 5px; margin-bottom: 5px;
.item-label { .item-label {
flex: 1;
text-align: right; text-align: right;
flex: 3%;
} }
.item-value { .item-value {
flex: 36%; flex: 2;
} }
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment