|
|
@@ -54,11 +54,11 @@ public class ERPServiceImpl implements ERPService {
|
|
|
" from prodinout left join employee on em_name=pi_recordman where pi_id=?",id);
|
|
|
if(rs.next()) {
|
|
|
Map<String,Object> map = new HashMap<>();
|
|
|
- if(!StringUtil.hasText(rs.getString("em_mobile"))){
|
|
|
+ /*if(!StringUtil.hasText(rs.getString("em_mobile"))){
|
|
|
map.put("success", false);
|
|
|
map.put("message", "录入人手机号必填！");
|
|
|
return map;
|
|
|
- }
|
|
|
+ }*/
|
|
|
//出货单联系人pi_purposename ，联系人手机号pi_catename_user 为空不允许发送
|
|
|
if(!StringUtil.hasText(rs.getString("pi_purposename"))){
|
|
|
map.put("success", false);
|
|
|
@@ -105,7 +105,7 @@ public class ERPServiceImpl implements ERPService {
|
|
|
OrderCustomerInfo preWaybillDelivery = new OrderCustomerInfo();
|
|
|
preWaybillDelivery.setCompanyName("深圳华商龙"); //固定值
|
|
|
preWaybillDelivery.setPerson(rs.getGeneralString("pi_recordman")); //pi_recordman
|
|
|
- preWaybillDelivery.setMobile(rs.getGeneralString("em_mobile")); //人员资料的 em_mobile
|
|
|
+ preWaybillDelivery.setMobile(rs.getGeneralString("13480992146")); //改成固定 电话 人员资料的 em_mobile
|
|
|
preWaybillDelivery.setAddress("深圳市南山区西丽松白路1026号南岗第二工业园13栋2楼"); //固定值
|
|
|
preWaybillDelivery.setContactName("甘维东"); //取货人
|
|
|
preWaybillDelivery.setContactPhone("13480992146"); //取货人电话固定值
|
|
|
@@ -216,7 +216,7 @@ public class ERPServiceImpl implements ERPService {
|
|
|
OrderCustomerInfo preWaybillDelivery = new OrderCustomerInfo();
|
|
|
preWaybillDelivery.setCompanyName("深圳华商龙"); //固定值
|
|
|
preWaybillDelivery.setPerson(rs.getGeneralString("pi_recordman")); //pi_recordman
|
|
|
- preWaybillDelivery.setMobile(rs.getGeneralString("em_mobile")); //人员资料的 em_mobile
|
|
|
+ preWaybillDelivery.setMobile("13480992146"); //人员资料的 em_mobile
|
|
|
preWaybillDelivery.setAddress("深圳市南山区西丽松白路1026号南岗第二工业园13栋2楼"); //固定值
|
|
|
orderInfo.setPreWaybillDelivery(preWaybillDelivery);
|
|
|
//设置收件方
|
