diff --git a/emis-biz-web/emis-biz-web.iml b/emis-biz-web/emis-biz-web.iml
index c5cd89ef1..a8d8cb877 100644
--- a/emis-biz-web/emis-biz-web.iml
+++ b/emis-biz-web/emis-biz-web.iml
@@ -266,5 +266,14 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/emis-biz/emis-biz.iml b/emis-biz/emis-biz.iml
index a33e6214c..54dce40c5 100644
--- a/emis-biz/emis-biz.iml
+++ b/emis-biz/emis-biz.iml
@@ -225,5 +225,14 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/emis-biz/lib/masmgc.sdk.sms-1.0.3-SNAPSHOT.jar b/emis-biz/lib/masmgc.sdk.sms-1.0.3-SNAPSHOT.jar
new file mode 100644
index 000000000..dbb93adcb
Binary files /dev/null and b/emis-biz/lib/masmgc.sdk.sms-1.0.3-SNAPSHOT.jar differ
diff --git a/emis-biz/pom.xml b/emis-biz/pom.xml
index 162e95cd0..c16722532 100644
--- a/emis-biz/pom.xml
+++ b/emis-biz/pom.xml
@@ -105,6 +105,14 @@
1.1.14
+
+ com.mascloud
+ massdk
+ 1.0.3
+ system
+ ${project.basedir}/lib/masmgc.sdk.sms-1.0.3-SNAPSHOT.jar
+
+
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
index b27eacb2e..73fbd4429 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
@@ -42,6 +42,7 @@ package com.xdadan.erp.emis.service;
import com.xdadan.erp.emis.service.IEmisWaybillFeeitemService;
import com.xdadan.erp.emis.service.IEmisWaybillService;
import com.xdadan.erp.emis.service.sms.AliyunSMSService;
+ import com.xdadan.erp.emis.service.sms.CMCCSMSService;
import com.xdadan.erp.emis.utils.HTTPHelperV3;
import com.xdadan.erp.emis.utils.Kd100Helper;
import com.xdadan.erp.emis.utils.WaybillHelper;
@@ -148,6 +149,9 @@ public class EmisBaseService {
@Autowired
private AliyunSMSService aliyunSMSService;
+ @Autowired
+ private CMCCSMSService cmccSMSService;
+
@Autowired
private EmisSiteSettleRecordMapper emisSiteSettleRecordMapper;
@@ -1325,6 +1329,7 @@ public class EmisBaseService {
aliyunSMSService.sendMessage("探路速运", dt.getPhone(),"SMS_465316363", jObjParam.toJSONString());
+// cmccSMSService.sendMessage(DBUtil.getSeqNoByLen(10),dt.getPhone(),dt.getContent());
}
// 签收短信
else if ("2".equals(dt.getSmsType())) {
@@ -1336,7 +1341,8 @@ public class EmisBaseService {
jObjParam.put("Nationalcity",nationalcity);
jObjParam.put("name",dt.getBillCode());
- aliyunSMSService.sendMessage("探路速运", dt.getPhone(), "SMS_465341331", jObjParam.toJSONString());
+// aliyunSMSService.sendMessage("探路速运", dt.getPhone(), "SMS_465341331", jObjParam.toJSONString());
+// cmccSMSService.sendMessage(DBUtil.getSeqNoByLen(10),dt.getPhone(),dt.getContent());
}
// 问题件
@@ -1358,6 +1364,8 @@ public class EmisBaseService {
jObjParam.put("time",DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD,waybill.getEstimateDate()));
aliyunSMSService.sendMessage("探路速运", dt.getPhone(),"SMS_465386407", jObjParam.toJSONString());
+ // cmccSMSService.sendMessage(DBUtil.getSeqNoByLen(10),dt.getPhone(),dt.getContent());
+
}
else{
continue;
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java
index 50176e8d0..cb5c4c76e 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java
@@ -1285,6 +1285,8 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
throw new EmisBizError(EmisBizErrorType.FAIL,"月结客户不存在");
}
emisWaybillSave.setCustName(emisMonthCustomerUser.getCustName());
+ emisWaybillSave.setPayee(emisMonthCustomerUser.getPayee());
+ emisWaybillSave.setSalesmen(emisMonthCustomerUser.getSalesmen());
}
// 保存客户收件、寄件地址，开单不要关联客户地址数据
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/sms/CMCCSMSService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/sms/CMCCSMSService.java
new file mode 100644
index 000000000..117ef9493
--- /dev/null
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/sms/CMCCSMSService.java
@@ -0,0 +1,133 @@
+package com.xdadan.erp.emis.service.sms;
+
+
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.mascloud.model.MoModel;
+import com.mascloud.model.StatusReportModel;
+import com.mascloud.sdkclient.Client;
+import com.mascloud.util.JsonUtil;
+import com.xdadan.erp.emis.domain.enumtype.EmisBizErrorType;
+import com.xdadan.erp.emis.domain.exception.EmisBizError;
+import com.xdadan.erp.system.service.ISysConfigService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 中国移动短信
+ */
+@Slf4j
+@Service("CMCCSMSService")
+public class CMCCSMSService {
+
+ @Autowired
+ private ISysConfigService configService;
+
+ /**
+ * 发送短信
+ */
+ public int sendMessage(String seqNo,String phone,String content) throws EmisBizError {
+ String jsonParamStr=configService.selectConfigByKey("sys.cmcc.sms");
+ JSONObject jObjAliyunParam=JSONObject.parseObject(jsonParamStr);
+ String url=jObjAliyunParam.getString("url");
+ String userAccount=jObjAliyunParam.getString("userAccount");
+ String password=jObjAliyunParam.getString("password");
+ String ecname=jObjAliyunParam.getString("ecname");
+ String signCode=jObjAliyunParam.getString("signCode");
+
+ /*
+ SDK java http://112.35.4.197:15000
+ 单位名称：接口联调账号
+ 用户名 ：JStlz
+ 密 码 ：Passwd@#123
+ 签名编码：bM16CfN2B
+ 服务代码：10657204006
+ 黑名单 普通短信 有发送能力
+ 时效：1个月 10条/天
+ {
+ "url":"http://112.35.4.197:15000",
+ "userAccount":"JStlz",
+ "password":"Passwd@#123",
+ "ecname":"接口联调账号",
+ "ecname":"接口联调账号",
+ "signCode":"bM16CfN2B",
+ "serviceCode":"10657204006",
+ "desc":"黑名单 普通短信 有发送能力",
+ "timeDesc":"1个月 10条/天"
+ }
+ */
+
+ return innerSendNormal(seqNo,
+ url,userAccount,password,ecname,signCode,
+ phone,content);
+ }
+
+ public static int innerSendNormal(
+ String seqNo,
+ String url,String userAccount,String password,
+ String ecname,String signCode,String phone,String content
+ ) throws EmisBizError {
+ try {
+
+ Client client = Client.getInstance( );
+ // 登录地址需另外提供
+ boolean isLoggedin = client.login( url, userAccount, password, ecname );
+ if( !isLoggedin ) {
+ log.error("移动短信渠道登录失败");
+ throw new EmisBizError(EmisBizErrorType.FAIL,"移动短信渠道登录失败");
+ }
+
+ // 普通短信
+ int rst = client.sendDSMS( new String[]{phone}, content, seqNo, 1, signCode, null, true );
+
+ // 获取状态报告——开始
+ List statusReportlist = client.getReport( );
+ log.error( "===>移动短信渠道发送状态==>:" + JSON.toJSONString( statusReportlist ) );
+ // 获取状态报告——结束
+
+//
+ if(rst==1) {
+ return 1;
+// if ("OK".equals(response.getBody().getCode())) {
+// } else {
+// throw new EmisBizError(EmisBizErrorType.FAIL,response.getBody().getMessage());
+// }
+ }else{
+ throw new EmisBizError(EmisBizErrorType.FAIL,"短信渠道发送错误");
+ }
+
+ }catch (Exception e) {
+ e.printStackTrace();
+ throw new EmisBizError(EmisBizErrorType.FAIL,"短信渠道异常");
+ }
+ }
+
+
+ public static void main(String[] args) {
+
+ String url="http://112.35.4.197:15000";
+ String userAccount="JStlz";
+ String password="Passwd@#123";
+ String ecname="接口联调账号";
+ String phoneNumbers="13815412745";
+ String signCode="bM16CfN2B";
+
+ String content="尊敬的客户：您寄往越南的包裹已寄出，运单号T123。如有疑问，详询服务热线4000257080，感谢您使用探路速运！";
+
+ try {
+
+ int ret = innerSendNormal("1",
+ url,userAccount,password,ecname,signCode,
+ phoneNumbers,content);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+
+
+
+}
diff --git a/emis-wms-web/emis-wms-web.iml b/emis-wms-web/emis-wms-web.iml
index c6e235748..d343d6ba6 100644
--- a/emis-wms-web/emis-wms-web.iml
+++ b/emis-wms-web/emis-wms-web.iml
@@ -61,11 +61,22 @@
+
+
+
+
+
+
+
+
+
+
+
+
-
@@ -77,6 +88,7 @@
+
@@ -85,14 +97,6 @@
-
-
-
-
-
-
-
-
@@ -102,7 +106,6 @@
-
@@ -214,9 +217,6 @@
-
-
-