hzya
/
kangarooDataCenterV3
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev' of http://ufidahz.com.cn:9015/root/kangarooDataCenterV3 into dongj

This commit is contained in:
yuqh 2024-09-11 14:36:40 +08:00
parent d7d1ef5078 504c9e54c0
commit 553ea0376c
7 changed files with 111 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
buildpackage/src/main/java/com/hzya/frame/plugin/mdmDistribute/plugin/MdmModulePluginInitializer.java
View File

@ -705,7 +705,7 @@ public class MdmModulePluginInitializer extends PluginBaseEntity {
continue;
}else {
//保存日志
saveMdmModuleSendLogEntity(mainCode,mdmModuleDistributeEntities.get(i1).getId(),"2","转发失败",mainDb,objects.get(i).getString("id"),sysApplicationEntity.getName(),sysApplicationEntity.getId(),apiEntity.getApiName(),apiEntity.getId(),doObjects.get(i).toJSONString(),"3");
saveMdmModuleSendLogEntity(mainCode,mdmModuleDistributeEntities.get(i1).getId(),"2","转发失败:"+jsonResultEntity.getAttribute(),mainDb,objects.get(i).getString("id"),sysApplicationEntity.getName(),sysApplicationEntity.getId(),apiEntity.getApiName(),apiEntity.getId(),doObjects.get(i).toJSONString(),"3");
continue;
}
}
@ -886,7 +886,7 @@ public class MdmModulePluginInitializer extends PluginBaseEntity {
continue;
}else {
//保存日志
saveMdmModuleSendLogEntity(mainCode,mdmModuleDistributeEntities.get(i1).getId(),"2","转发失败",mainDb,objects.get(i).getString("id"),sysApplicationEntity.getName(),sysApplicationEntity.getId(),apiEntity.getApiName(),apiEntity.getId(),doObjects.get(i).toJSONString(),"2");
saveMdmModuleSendLogEntity(mainCode,mdmModuleDistributeEntities.get(i1).getId(),"2","转发失败:"+jsonResultEntity.getAttribute(),mainDb,objects.get(i).getString("id"),sysApplicationEntity.getName(),sysApplicationEntity.getId(),apiEntity.getApiName(),apiEntity.getId(),doObjects.get(i).toJSONString(),"2");
continue;
}
}
@ -1125,7 +1125,7 @@ public class MdmModulePluginInitializer extends PluginBaseEntity {
continue;
}else {
//保存日志
saveMdmModuleSendLogEntity(mainCode,mdmModuleDistributeEntities.get(i1).getId(),"2","转发失败",mainDb,objects.get(i).getString("id"),sysApplicationEntity.getName(),sysApplicationEntity.getId(),apiEntity.getApiName(),apiEntity.getId(),doObjects.get(i).toJSONString(),"1");
saveMdmModuleSendLogEntity(mainCode,mdmModuleDistributeEntities.get(i1).getId(),"2","转发失败:"+jsonResultEntity.getAttribute(),mainDb,objects.get(i).getString("id"),sysApplicationEntity.getName(),sysApplicationEntity.getId(),apiEntity.getApiName(),apiEntity.getId(),doObjects.get(i).toJSONString(),"1");
continue;
}
}

4
service/src/main/java/com/hzya/frame/mdm/mdmModule/entity/MdmModuleEntity.xml
View File

@ -379,7 +379,7 @@ where id = #{id}
`org_id` varchar(50) DEFAULT NULL COMMENT '组织机构ID',
`company_id` varchar(50) DEFAULT NULL COMMENT '公司id',
`data_type` varchar(255) DEFAULT NULL COMMENT '状态 1、成功2、失败',
`remark` varchar(255) DEFAULT NULL COMMENT '备注',
`remark` text CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci COMMENT '备注',
</when>
<when test="tableType == '4'.toString()">
`id` varchar(50) NOT NULL COMMENT '唯一标识码',
@ -397,7 +397,7 @@ where id = #{id}
`org_id` varchar(50) DEFAULT NULL COMMENT '组织机构ID',
`company_id` varchar(50) DEFAULT NULL COMMENT '公司id',
`data_type` varchar(50) DEFAULT NULL COMMENT '状态 1、成功2、失败',
`remark` varchar(255) DEFAULT NULL COMMENT '备注',
`remark` text CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci COMMENT '备注',
`distribute_id` varchar(50) DEFAULT NULL COMMENT 'distribute_id',
`api_id` varchar(50) DEFAULT NULL COMMENT 'apiid',
`app_id` varchar(50) DEFAULT NULL COMMENT 'app_id',

4
service/src/main/java/com/hzya/frame/mdm/service/impl/MdmServiceImpl.java
View File

@ -1935,7 +1935,7 @@ public class MdmServiceImpl implements IMdmService {
}
} catch (Exception e) {
logger.error("新增返回脚本解析保存三方id错误" + jsonResultEntity.getAttribute());
saveMdmModuleSendLogEntity(mdmModuleEntity.getMdmCode(), mdmModuleDistributeEntity.getId(), "2", "转发失败", dbname, object.getString("id"), sysApplicationEntity.getName(), sysApplicationEntity.getId(), apiEntity.getApiName(), apiEntity.getId(), object.toJSONString(), type);
saveMdmModuleSendLogEntity(mdmModuleEntity.getMdmCode(), mdmModuleDistributeEntity.getId(), "2", "转发失败:"+jsonResultEntity.getAttribute(), dbname, object.getString("id"), sysApplicationEntity.getName(), sysApplicationEntity.getId(), apiEntity.getApiName(), apiEntity.getId(), object.toJSONString(), type);
return BaseResult.getFailureMessageEntity("发送错误:新增返回脚本解析保存三方id错误");
}
}
@ -1943,7 +1943,7 @@ public class MdmServiceImpl implements IMdmService {
saveMdmModuleSendLogEntity(mdmModuleEntity.getMdmCode(), mdmModuleDistributeEntity.getId(), "1", "发送成功", dbname, object.getString("id"), sysApplicationEntity.getName(), sysApplicationEntity.getId(), apiEntity.getApiName(), apiEntity.getId(), object.toJSONString(), type);
return BaseResult.getSuccessMessageEntity("发送成功");
} else {
saveMdmModuleSendLogEntity(mdmModuleEntity.getMdmCode(), mdmModuleDistributeEntity.getId(), "2", "转发失败", dbname, object.getString("id"), sysApplicationEntity.getName(), sysApplicationEntity.getId(), apiEntity.getApiName(), apiEntity.getId(), object.toJSONString(), type);
saveMdmModuleSendLogEntity(mdmModuleEntity.getMdmCode(), mdmModuleDistributeEntity.getId(), "2", "转发失败:"+jsonResultEntity.getAttribute(), dbname, object.getString("id"), sysApplicationEntity.getName(), sysApplicationEntity.getId(), apiEntity.getApiName(), apiEntity.getId(), object.toJSONString(), type);
return BaseResult.getFailureMessageEntity("发送错误:" + jsonResultEntity.getAttribute());
}
}

4
service/src/main/java/com/hzya/frame/sysnew/application/service/impl/SysApplicationServiceImpl.java
View File

@ -123,7 +123,7 @@ public class SysApplicationServiceImpl extends BaseService<SysApplicationEntity,
private TaskExecutor taskExecutor;
//
@Resource
private com.hzya.frame.sysnew.application.service.impl.ApplicationCache applicationCache;
private ApplicationCache applicationCache;
@Value("${savefile.tomcatpath:}")
public String TOMCATPATH;
@ -2649,7 +2649,7 @@ public class SysApplicationServiceImpl extends BaseService<SysApplicationEntity,
sysPushMessageEntity.setReceiveApiCode(receiveApi.getApiCode());
sysPushMessageEntity.setReturnData(sysMessageManageLogEntity.getReturnData());
sysPushMessageEntity.setStatus(sysMessageManageLogEntity.getStatus());
taskExecutor.execute(() -> sendMssage(sysPushMessageEntity));
//taskExecutor.execute(() -> sendMssage(sysPushMessageEntity));
return sysMessageManageLogEntity;
}

22
service/src/main/java/com/hzya/frame/u8c/Encapsulation/entity/EncapsulationEntity.java
View File

@ -11,8 +11,12 @@ import com.hzya.frame.web.entity.BaseEntity;
public class EncapsulationEntity extends BaseEntity {
//单据号
private String code;
//单据类型
//来源单据类型
private String type;
//公司
private String unitcode;
//单据类型
private String cbilltypecode;
public String getCode() {
return code;
@ -29,5 +33,21 @@ public class EncapsulationEntity extends BaseEntity {
public void setType(String type) {
this.type = type;
}
public String getCbilltypecode() {
return cbilltypecode;
}
public void setCbilltypecode(String cbilltypecode) {
this.cbilltypecode = cbilltypecode;
}
public String getUnitcode() {
return unitcode;
}
public void setUnitcode(String unitcode) {
this.unitcode = unitcode;
}
}

13
service/src/main/java/com/hzya/frame/u8c/Encapsulation/entity/EncapsulationEntity.xml
View File

@ -4,13 +4,18 @@
<select id="queryCgrkddh" resultType="com.hzya.frame.u8c.Encapsulation.entity.EncapsulationEntity" parameterType = "com.hzya.frame.u8c.Encapsulation.entity.EncapsulationEntity">
SELECT
vbillcode as code
h.vbillcode as code,
a.unitcode
FROM
ic_general_h
ic_general_h h
LEFT JOIN bd_corp a on a.pk_corp = h.pk_corp
WHERE
cgeneralhid in (
SELECT cgeneralhid FROM ic_general_b WHERE vfirstbillcode = #{code} and csourcetype = #{type}
h.cgeneralhid in (
SELECT cgeneralhid FROM ic_general_b WHERE vfirstbillcode = #{code}
<if test="type != null and type != ''"> and csourcetype = #{type} </if>
)
<if test="cbilltypecode != null and cbilltypecode != ''"> and h.cbilltypecode = #{cbilltypecode} </if>
</select>

143
service/src/main/java/com/hzya/frame/u8c/Encapsulation/service/impl/EncapsulationImpl.java
View File

@ -138,32 +138,32 @@ public class EncapsulationImpl extends BaseService<EncapsulationEntity, String>
return returnObject;
}
//执行库存采购入库单取消签字接口
String cgrkdqxqz = getsendBody("1", jsonObject, encapsulationEntities.get(0).getCode());
boolean cgrkdqxqzflag = sendPost(jsonObject.getString("publicKey"), jsonObject.getString("secretKey"), jsonObject.getString("cgrkqxqz"), jsonObject.getString("cgrkqxqz").substring(6), cgrkdqxqz);
String cgrkdqxqz = getsendBody("1", jsonObject, encapsulationEntities.get(0).getCode(),encapsulationEntities.get(0).getUnitcode());
boolean cgrkdqxqzflag = sendPost(jsonObject.getString("publicKey"), jsonObject.getString("secretKey"), jsonObject.getString("cgrkqxqz"), jsonObject.getString("cgrkqxqz").substring(0,6), cgrkdqxqz);
if (!cgrkdqxqzflag) {
returnObject.put("status", "falied");
returnObject.put("errormsg", "采购入库单取消签字失败");
return returnObject;
}
//执行库存采购入库单删除
String cgrkdsc = getsendBody("2", jsonObject, encapsulationEntities.get(0).getCode());
boolean cgrkdscfiag = sendPost(jsonObject.getString("publicKey"), jsonObject.getString("secretKey"), jsonObject.getString("cgrksc"), jsonObject.getString("cgrksc").substring(6), cgrkdsc);
String cgrkdsc = getsendBody("2", jsonObject, encapsulationEntities.get(0).getCode(),encapsulationEntities.get(0).getUnitcode());
boolean cgrkdscfiag = sendPost(jsonObject.getString("publicKey"), jsonObject.getString("secretKey"), jsonObject.getString("cgrksc"), jsonObject.getString("cgrksc").substring(0,6), cgrkdsc);
if (!cgrkdscfiag) {
returnObject.put("status", "falied");
returnObject.put("errormsg", "采购入库单删除失败");
return returnObject;
}
//执行采购订单弃审
String cgddqs = getsendBody("3", jsonObject, null);
boolean cgddqsflag = sendPost(jsonObject.getString("publicKey"), jsonObject.getString("secretKey"), jsonObject.getString("cgddqs"), jsonObject.getString("cgddqs").substring(6), cgddqs);
String cgddqs = getsendBody("3", jsonObject, jsonObject.getString("code"), jsonObject.getString("corp"));
boolean cgddqsflag = sendPost(jsonObject.getString("publicKey"), jsonObject.getString("secretKey"), jsonObject.getString("cgddqs"), jsonObject.getString("cgddqs").substring(0,6), cgddqs);
if (!cgddqsflag) {
returnObject.put("status", "falied");
returnObject.put("errormsg", "采购订单弃审失败");
return returnObject;
}
//执行采购订单删除
String cgddsc = getsendBody("4", jsonObject, null);
boolean cgddscflag = sendPost(jsonObject.getString("publicKey"), jsonObject.getString("secretKey"), jsonObject.getString("cgddsc"), jsonObject.getString("cgddsc").substring(6), cgddsc);
String cgddsc = getsendBody("4", jsonObject, jsonObject.getString("code"), jsonObject.getString("corp"));
boolean cgddscflag = sendPost(jsonObject.getString("publicKey"), jsonObject.getString("secretKey"), jsonObject.getString("cgddsc"), jsonObject.getString("cgddsc").substring(0,6), cgddsc);
if (cgddscflag) {
returnObject.put("status", "success");
returnObject.put("errormsg", "采购订单删除成功");
@ -196,8 +196,8 @@ public class EncapsulationImpl extends BaseService<EncapsulationEntity, String>
String parm = entity.getBodys();
JSONObject jsonObject = JSONObject.parseObject(parm);
jsonObject.put("dataSourceCode",sysDataSourceEntities.get(0).getSourceCode());
jsonObject.put("publicKey",headers.get("publicKey"));
jsonObject.put("secretKey",headers.get("secretKey"));
jsonObject.put("publicKey",entity.getSendApp().getPublicKey());
jsonObject.put("secretKey",entity.getSendApp().getSecretKey());
jsonObject.put("cgrkqxqz",headers.get("cgrkqxqz"));
jsonObject.put("cgrksc",headers.get("cgrksc"));
@ -275,8 +275,8 @@ public class EncapsulationImpl extends BaseService<EncapsulationEntity, String>
return returnObject;
}
//执行库存采购入库单取消签字接口
String cgrkdqxqz = getsendBody("1", jsonObject, jsonObject.getString("code"));
boolean cgrkdqxqzflag = sendPost(jsonObject.getString("publicKey"), jsonObject.getString("secretKey"), jsonObject.getString("cgrkqxqz"), jsonObject.getString("cgrkqxqz").substring(6), cgrkdqxqz);
String cgrkdqxqz = getsendBody("1", jsonObject, jsonObject.getString("code"), jsonObject.getString("corp"));
boolean cgrkdqxqzflag = sendPost(jsonObject.getString("publicKey"), jsonObject.getString("secretKey"), jsonObject.getString("cgrkqxqz"), jsonObject.getString("cgrkqxqz").substring(0,6), cgrkdqxqz);
if (!cgrkdqxqzflag) {
returnObject.put("status", "falied");
returnObject.put("errormsg", "采购入库单取消签字失败");
@ -284,8 +284,8 @@ public class EncapsulationImpl extends BaseService<EncapsulationEntity, String>
}
//执行库存采购入库单删除接口
String cgrkdsc = getsendBody("2", jsonObject, jsonObject.getString("code"));
boolean cgrkdscfiag = sendPost(jsonObject.getString("publicKey"), jsonObject.getString("secretKey"), jsonObject.getString("cgrksc"), jsonObject.getString("cgrksc").substring(6), cgrkdsc);
String cgrkdsc = getsendBody("2", jsonObject, jsonObject.getString("code"), jsonObject.getString("corp"));
boolean cgrkdscfiag = sendPost(jsonObject.getString("publicKey"), jsonObject.getString("secretKey"), jsonObject.getString("cgrksc"), jsonObject.getString("cgrksc").substring(0,6), cgrkdsc);
if (cgrkdscfiag) {
returnObject.put("status", "success");
returnObject.put("errormsg", "采购入库单删除成功");
@ -318,8 +318,8 @@ public class EncapsulationImpl extends BaseService<EncapsulationEntity, String>
String parm = entity.getBodys();
JSONObject jsonObject = JSONObject.parseObject(parm);
jsonObject.put("dataSourceCode",sysDataSourceEntities.get(0).getSourceCode());
jsonObject.put("publicKey",headers.get("publicKey"));
jsonObject.put("secretKey",headers.get("secretKey"));
jsonObject.put("publicKey",entity.getSendApp().getPublicKey());
jsonObject.put("secretKey",entity.getSendApp().getSecretKey());
jsonObject.put("cgrkqxqz",headers.get("cgrkqxqz"));
jsonObject.put("cgrksc",headers.get("cgrksc"));
@ -418,32 +418,32 @@ public class EncapsulationImpl extends BaseService<EncapsulationEntity, String>
return returnObject;
}
//库存销售出库单取消签字,
String cgrkdqxqz = getsendBody("1", jsonObject, encapsulationEntities.get(0).getCode());
boolean cgrkdqxqzflag = sendPost(jsonObject.getString("publicKey"), jsonObject.getString("secretKey"), jsonObject.getString("kcxsckqxqz"), jsonObject.getString("kcxsckqxqz").substring(6), cgrkdqxqz);
String cgrkdqxqz = getsendBody("1", jsonObject, encapsulationEntities.get(0).getCode(), encapsulationEntities.get(0).getUnitcode());
boolean cgrkdqxqzflag = sendPost(jsonObject.getString("publicKey"), jsonObject.getString("secretKey"), jsonObject.getString("kcxsckqxqz"), jsonObject.getString("kcxsckqxqz").substring(0,6), cgrkdqxqz);
if (!cgrkdqxqzflag) {
returnObject.put("status", "falied");
returnObject.put("errormsg", "库存销售出库单取消签字失败");
return returnObject;
}
//库存销售出库单删除
String cgrkdsc = getsendBody("2", jsonObject, encapsulationEntities.get(0).getCode());
boolean cgrkdscfiag = sendPost(jsonObject.getString("publicKey"), jsonObject.getString("secretKey"), jsonObject.getString("kcxscksc"), jsonObject.getString("kcxscksc").substring(6), cgrkdsc);
String cgrkdsc = getsendBody("2", jsonObject, encapsulationEntities.get(0).getCode(), encapsulationEntities.get(0).getUnitcode());
boolean cgrkdscfiag = sendPost(jsonObject.getString("publicKey"), jsonObject.getString("secretKey"), jsonObject.getString("kcxscksc"), jsonObject.getString("kcxscksc").substring(0,6), cgrkdsc);
if (!cgrkdscfiag) {
returnObject.put("status", "falied");
returnObject.put("errormsg", "库存销售出库单删除失败");
return returnObject;
}
//销售订单取消审批,,
String cgddqs = getsendBody("3", jsonObject, jsonObject.getString("code"));
boolean cgddqsflag = sendPost(jsonObject.getString("publicKey"), jsonObject.getString("secretKey"), jsonObject.getString("xsddqxsp"), jsonObject.getString("xsddqxsp").substring(6), cgddqs);
String cgddqs = getsendBody("3", jsonObject, jsonObject.getString("code"), jsonObject.getString("corp"));
boolean cgddqsflag = sendPost(jsonObject.getString("publicKey"), jsonObject.getString("secretKey"), jsonObject.getString("xsddqxsp"), jsonObject.getString("xsddqxsp").substring(0,6), cgddqs);
if (!cgddqsflag) {
returnObject.put("status", "falied");
returnObject.put("errormsg", "销售订单取消审批失败");
return returnObject;
}
//销售订单删除
String cgddsc = getsendBody("4", jsonObject, jsonObject.getString("code"));
boolean cgddscflag = sendPost(jsonObject.getString("publicKey"), jsonObject.getString("secretKey"), jsonObject.getString("xsddsc"), jsonObject.getString("xsddsc").substring(6), cgddsc);
String cgddsc = getsendBody("4", jsonObject, jsonObject.getString("code"), jsonObject.getString("corp"));
boolean cgddscflag = sendPost(jsonObject.getString("publicKey"), jsonObject.getString("secretKey"), jsonObject.getString("xsddsc"), jsonObject.getString("xsddsc").substring(0,6), cgddsc);
if (cgddscflag) {
returnObject.put("status", "success");
returnObject.put("errormsg", "销售订单删除成功");
@ -476,8 +476,8 @@ public class EncapsulationImpl extends BaseService<EncapsulationEntity, String>
String parm = entity.getBodys();
JSONObject jsonObject = JSONObject.parseObject(parm);
jsonObject.put("dataSourceCode",sysDataSourceEntities.get(0).getSourceCode());
jsonObject.put("publicKey",headers.get("publicKey"));
jsonObject.put("secretKey",headers.get("secretKey"));
jsonObject.put("publicKey",entity.getSendApp().getPublicKey());
jsonObject.put("secretKey",entity.getSendApp().getSecretKey());
jsonObject.put("kcxsckqxqz",headers.get("kcxsckqxqz"));
jsonObject.put("kcxscksc",headers.get("kcxscksc"));
@ -583,7 +583,7 @@ public class EncapsulationImpl extends BaseService<EncapsulationEntity, String>
EncapsulationEntity rk = new EncapsulationEntity();
rk.setCode(jsonObject.getString("code"));
rk.setDataSourceCode(jsonObject.getString("dataSourceCode"));
rk.setType("4E");
rk.setCbilltypecode("4E");
List<EncapsulationEntity> rklist = encapsulationDao.queryCgrkddh(rk);
if(rklist == null || rklist.size() != 1){
returnObject.put("status", "falied");
@ -594,7 +594,7 @@ public class EncapsulationImpl extends BaseService<EncapsulationEntity, String>
EncapsulationEntity ck = new EncapsulationEntity();
ck.setCode(jsonObject.getString("code"));
ck.setDataSourceCode(jsonObject.getString("dataSourceCode"));
ck.setType("4Y");
ck.setCbilltypecode("4Y");
List<EncapsulationEntity> cklist = encapsulationDao.queryCgrkddh(ck);
if(cklist == null || cklist.size() != 1){
returnObject.put("status", "falied");
@ -602,48 +602,48 @@ public class EncapsulationImpl extends BaseService<EncapsulationEntity, String>
return returnObject;
}
//调拨入库取消签字
String dbrk = getsendBody("1", jsonObject, jsonObject.getString("code"));
boolean dbrkflag = sendPost(jsonObject.getString("publicKey"), jsonObject.getString("secretKey"), jsonObject.getString("dbrkqxqz"), jsonObject.getString("dbrkqxqz").substring(6), dbrk);
String dbrk = getsendBody("1", jsonObject, rklist.get(0).getCode(),rklist.get(0).getUnitcode());
boolean dbrkflag = sendPost(jsonObject.getString("publicKey"), jsonObject.getString("secretKey"), jsonObject.getString("dbrkqxqz"), jsonObject.getString("dbrkqxqz").substring(0,6), dbrk);
if (!dbrkflag) {
returnObject.put("status", "falied");
returnObject.put("errormsg", "调拨入库取消签字失败");
return returnObject;
}
//调拨入库删除
String dbrksc = getsendBody("2", jsonObject, jsonObject.getString("code"));
boolean dbrkscflag = sendPost(jsonObject.getString("publicKey"), jsonObject.getString("secretKey"), jsonObject.getString("dbrksc"), jsonObject.getString("dbrksc").substring(6), dbrksc);
String dbrksc = getsendBody("2", jsonObject, rklist.get(0).getCode(), rklist.get(0).getUnitcode());
boolean dbrkscflag = sendPost(jsonObject.getString("publicKey"), jsonObject.getString("secretKey"), jsonObject.getString("dbrksc"), jsonObject.getString("dbrksc").substring(0,6), dbrksc);
if (!dbrkscflag) {
returnObject.put("status", "falied");
returnObject.put("errormsg", "调拨入库删除失败");
return returnObject;
}
//库存调拨出库取消签字
String dbck = getsendBody("1", jsonObject, jsonObject.getString("code"));
boolean dbckflag = sendPost(jsonObject.getString("publicKey"), jsonObject.getString("secretKey"), jsonObject.getString("kcdbckqxqz"), jsonObject.getString("kcdbckqxqz").substring(6), dbck);
String dbck = getsendBody("1", jsonObject, cklist.get(0).getCode(), cklist.get(0).getUnitcode());
boolean dbckflag = sendPost(jsonObject.getString("publicKey"), jsonObject.getString("secretKey"), jsonObject.getString("kcdbckqxqz"), jsonObject.getString("kcdbckqxqz").substring(0,6), dbck);
if (!dbckflag) {
returnObject.put("status", "falied");
returnObject.put("errormsg", "库存调拨出库取消签字失败");
return returnObject;
}
//库存调拨出库删除
String dbcksc = getsendBody("2", jsonObject, jsonObject.getString("code"));
boolean dbckscflag = sendPost(jsonObject.getString("publicKey"), jsonObject.getString("secretKey"), jsonObject.getString("kcdbcksc"), jsonObject.getString("kcdbcksc").substring(6), dbcksc);
String dbcksc = getsendBody("2", jsonObject, cklist.get(0).getCode(), cklist.get(0).getUnitcode());
boolean dbckscflag = sendPost(jsonObject.getString("publicKey"), jsonObject.getString("secretKey"), jsonObject.getString("kcdbcksc"), jsonObject.getString("kcdbcksc").substring(0,6), dbcksc);
if (!dbckscflag) {
returnObject.put("status", "falied");
returnObject.put("errormsg", "库存调拨出库删除失败");
return returnObject;
}
//调拨订单弃审
String dbdd = getsendBody("3", jsonObject, jsonObject.getString("code"));
boolean dbddflag = sendPost(jsonObject.getString("publicKey"), jsonObject.getString("secretKey"), jsonObject.getString("dbddqs"), jsonObject.getString("dbddqs").substring(6), dbdd);
String dbdd = getsendBody("3", jsonObject, jsonObject.getString("code"), jsonObject.getString("corp"));
boolean dbddflag = sendPost(jsonObject.getString("publicKey"), jsonObject.getString("secretKey"), jsonObject.getString("dbddqs"), jsonObject.getString("dbddqs").substring(0,6), dbdd);
if (!dbddflag) {
returnObject.put("status", "falied");
returnObject.put("errormsg", "调拨订单弃审失败");
return returnObject;
}
//调拨订单删除
String dbddsc = getsendBody("4", jsonObject, jsonObject.getString("code"));
boolean dbddscflag = sendPost(jsonObject.getString("publicKey"), jsonObject.getString("secretKey"), jsonObject.getString("dbddsc"), jsonObject.getString("dbddsc").substring(6), dbddsc);
String dbddsc = getsendBody("4", jsonObject, jsonObject.getString("code"), jsonObject.getString("corp"));
boolean dbddscflag = sendPost(jsonObject.getString("publicKey"), jsonObject.getString("secretKey"), jsonObject.getString("dbddsc"), jsonObject.getString("dbddsc").substring(0,6), dbddsc);
if (!dbddscflag) {
returnObject.put("status", "falied");
returnObject.put("errormsg", "调拨订单删除失败");
@ -678,8 +678,8 @@ public class EncapsulationImpl extends BaseService<EncapsulationEntity, String>
String parm = entity.getBodys();
JSONObject jsonObject = JSONObject.parseObject(parm);
jsonObject.put("dataSourceCode",sysDataSourceEntities.get(0).getSourceCode());
jsonObject.put("publicKey",headers.get("publicKey"));
jsonObject.put("secretKey",headers.get("secretKey"));
jsonObject.put("publicKey",entity.getSendApp().getPublicKey());
jsonObject.put("secretKey",entity.getSendApp().getSecretKey());
jsonObject.put("kcdbckqxqz",headers.get("kcdbckqxqz"));
jsonObject.put("kcdbcksc",headers.get("kcdbcksc"));
@ -761,16 +761,16 @@ public class EncapsulationImpl extends BaseService<EncapsulationEntity, String>
}
//库存产成品入库单取消签字
String qxqz = getsendBody("1", jsonObject, jsonObject.getString("code"));
boolean qxqzflag = sendPost(jsonObject.getString("publicKey"), jsonObject.getString("secretKey"), jsonObject.getString("kcccprkqxqz"), jsonObject.getString("kcccprkqxqz").substring(6), qxqz);
String qxqz = getsendBody("1", jsonObject, jsonObject.getString("code"), jsonObject.getString("corp"));
boolean qxqzflag = sendPost(jsonObject.getString("publicKey"), jsonObject.getString("secretKey"), jsonObject.getString("kcccprkqxqz"), jsonObject.getString("kcccprkqxqz").substring(0,6), qxqz);
if (!qxqzflag) {
returnObject.put("status", "falied");
returnObject.put("errormsg", "库存产成品入库单取消签字失败");
return returnObject;
}
//库存产成品入库单删除
String sc = getsendBody("2", jsonObject, jsonObject.getString("code"));
boolean scflag = sendPost(jsonObject.getString("publicKey"), jsonObject.getString("secretKey"), jsonObject.getString("kcccprksc"), jsonObject.getString("kcccprksc").substring(6), sc);
String sc = getsendBody("2", jsonObject, jsonObject.getString("code"), jsonObject.getString("corp"));
boolean scflag = sendPost(jsonObject.getString("publicKey"), jsonObject.getString("secretKey"), jsonObject.getString("kcccprksc"), jsonObject.getString("kcccprksc").substring(0,6), sc);
if (!scflag) {
returnObject.put("status", "falied");
returnObject.put("errormsg", "库存产成品入库单删除失败");
@ -804,8 +804,8 @@ public class EncapsulationImpl extends BaseService<EncapsulationEntity, String>
String parm = entity.getBodys();
JSONObject jsonObject = JSONObject.parseObject(parm);
jsonObject.put("dataSourceCode",sysDataSourceEntities.get(0).getSourceCode());
jsonObject.put("publicKey",headers.get("publicKey"));
jsonObject.put("secretKey",headers.get("secretKey"));
jsonObject.put("publicKey",entity.getSendApp().getPublicKey());
jsonObject.put("secretKey",entity.getSendApp().getSecretKey());
jsonObject.put("kcccprkqxqz",headers.get("kcccprkqxqz"));
jsonObject.put("kcccprksc",headers.get("kcccprksc"));
@ -883,16 +883,16 @@ public class EncapsulationImpl extends BaseService<EncapsulationEntity, String>
}
//库存材料出库取消签字
String qxqz = getsendBody("1", jsonObject, jsonObject.getString("code"));
boolean qxqzflag = sendPost(jsonObject.getString("publicKey"), jsonObject.getString("secretKey"), jsonObject.getString("qxqzApi"), jsonObject.getString("qxqzApi").substring(6), qxqz);
String qxqz = getsendBody("1", jsonObject, jsonObject.getString("code"), jsonObject.getString("corp"));
boolean qxqzflag = sendPost(jsonObject.getString("publicKey"), jsonObject.getString("secretKey"), jsonObject.getString("qxqzApi"), jsonObject.getString("qxqzApi").substring(0,6), qxqz);
if (!qxqzflag) {
returnObject.put("status", "falied");
returnObject.put("errormsg", "库存材料出库取消签字失败");
return returnObject;
}
//库存材料出库单删除
String sc = getsendBody("2", jsonObject, jsonObject.getString("code"));
boolean scflag = sendPost(jsonObject.getString("publicKey"), jsonObject.getString("secretKey"), jsonObject.getString("scApi"), jsonObject.getString("scApi").substring(6), sc);
String sc = getsendBody("2", jsonObject, jsonObject.getString("code"), jsonObject.getString("corp"));
boolean scflag = sendPost(jsonObject.getString("publicKey"), jsonObject.getString("secretKey"), jsonObject.getString("scApi"), jsonObject.getString("scApi").substring(0,6), sc);
if (!scflag) {
returnObject.put("status", "falied");
returnObject.put("errormsg", "库存材料出库单删除失败");
@ -926,8 +926,8 @@ public class EncapsulationImpl extends BaseService<EncapsulationEntity, String>
String parm = entity.getBodys();
JSONObject jsonObject = JSONObject.parseObject(parm);
jsonObject.put("dataSourceCode",sysDataSourceEntities.get(0).getSourceCode());
jsonObject.put("publicKey",headers.get("publicKey"));
jsonObject.put("secretKey",headers.get("secretKey"));
jsonObject.put("publicKey",entity.getSendApp().getPublicKey());
jsonObject.put("secretKey",entity.getSendApp().getSecretKey());
jsonObject.put("qxqzApi",headers.get("qxqzApi"));
jsonObject.put("scApi",headers.get("scApi"));
@ -1003,16 +1003,16 @@ public class EncapsulationImpl extends BaseService<EncapsulationEntity, String>
}
//库存其他出库取消签字
String qxqz = getsendBody("1", jsonObject, jsonObject.getString("code"));
boolean qxqzflag = sendPost(jsonObject.getString("publicKey"), jsonObject.getString("secretKey"), jsonObject.getString("qxqzApi"), jsonObject.getString("qxqzApi").substring(6), qxqz);
String qxqz = getsendBody("1", jsonObject, jsonObject.getString("code"), jsonObject.getString("corp"));
boolean qxqzflag = sendPost(jsonObject.getString("publicKey"), jsonObject.getString("secretKey"), jsonObject.getString("qxqzApi"), jsonObject.getString("qxqzApi").substring(0,6), qxqz);
if (!qxqzflag) {
returnObject.put("status", "falied");
returnObject.put("errormsg", "库存其他出库取消签字失败");
return returnObject;
}
//库存其他出库删除
String sc = getsendBody("2", jsonObject, jsonObject.getString("code"));
boolean scflag = sendPost(jsonObject.getString("publicKey"), jsonObject.getString("secretKey"), jsonObject.getString("scApi"), jsonObject.getString("scApi").substring(6), sc);
String sc = getsendBody("2", jsonObject, jsonObject.getString("code"), jsonObject.getString("corp"));
boolean scflag = sendPost(jsonObject.getString("publicKey"), jsonObject.getString("secretKey"), jsonObject.getString("scApi"), jsonObject.getString("scApi").substring(0,6), sc);
if (!scflag) {
returnObject.put("status", "falied");
returnObject.put("errormsg", "库存其他出库删除失败");
@ -1046,8 +1046,8 @@ public class EncapsulationImpl extends BaseService<EncapsulationEntity, String>
String parm = entity.getBodys();
JSONObject jsonObject = JSONObject.parseObject(parm);
jsonObject.put("dataSourceCode",sysDataSourceEntities.get(0).getSourceCode());
jsonObject.put("publicKey",headers.get("publicKey"));
jsonObject.put("secretKey",headers.get("secretKey"));
jsonObject.put("publicKey",entity.getSendApp().getPublicKey());
jsonObject.put("secretKey",entity.getSendApp().getSecretKey());
jsonObject.put("qxqzApi",headers.get("qxqzApi"));
jsonObject.put("scApi",headers.get("scApi"));
@ -1123,16 +1123,16 @@ public class EncapsulationImpl extends BaseService<EncapsulationEntity, String>
}
//库存其他入库单取消签字
String qxqz = getsendBody("1", jsonObject, jsonObject.getString("code"));
boolean qxqzflag = sendPost(jsonObject.getString("publicKey"), jsonObject.getString("secretKey"), jsonObject.getString("qxqzApi"), jsonObject.getString("qxqzApi").substring(6), qxqz);
String qxqz = getsendBody("1", jsonObject, jsonObject.getString("code"), jsonObject.getString("corp"));
boolean qxqzflag = sendPost(jsonObject.getString("publicKey"), jsonObject.getString("secretKey"), jsonObject.getString("qxqzApi"), jsonObject.getString("qxqzApi").substring(0,6), qxqz);
if (!qxqzflag) {
returnObject.put("status", "falied");
returnObject.put("errormsg", "库存其他入库单取消签字失败");
return returnObject;
}
//库存其他入库删除
String sc = getsendBody("2", jsonObject, jsonObject.getString("code"));
boolean scflag = sendPost(jsonObject.getString("publicKey"), jsonObject.getString("secretKey"), jsonObject.getString("scApi"), jsonObject.getString("scApi").substring(6), sc);
String sc = getsendBody("2", jsonObject, jsonObject.getString("code"), jsonObject.getString("corp"));
boolean scflag = sendPost(jsonObject.getString("publicKey"), jsonObject.getString("secretKey"), jsonObject.getString("scApi"), jsonObject.getString("scApi").substring(0,6), sc);
if (!scflag) {
returnObject.put("status", "falied");
returnObject.put("errormsg", "库存其他入库删除失败");
@ -1164,8 +1164,8 @@ public class EncapsulationImpl extends BaseService<EncapsulationEntity, String>
String parm = entity.getBodys();
JSONObject jsonObject = JSONObject.parseObject(parm);
jsonObject.put("dataSourceCode",sysDataSourceEntities.get(0).getSourceCode());
jsonObject.put("publicKey",headers.get("publicKey"));
jsonObject.put("secretKey",headers.get("secretKey"));
jsonObject.put("publicKey",entity.getSendApp().getPublicKey());
jsonObject.put("secretKey",entity.getSendApp().getSecretKey());
jsonObject.put("qxqzApi",headers.get("qxqzApi"));
jsonObject.put("scApi",headers.get("scApi"));
@ -1178,7 +1178,7 @@ public class EncapsulationImpl extends BaseService<EncapsulationEntity, String>
}
//拼装数据
private String getsendBody(String type, JSONObject object, String code) {
private String getsendBody(String type, JSONObject object, String code,String unitcode) {
JSONObject jsonObject1 = new JSONObject();
switch (type) {
@ -1190,7 +1190,7 @@ public class EncapsulationImpl extends BaseService<EncapsulationEntity, String>
JSONObject queryInfo = new JSONObject();
queryInfo.put("date_end", object.getString("date_end"));
queryInfo.put("date_begin", object.getString("date_begin"));
queryInfo.put("corp", object.getString("corp"));
queryInfo.put("corp", unitcode);
queryInfo.put("billcode", code);
jsonObject1.put("unsignInfo", unsignInfo);
@ -1204,7 +1204,7 @@ public class EncapsulationImpl extends BaseService<EncapsulationEntity, String>
JSONObject queryInfo2 = new JSONObject();
queryInfo2.put("date_end", object.getString("date_end"));
queryInfo2.put("date_begin", object.getString("date_begin"));
queryInfo2.put("corp", object.getString("corp"));
queryInfo2.put("corp", unitcode);
queryInfo2.put("billcode", code);
jsonObject1.put("deleteInfo", unsignInfo2);
@ -1217,7 +1217,7 @@ public class EncapsulationImpl extends BaseService<EncapsulationEntity, String>
JSONObject queryInfo3 = new JSONObject();
queryInfo3.put("date_end", object.getString("date_end"));
queryInfo3.put("date_begin", object.getString("date_begin"));
queryInfo3.put("corp", object.getString("corp"));
queryInfo3.put("corp", unitcode);
queryInfo3.put("code", code);
jsonObject1.put("approveinfo", unsignInfo3);
@ -1230,7 +1230,7 @@ public class EncapsulationImpl extends BaseService<EncapsulationEntity, String>
JSONObject queryInfo4 = new JSONObject();
queryInfo4.put("date_end", object.getString("date_end"));
queryInfo4.put("date_begin", object.getString("date_begin"));
queryInfo4.put("corp", object.getString("corp"));
queryInfo4.put("corp", unitcode);
queryInfo4.put("code", code);
jsonObject1.put("deleteinfo", unsignInfo4);
@ -1253,6 +1253,7 @@ public class EncapsulationImpl extends BaseService<EncapsulationEntity, String>
* @Date 3:05 下午 2024/9/4
**/
private boolean sendPost(String publicKey, String secretKey, String apiCode, String appId, String bodys) {
StringBuilder returnBody = new StringBuilder();
Integer outTime = 6000;
HttpClientBuilder httpClientBuilder = HttpClientBuilder.create();