Skip to content

Z
zhichan
Commit c22f30e8 by 王勇飞
Options

gyq

parent 6a8d28e5
Showing with 52 additions and 24 deletions
ic-deliver/app/base/controller/impl/bizchance/MaterialCtl.js
...@@ -10,7 +10,8 @@ class MaterialCtl extends CtlBase { ...@@ -10,7 +10,8 @@ class MaterialCtl extends CtlBase {
} }
/*根据交付单id获取材料信息*/ /*根据交付单id获取材料信息*/
async findInfoByDeliverId(pobj,qobj,req){ async findInfoByDeliverId(mobj,qobj,req){
var pobj = mobj.d;
if (pobj.deliverId && pobj.deliverId != 'undefined') if (pobj.deliverId && pobj.deliverId != 'undefined')
{ {
try{ try{
...@@ -38,7 +39,8 @@ class MaterialCtl extends CtlBase { ...@@ -38,7 +39,8 @@ class MaterialCtl extends CtlBase {
} }
/*根据交付单id更新交付单编号信息*/ /*根据交付单id更新交付单编号信息*/
async updateInfoByDeliverId(pobj,qobj,req){ async updateInfoByDeliverId(mobj,qobj,req){
var pobj = mobj.d;
if (pobj.deliverId && pobj.deliverId != 'undefined' && pobj.deliverNumber && pobj.deliverNumber != 'undefined'){ if (pobj.deliverId && pobj.deliverId != 'undefined' && pobj.deliverNumber && pobj.deliverNumber != 'undefined'){
try{ try{
var res = await this.service.updateInfoByDeliverId(pobj); var res = await this.service.updateInfoByDeliverId(pobj);
...@@ -54,7 +56,8 @@ class MaterialCtl extends CtlBase { ...@@ -54,7 +56,8 @@ class MaterialCtl extends CtlBase {
} }
/*插入缓存信息 */ /*插入缓存信息 */
async insertInfo(pobj,qobj,req){ async insertInfo(mobj,qobj,req){
var pobj = mobj.d;
if (pobj.deliverId && pobj.deliverId != 'undefined'){ if (pobj.deliverId && pobj.deliverId != 'undefined'){
try{ try{
var res = await this.service.insertInfo(pobj); var res = await this.service.insertInfo(pobj);
......
ic-deliver/app/base/controller/impl/bizchance/bizoptCtl.js
...@@ -47,7 +47,8 @@ class BizOptCtl extends CtlBase { ...@@ -47,7 +47,8 @@ class BizOptCtl extends CtlBase {
} }
/*根据商机编号获取商机详情*/ /*根据商机编号获取商机详情*/
async findInfoByDemandCode(pobj,qobj,req){ async findInfoByDemandCode(mobj,qobj,req){
var pobj = mobj.d;
if (pobj.businessMode && pobj.businessMode != 'undefined') if (pobj.businessMode && pobj.businessMode != 'undefined')
{ {
try{ try{
...@@ -100,7 +101,8 @@ class BizOptCtl extends CtlBase { ...@@ -100,7 +101,8 @@ class BizOptCtl extends CtlBase {
} }
/*根据商机编号更新商机状态*/ /*根据商机编号更新商机状态*/
async updateStatusByDemandCode(pobj,qobj,req){ async updateStatusByDemandCode(mobj,qobj,req){
var pobj = mobj.d;
if (pobj.businessMode && pobj.businessMode != 'undefined' && pobj.currentStatus && pobj.currentStatus != 'undefined'){ if (pobj.businessMode && pobj.businessMode != 'undefined' && pobj.currentStatus && pobj.currentStatus != 'undefined'){
try{ try{
await this.service.updateStatusByDemandCode(pobj); await this.service.updateStatusByDemandCode(pobj);
...@@ -153,7 +155,8 @@ class BizOptCtl extends CtlBase { ...@@ -153,7 +155,8 @@ class BizOptCtl extends CtlBase {
} }
/*插入数据信息 */ /*插入数据信息 */
async insertInfo(pobj,qobj,req){ async insertInfo(mobj,qobj,req){
var pobj = mobj.d;
if (pobj.businessMode && pobj.businessMode != 'undefined' && pobj.businessType && pobj.businessType != 'undefined'){ if (pobj.businessMode && pobj.businessMode != 'undefined' && pobj.businessType && pobj.businessType != 'undefined'){
try{ try{
pobj.currentStatus = "beforeSubmission";//加上当前状态为待提交方案 pobj.currentStatus = "beforeSubmission";//加上当前状态为待提交方案
......
ic-deliver/app/base/controller/impl/bizchance/cacheinfoCtl.js
...@@ -10,7 +10,8 @@ class CacheInfoCtl extends CtlBase { ...@@ -10,7 +10,8 @@ class CacheInfoCtl extends CtlBase {
} }
/*根据交付单id获取缓存详情*/ /*根据交付单id获取缓存详情*/
async findInfoByDeliverId(pobj,qobj,req){ async findInfoByDeliverId(mobj,qobj,req){
var pobj = mobj.d;
if (pobj.deliverNumber && pobj.deliverNumber != 'undefined') if (pobj.deliverNumber && pobj.deliverNumber != 'undefined')
{ {
try{ try{
...@@ -32,7 +33,8 @@ class CacheInfoCtl extends CtlBase { ...@@ -32,7 +33,8 @@ class CacheInfoCtl extends CtlBase {
} }
/*根据交付单id更新缓存信息*/ /*根据交付单id更新缓存信息*/
async updateInfoByDeliverId(pobj,qobj,req){ async updateInfoByDeliverId(mobj,qobj,req){
var pobj = mobj.d;
if (pobj.deliverNumber && pobj.deliverNumber != 'undefined' && pobj.cacheInfo && pobj.cacheInfo != 'undefined'){ if (pobj.deliverNumber && pobj.deliverNumber != 'undefined' && pobj.cacheInfo && pobj.cacheInfo != 'undefined'){
try{ try{
var res = await this.service.updateInfoByDeliverId(pobj); var res = await this.service.updateInfoByDeliverId(pobj);
...@@ -48,7 +50,8 @@ class CacheInfoCtl extends CtlBase { ...@@ -48,7 +50,8 @@ class CacheInfoCtl extends CtlBase {
} }
/*插入或更新缓存信息 */ /*插入或更新缓存信息 */
async createInfo(pobj,qobj,req){ async createInfo(mobj,qobj,req){
var pobj = mobj.d;
if (pobj.deliverNumber && pobj.deliverNumber != 'undefined' && pobj.cacheInfo && pobj.cacheInfo != 'undefined'){ if (pobj.deliverNumber && pobj.deliverNumber != 'undefined' && pobj.cacheInfo && pobj.cacheInfo != 'undefined'){
try{ try{
var rs = await this.service.findInfoByDeliverId(pobj); var rs = await this.service.findInfoByDeliverId(pobj);
......
ic-deliver/app/base/controller/impl/bizchance/deliverybillCtl.js
...@@ -75,7 +75,8 @@ class DeliverybillCtl extends CtlBase { ...@@ -75,7 +75,8 @@ class DeliverybillCtl extends CtlBase {
} }
/*根据交付单编号获取交付单详情和材料详情*/ /*根据交付单编号获取交付单详情和材料详情*/
async dealInfo(pobj, qobj, req) { async dealInfo(mobj, qobj, req) {
var pobj = mobj.d;
if (pobj.deliverNumber && pobj.deliverNumber != 'undefined') { if (pobj.deliverNumber && pobj.deliverNumber != 'undefined') {
try { try {
var rs = await this.service.findInfoByDeliverCode(pobj); var rs = await this.service.findInfoByDeliverCode(pobj);
...@@ -185,7 +186,8 @@ class DeliverybillCtl extends CtlBase { ...@@ -185,7 +186,8 @@ class DeliverybillCtl extends CtlBase {
} }
/*根据交付单编号更新交付单状态*/ /*根据交付单编号更新交付单状态*/
async updateStatusByDeliverCode(pobj, qobj, req) { async updateStatusByDeliverCode(mobj, qobj, req) {
var pobj = mobj.d;
if (pobj.deliverNumber && pobj.deliverNumber != 'undefined' && pobj.deliverStatus && pobj.deliverStatus != 'undefined') { if (pobj.deliverNumber && pobj.deliverNumber != 'undefined' && pobj.deliverStatus && pobj.deliverStatus != 'undefined') {
try { try {
//调商城接口，回传状态信息，放队列 //调商城接口，回传状态信息，放队列
...@@ -237,7 +239,8 @@ class DeliverybillCtl extends CtlBase { ...@@ -237,7 +239,8 @@ class DeliverybillCtl extends CtlBase {
} }
} }
async UpdateofficialSealByDeliverCode(pobj, qobj, req) {//更新营业执照扫描件和公章扫描件 async UpdateofficialSealByDeliverCode(mobj, qobj, req) {//更新营业执照扫描件和公章扫描件
var pobj = mobj.d;
if ((pobj.deliverNumber && pobj.deliverNumber != 'undefined' && ((pobj.baseInfo.officialSeal && pobj.baseInfo.officialSeal != 'undefined') || (pobj.baseInfo.businessLicense && pobj.baseInfo.businessLicense != 'undefined')))) { if ((pobj.deliverNumber && pobj.deliverNumber != 'undefined' && ((pobj.baseInfo.officialSeal && pobj.baseInfo.officialSeal != 'undefined') || (pobj.baseInfo.businessLicense && pobj.baseInfo.businessLicense != 'undefined')))) {
try { try {
var rs = await this.service.findInfoByDeliverCode(pobj)//先得到交付单详情 var rs = await this.service.findInfoByDeliverCode(pobj)//先得到交付单详情
...@@ -298,7 +301,8 @@ class DeliverybillCtl extends CtlBase { ...@@ -298,7 +301,8 @@ class DeliverybillCtl extends CtlBase {
} }
} }
async updateExpressInfoByDeliverCode(pobj, qobj, req) {//更新邮寄信息 async updateExpressInfoByDeliverCode(mobj, qobj, req) {//更新邮寄信息
var pobj = mobj.d;
if (pobj.deliverNumber && pobj.deliverNumber != 'undefined' && pobj.expressInfo && pobj.expressInfo != 'undefined') { if (pobj.deliverNumber && pobj.deliverNumber != 'undefined' && pobj.expressInfo && pobj.expressInfo != 'undefined') {
try { try {
var deliverInfo = await this.service.findInfoByDeliverCode(pobj)//先得到交付单详情 var deliverInfo = await this.service.findInfoByDeliverCode(pobj)//先得到交付单详情
...@@ -319,6 +323,7 @@ class DeliverybillCtl extends CtlBase { ...@@ -319,6 +323,7 @@ class DeliverybillCtl extends CtlBase {
} }
} }
} }
var rtn = await rc.execPost(params, requrl);
var j = JSON.parse(rtn.stdout); var j = JSON.parse(rtn.stdout);
if (j.status == 1) { if (j.status == 1) {
await this.materialService.updateInfoByDeliverNumber(pobj); await this.materialService.updateInfoByDeliverNumber(pobj);
...@@ -344,7 +349,8 @@ class DeliverybillCtl extends CtlBase { ...@@ -344,7 +349,8 @@ class DeliverybillCtl extends CtlBase {
} }
/*根据交付单编号更新交付单详情*/ /*根据交付单编号更新交付单详情*/
async updateInfoByDeliverCode(pobj, qobj, req) {// async updateInfoByDeliverCode(mobj, qobj, req) {//
var pobj = mobj.d;
if (pobj.deliverNumber && pobj.deliverNumber != 'undefined') { if (pobj.deliverNumber && pobj.deliverNumber != 'undefined') {
try { try {
var rs = await this.service.findInfoByDeliverCode(pobj)//先得到交付单详情 var rs = await this.service.findInfoByDeliverCode(pobj)//先得到交付单详情
...@@ -419,7 +425,8 @@ class DeliverybillCtl extends CtlBase { ...@@ -419,7 +425,8 @@ class DeliverybillCtl extends CtlBase {
return system.getResult({}) return system.getResult({})
} }
/*根据商机编号插入交付单信息*/ /*根据商机编号插入交付单信息*/
async insertInfo(pobj, qobj, req) {//队列的时候用 async insertInfo(nobj, qobj, req) {//队列的时候用
var pobj = nobj.d;
if (pobj.businessMode && pobj.businessMode != 'undefined' && pobj.schemeNumber && pobj.schemeNumber != 'undefined' if (pobj.businessMode && pobj.businessMode != 'undefined' && pobj.schemeNumber && pobj.schemeNumber != 'undefined'
&& pobj.deliverNumber && pobj.deliverNumber != 'undefined') { && pobj.deliverNumber && pobj.deliverNumber != 'undefined') {
try { try {
......
ic-deliver/app/base/controller/impl/bizchance/schemeCtl.js
...@@ -15,7 +15,8 @@ class SchemeCtl extends CtlBase { ...@@ -15,7 +15,8 @@ class SchemeCtl extends CtlBase {
} }
/*根据id获取方案信息详情*/ /*根据id获取方案信息详情*/
async findById(pobj, qobj, req) { async findById(mobj, qobj, req) {
var pobj = mobj.d;
if (pobj.id && pobj.id != 'undefined'){ if (pobj.id && pobj.id != 'undefined'){
try{ try{
var rs = await this.service.findById(pobj); var rs = await this.service.findById(pobj);
...@@ -97,7 +98,8 @@ class SchemeCtl extends CtlBase { ...@@ -97,7 +98,8 @@ class SchemeCtl extends CtlBase {
} }
/*根据商机编号获取方案详情*/ /*根据商机编号获取方案详情*/
async findInfoByDemandCode(pobj, qobj, req){ async findInfoByDemandCode(mobj, qobj, req){
var pobj = mobj.d;
if (pobj.businessMode && pobj.businessMode != 'undefined'){ if (pobj.businessMode && pobj.businessMode != 'undefined'){
try{ try{
var rs = await this.service.findInfoByDemandCode(pobj); var rs = await this.service.findInfoByDemandCode(pobj);
...@@ -137,7 +139,8 @@ class SchemeCtl extends CtlBase { ...@@ -137,7 +139,8 @@ class SchemeCtl extends CtlBase {
} }
/* 根据商机编号更新方案状态及原因 */ /* 根据商机编号更新方案状态及原因 */
async updateStatusByDemandCode(pobj, qobj, req){ async updateStatusByDemandCode(mobj, qobj, req){
var pobj = mobj.d;
if (pobj.businessMode && pobj.businessMode != 'undefined' && pobj.currentStatus && pobj.currentStatus != 'undefined'){ if (pobj.businessMode && pobj.businessMode != 'undefined' && pobj.currentStatus && pobj.currentStatus != 'undefined'){
try{ try{
await this.service.updateStatusByDemandCode(pobj); await this.service.updateStatusByDemandCode(pobj);
...@@ -173,7 +176,11 @@ class SchemeCtl extends CtlBase { ...@@ -173,7 +176,11 @@ class SchemeCtl extends CtlBase {
} }
/*根据商机编号更新方案详情*/ /*根据商机编号更新方案详情*/
async updateInfoByDemandCode(pobj, qobj, req){ async updateInfoByDemandCode(mobj, qobj, req){
var pobj = mobj.d;
console.log("------------------------------修改方案------------------------------------");
console.log(JSON.stringify(pobj));
console.log("------------------------------修改方案------------------------------------");
if (pobj.businessMode && pobj.businessMode != 'undefined' && pobj.schemeNumber && pobj.schemeNumber != 'undefined' if (pobj.businessMode && pobj.businessMode != 'undefined' && pobj.schemeNumber && pobj.schemeNumber != 'undefined'
&& pobj.baseInfo && pobj.baseInfo != 'undefined'){ && pobj.baseInfo && pobj.baseInfo != 'undefined'){
try{ try{
...@@ -294,15 +301,17 @@ class SchemeCtl extends CtlBase { ...@@ -294,15 +301,17 @@ class SchemeCtl extends CtlBase {
var rc = system.getObject("util.execClient"); var rc = system.getObject("util.execClient");
var requrl = this.receiveUrl; var requrl = this.receiveUrl;
var params = { var params = {
"actionType":"actionType", "actionType":"submitSolution",
"actionBody":{ "actionBody":{
"needNum": pobj.businessMode, "needNum": pobj.businessMode,
"solutionNum":pobj.schemeNumber, "solutionNum":pobj.schemeNumber,
"solutionContent": pobj "solutionContent": pobj
} }
} }
console.log(JSON.stringify(params) + "HHHHHHHHHHHHHHHHHHHHHH");
var rtn = await rc.execPost(params, requrl); var rtn = await rc.execPost(params, requrl);
var j = JSON.parse(rtn.stdout); var j = JSON.parse(rtn.stdout);
console.log(JSON.stringify(j) + "IIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII");
if (j.status == 1){ if (j.status == 1){
pobj.businessType = ttype; pobj.businessType = ttype;
pobj.schemeNumber = j.data; pobj.schemeNumber = j.data;
...@@ -325,7 +334,8 @@ class SchemeCtl extends CtlBase { ...@@ -325,7 +334,8 @@ class SchemeCtl extends CtlBase {
} }
/*根据商机编号更新方案编号*/ /*根据商机编号更新方案编号*/
async updateSchemeNumberByDemandCode(pobj, qobj, req){ async updateSchemeNumberByDemandCode(mobj, qobj, req){
var pobj = mobj.d;
if (pobj.schemeNumber && pobj.schemeNumber != 'undefined' && pobj.businessMode && pobj.businessMode != 'undefined'){ if (pobj.schemeNumber && pobj.schemeNumber != 'undefined' && pobj.businessMode && pobj.businessMode != 'undefined'){
try{ try{
await this.service.updateSchemeNumberByDemandCode(pobj); await this.service.updateSchemeNumberByDemandCode(pobj);
...@@ -341,7 +351,8 @@ class SchemeCtl extends CtlBase { ...@@ -341,7 +351,8 @@ class SchemeCtl extends CtlBase {
} }
/*插入方案信息*/ /*插入方案信息*/
async insertInfo(pobj, qobj, req){ async insertInfo(mobj, qobj, req){
var pobj = mobj.d;
if (pobj.businessMode && pobj.businessMode != 'undefined' && pobj.baseInfo && pobj.baseInfo != 'undefined'){//商机编号必须存在 if (pobj.businessMode && pobj.businessMode != 'undefined' && pobj.baseInfo && pobj.baseInfo != 'undefined'){//商机编号必须存在
try{ try{
pobj.currentStatus = "beforeConfirmation";//商机状态为待用户确认 pobj.currentStatus = "beforeConfirmation";//商机状态为待用户确认
......
ic-deliver/app/base/controller/impl/bizchance/statuslogCtl.js
...@@ -10,7 +10,8 @@ class StatusLogCtl extends CtlBase { ...@@ -10,7 +10,8 @@ class StatusLogCtl extends CtlBase {
} }
/*插入缓存信息 */ /*插入缓存信息 */
async insertInfo(pobj,qobj,req){ async insertInfo(mobj,qobj,req){
var pobj = mobj.d;
if (pobj.flowType && pobj.flowType != 'undefined' && pobj.flowId && pobj.flowId != 'undefined' if (pobj.flowType && pobj.flowType != 'undefined' && pobj.flowId && pobj.flowId != 'undefined'
&& pobj.statusCode && pobj.statusCode != 'undefined'){ && pobj.statusCode && pobj.statusCode != 'undefined'){
try{ try{
......
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