gyq

ic-deliver/app/base/controller/impl/bizchance/deliverybillCtl.js

@@ -678,13 +678,37 @@ class DeliverybillCtl extends CtlBase {
     let rtn = await this.service.settleApply(ids, p.userid, p.username, spname, spid)
     let rtn = await this.service.settleApply(ids, p.userid, p.username, spname, spid)
     return system.getResult({})
     return system.getResult({})
   }
   }
+
+  async dealAliDeliveryInfo(nobj,qobj,req){//插入交付单信息-阿里用
+    var pobj = nobj.d;
+    if (pobj.deliverNumber && pobj.deliverNumber != 'undefined') {
+      try{
+        var res = await this.service.findInfoByDeliverCode(pobj);
+        if (res){
+          await this.service.updateInfoByDeliverCode(pobj);
+          return system.getResultSuccess();
+          //return await this.service.updateInfoByDeliverCode(pobj);
+        }
+        else{
+          return await this.service.insertInfoall(pobj);
+        }
+      }
+      catch(error){
+        return system.getResultError(error);
+      }
+    }
+    else{
+      return system.getResultError("参数错误!");
+    }
+  }
+
   /*根据商机编号插入交付单信息*/
   /*根据商机编号插入交付单信息*/
   async insertInfo(nobj, qobj, req) {//队列的时候用
   async insertInfo(nobj, qobj, req) {//队列的时候用
     var pobj = nobj.d;
     var pobj = nobj.d;
     console.log("根据交付单编号更新交付单详情-------------------------" + JSON.stringify(pobj));
     console.log("根据交付单编号更新交付单详情-------------------------" + JSON.stringify(pobj));
     if (pobj.deliverNumber && pobj.deliverNumber != 'undefined') {
     if (pobj.deliverNumber && pobj.deliverNumber != 'undefined') {
       try {
       try {
-        pobj.deliverStatus = "received";
+        //pobj.deliverStatus = "received";
         pobj.businessType = appconfig.pdict.dyDict[pobj.businessType];
         pobj.businessType = appconfig.pdict.dyDict[pobj.businessType];
         if (pobj.companyInfo.companyPropertiesName && pobj.companyInfo.companyPropertiesName != 'undefined') {
         if (pobj.companyInfo.companyPropertiesName && pobj.companyInfo.companyPropertiesName != 'undefined') {
           if (pobj.businessName == "公司注册") {
           if (pobj.businessName == "公司注册") {

ic-deliver/app/base/db/impl/bizchance/deliverybillDao.js

@@ -169,7 +169,7 @@ class DeliverybillDao extends Dao {
     if (qobj.clerkName && qobj.clerkName != 'undefined') {
     if (qobj.clerkName && qobj.clerkName != 'undefined') {
       obj.delivery_man_name = qobj.clerkName;
       obj.delivery_man_name = qobj.clerkName;
     }
     }
-    if (qobj.salesmanName && qobj.salesmanName != undefined){
+    if (qobj.salesmanName && qobj.salesmanName != 'undefined'){
       obj.salesman_name = qobj.salesmanName;
       obj.salesman_name = qobj.salesmanName;
     }
     }
     if (qobj.salesmanPhone && qobj.salesmanPhone != 'undefined') {
     if (qobj.salesmanPhone && qobj.salesmanPhone != 'undefined') {