Commit 500e2e17 by 宋毅

tj

parent 340795cd
...@@ -318,15 +318,6 @@ class TradeMarkService extends ServiceBase { ...@@ -318,15 +318,6 @@ class TradeMarkService extends ServiceBase {
if (tmObj.officialType && ",dqrfa,dsccl,dsh,ddj,ydj,ywc,".indexOf(tmObj.officialType) >= 0) { if (tmObj.officialType && ",dqrfa,dsccl,dsh,ddj,ydj,ywc,".indexOf(tmObj.officialType) >= 0) {
otp["deliveryStatus"] = tmObj.officialType; otp["deliveryStatus"] = tmObj.officialType;
await self.ordertmproductSve.update(otp, t); await self.ordertmproductSve.update(otp, t);
var deliveryStatusName = uiconfig.config.pdict.official_type[tmObj.officialType];
var flowObj = {
app_id: ordertmproduct.app_id,
createuser_id: ordertmproduct.createuser_id,
sourceOrderNo: deliveryOrderNo,
opContent: "交付状态更新为【" + deliveryStatusName + "】" + obj.opNotes
};
await self.orderflowDao.create(flowObj, t);//创建订单流程
} }
// {"dqrfa":"待确认方案", "dsccl": "待上传材料", "dsh": "待审核", "ddj": "待递交", "ydj": "已递交", "ywc": "已完成" }, // {"dqrfa":"待确认方案", "dsccl": "待上传材料", "dsh": "待审核", "ddj": "待递交", "ydj": "已递交", "ywc": "已完成" },
} }
...@@ -336,6 +327,14 @@ class TradeMarkService extends ServiceBase { ...@@ -336,6 +327,14 @@ class TradeMarkService extends ServiceBase {
if (obj.submitTime) { if (obj.submitTime) {
tmObj["submitTime"] = obj.submitTime; tmObj["submitTime"] = obj.submitTime;
} }
var deliveryStatusName = uiconfig.config.pdict.official_type[tmObj.officialType];
var flowObj = {
app_id: ordertmproduct.app_id,
createuser_id: ordertmproduct.createuser_id,
sourceOrderNo: deliveryOrderNo,
opContent: "第" + tm.nclOneCodes + "类商标状态更新为【" + deliveryStatusName + "】" + obj.opNotes
};
await self.orderflowDao.create(flowObj, t);//创建交付流程
await self.dao.update(tmObj, t);//修改商标状态信息 await self.dao.update(tmObj, t);//修改商标状态信息
return system.getResultSuccess(); return system.getResultSuccess();
}) })
......
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