diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/YunBpmServiceImpl.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/YunBpmServiceImpl.java index 84416261..9e708ecf 100644 --- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/YunBpmServiceImpl.java +++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/YunBpmServiceImpl.java @@ -66,7 +66,7 @@ public class YunBpmServiceImpl implements YunBpmService { QualitySystemDto qualitySystemDto = QualitySystemDto.builder() //异常主数据 .abnormalbill_no(abnormalBill.getAbnormalNo()).abnormalbill_workshop(abnormalBill.getWorkCenter()) - .material_code(abnormalBill.getItemBo().split(",")[1]).number(abnormalBill.getMapNo()) + .material_code(abnormalBill.getItemBo().split(",")[1]).drawing_number(abnormalBill.getMapNo()) .material_description(abnormalBill.getItemDescription()).shop_order(abnormalBill.getShopOrder()) .product_barcode(abnormalBill.getSfc()).work_order(abnormalBill.getWorkOrder()).submit_date(DateUtil.getCurrentDate()) .item_number(abnormalBill.getItemNumber()).product_category(abnormalBill.getProductCategory()) @@ -79,8 +79,8 @@ public class YunBpmServiceImpl implements YunBpmService { .bad_code_group(ncGroup).bad_code(ncCode).problem_level(abnormalBill.getPbGrade()) // .problem_photos(null) //责任划分 - .cause_analysis(abnormalBillDispose.getDutyCauseDescription()).reason_type(abnormalBillDispose.getDutyCauseType()) - .responsibility_type(abnormalBillDispose.getDutyType()).responsibility_dept(abnormalBillDispose.getDutyDepart()) + .cause_analysis(abnormalBillDispose.getDutyCauseDescription()).reason_type(abnormalBillDispose.getDutyCauseTypeDescription()) + .responsibility_type(abnormalBillDispose.getDutyTypeDescription()).problem_owner_depart(abnormalBillDispose.getDutyDepartDescription()) .problem_owner_name(abnormalBillDispose.getPrincipalUser()) //.send_user_group() /*//解决方案 diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/utils/yunBpmConfig.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/utils/yunBpmConfig.java index a07f4217..9756b668 100644 --- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/utils/yunBpmConfig.java +++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/utils/yunBpmConfig.java @@ -6,13 +6,16 @@ package com.foreverwin.mesnac.anomaly.utils; */ public class yunBpmConfig { - public static final String userName = "zhangzy"; - public static final String passWord = "123456"; - + public static final String userName = "zhangzy";//测试 + public static final String passWord = "123456";//测试 public static final String apiBaseUrl = "http://yunbpmcs.mesnac.com:8080";//测试 - //public static final String apiBaseUrl = "http://754f8392.r2.cpolar.top";//测试 + + +// public static final String userName = "";//正式 +// public static final String passWord = "";//正式 +// public static final String apiBaseUrl = "http://yunbpm.mesnac.com:8080";//正式 + public static final String apiBaseToken = "eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJhdWQiOlsiYXBpIl0sImNvcnBJZCI6bnVsbCwidXNlcl9pZCI6ImU1MGVmMDE2NzhkZDQ2MGViZWUwNmYwZjE5OTU4M2JjIiwidXNlcl9uYW1lIjoiMjYyMjI2MTY0NTcwMzE3MCIsInNjb3BlIjpbInJlYWQiXSwibW9iaWxlIjpmYWxzZSwiaXNBZG1pbiI6dHJ1ZSwiZXhwIjoxNjYyNjI3MTM3LCJpc0FwcEFkbWluIjpmYWxzZSwiYXV0aG9yaXRpZXMiOlsiVVNFUiIsIkFVVEhfU1lTVEVNX01BTkFHRSJdLCJqdGkiOiI1YmJhNjQ3Yy0yNWNkLTRhZTMtYmRlMC0zYjE4NDYyZGI5YmYiLCJjbGllbnRfaWQiOiJhcGkifQ.NiQUUBapr9K5Tx3xIJzRaRfk426Rwl9bUiRCRpsF_fIQp19wot9FXJQWMTKF7mLkjbKxo6IBAfo-mGkpQRC_WLjaRnMGzVxalwXojN95KR1NAvAgSyiEsgwFDdatW_Yiwan4orHZHUc1Q_eyr_8AmZ-OIWrhFhS9hosky4FQx-v7M_L065a5xW8MDeuMOUSSoVWcxZP1Obo12PAMGHMBl36TJR4C7XanBSLw0kW7K3Ab6fhlJ6QLLC8SOb3dC4LTJToxFmXRNU7REKIs5Vu6087hJM7eSttZNu4aaSwqxeigWulHMFJGktSzQKl50l8breWXyb7AxcgvI0wG-FmA6g";//测试 - //public static final String apiBaseUrl = "http://yunbpm.mesnac.com:8080";//正式 /** * 上传附件url */