|
|
|
@ -1,8 +1,11 @@ |
|
|
|
package com.yxt.anrui.fin.biz.kingdee.bdstock; |
|
|
|
|
|
|
|
import cn.hutool.core.bean.BeanUtil; |
|
|
|
import com.alibaba.fastjson.JSONObject; |
|
|
|
import com.fasterxml.jackson.core.JsonProcessingException; |
|
|
|
import com.fasterxml.jackson.databind.ObjectMapper; |
|
|
|
import com.yxt.anrui.fin.api.kingdee.KingDeeBillId; |
|
|
|
import com.yxt.anrui.fin.api.kingdee.KingDeeBillUrl; |
|
|
|
import com.yxt.anrui.fin.api.kingdee.bdstock.BDStock; |
|
|
|
import com.yxt.anrui.fin.biz.kingdee.FinKingDeeService; |
|
|
|
import com.yxt.common.base.config.RedisUtil; |
|
|
|
@ -15,6 +18,7 @@ import org.springframework.data.redis.core.StringRedisTemplate; |
|
|
|
import org.springframework.stereotype.Service; |
|
|
|
|
|
|
|
import javax.annotation.Resource; |
|
|
|
import java.util.Map; |
|
|
|
import java.util.concurrent.TimeUnit; |
|
|
|
|
|
|
|
/** |
|
|
|
@ -31,26 +35,12 @@ public class BDStockService extends FinKingDeeService { |
|
|
|
* @return |
|
|
|
*/ |
|
|
|
public ResultBean<String> draftBDStock(BDStock bDStock) { |
|
|
|
String jsonUser = null;//这样就变成了一个json对象了
|
|
|
|
try { |
|
|
|
jsonUser = new ObjectMapper().writeValueAsString(bDStock); |
|
|
|
} catch (JsonProcessingException e) { |
|
|
|
e.printStackTrace(); |
|
|
|
} |
|
|
|
stringRedisTemplate.opsForValue().set("stock-in",jsonUser,5L, TimeUnit.SECONDS); |
|
|
|
stringRedisTemplate.opsForValue().set("stock-in1",jsonUser); |
|
|
|
String s = stringRedisTemplate.opsForValue().get("stock-in"); |
|
|
|
String s1 = stringRedisTemplate.opsForValue().get("stock-in1"); |
|
|
|
// boolean set = redisUtil.set("stock-in", jsonUser, 10L);
|
|
|
|
log.info("set:{}",s); |
|
|
|
log.info("set1:{}",s1); |
|
|
|
return null; |
|
|
|
} |
|
|
|
/* public ResultBean<String> draftBDStock(BDStock bDStock) { |
|
|
|
// bDStock=BDStock.createBdMaterial();
|
|
|
|
ResultBean rb=ResultBean.fireFail(); |
|
|
|
//仓库信息转map参数
|
|
|
|
Map<String, Object> stringObjectMap = BeanUtil.beanToMap(bDStock); |
|
|
|
stringObjectMap.put("FStockId","0"); |
|
|
|
stringObjectMap.put("IsDeleteEntry", "True"); |
|
|
|
//业务表的主表数据集合
|
|
|
|
Map<String,String> map_fEntityModel_=createMapParams(stringObjectMap); |
|
|
|
String kingDeeData = BDStocklCastToKingDeeBillFields.getKingDeeData(map_fEntityModel_); |
|
|
|
@ -73,9 +63,9 @@ public class BDStockService extends FinKingDeeService { |
|
|
|
log.info("仓库保存成功!"); |
|
|
|
String data = resultBean.getData(); |
|
|
|
|
|
|
|
String submitKD = getSubmitKD(data,KingDeeBillId.BD_STOCK.getID()); |
|
|
|
String submitKD = getSubmitKD(data, KingDeeBillId.BD_STOCK.getID()); |
|
|
|
ResultBean<String> resultBean1 = accessKingDeeInterface(KingDeeBillId.BD_STOCK.getID(), |
|
|
|
submitKD,KingDeeBillUrl.SUBMIT_URL.getURL());//submitKingDeeBillData(KingDeeBillId.BD_STOCK.getID(), submitKD);
|
|
|
|
submitKD, KingDeeBillUrl.SUBMIT_URL.getURL());//submitKingDeeBillData(KingDeeBillId.BD_STOCK.getID(), submitKD);
|
|
|
|
if(!resultBean1.getSuccess()){ |
|
|
|
log.info("仓库提交失败!"); |
|
|
|
return rb.setMsg("仓库提交失败!"); |
|
|
|
@ -95,6 +85,105 @@ public class BDStockService extends FinKingDeeService { |
|
|
|
e.printStackTrace(); |
|
|
|
} |
|
|
|
return rb; |
|
|
|
}*/ |
|
|
|
} |
|
|
|
/* public ResultBean<String> draftBDStock(BDStock bDStock) { |
|
|
|
String jsonUser = null;//这样就变成了一个json对象了
|
|
|
|
try { |
|
|
|
jsonUser = new ObjectMapper().writeValueAsString(bDStock); |
|
|
|
} catch (JsonProcessingException e) { |
|
|
|
e.printStackTrace(); |
|
|
|
} |
|
|
|
stringRedisTemplate.opsForValue().set("stock-in",jsonUser,5L, TimeUnit.SECONDS); |
|
|
|
stringRedisTemplate.opsForValue().set("stock-in1",jsonUser); |
|
|
|
String s = stringRedisTemplate.opsForValue().get("stock-in"); |
|
|
|
String s1 = stringRedisTemplate.opsForValue().get("stock-in1"); |
|
|
|
// boolean set = redisUtil.set("stock-in", jsonUser, 10L);
|
|
|
|
log.info("set:{}",s); |
|
|
|
log.info("set1:{}",s1); |
|
|
|
return null; |
|
|
|
} |
|
|
|
*/ |
|
|
|
|
|
|
|
/** |
|
|
|
* 修改仓库信息 |
|
|
|
* @param bDStock |
|
|
|
* @return |
|
|
|
*/ |
|
|
|
public ResultBean<String> updateBDtStock(BDStock bDStock) { |
|
|
|
//bdSupplier=BdSupplier.createBdSupplier();
|
|
|
|
ResultBean<String> rb=ResultBean.fireFail(); |
|
|
|
try { |
|
|
|
Map<String,String> map_fEntityModel_= object2Map(bDStock); |
|
|
|
map_fEntityModel_.put("FStockId","0"); |
|
|
|
map_fEntityModel_.put("IsDeleteEntry", "True"); |
|
|
|
String kingDeeData = BDStocklCastToKingDeeBillFields.getKingDeeData(map_fEntityModel_); |
|
|
|
ResultBean<String> stringResultBean = viewGetId(KingDeeBillId.BD_STOCK.getID(), bDStock.getFNumber()); |
|
|
|
String id = stringResultBean.getData(); |
|
|
|
if(!stringResultBean.getSuccess()&&"0".equals(id)){ |
|
|
|
return addBDtStock(kingDeeData,bDStock.getFNumber()); |
|
|
|
} |
|
|
|
//反审核
|
|
|
|
boolean c = isAudit(KingDeeBillId.BD_STOCK.getID(), "C", id); |
|
|
|
//修改
|
|
|
|
map_fEntityModel_.put("FStockId",id); |
|
|
|
map_fEntityModel_.put("IsDeleteEntry", "False"); |
|
|
|
map_fEntityModel_.put("fields","FName,FNumber"); |
|
|
|
kingDeeData = BDStocklCastToKingDeeBillFields.getKingDeeData(map_fEntityModel_); |
|
|
|
rb= accessKingDeeInterface(KingDeeBillId.BD_STOCK.getID(), kingDeeData,KingDeeBillUrl.SAVE_URL.getURL()); |
|
|
|
//提交审核
|
|
|
|
ResultBean<String> resultBean2 = submitAndAudit(id); |
|
|
|
return resultBean2; |
|
|
|
} catch (Exception e) { |
|
|
|
e.printStackTrace(); |
|
|
|
} |
|
|
|
return rb; |
|
|
|
} |
|
|
|
/** |
|
|
|
* 新增 |
|
|
|
* @param kingDeeData |
|
|
|
* @return |
|
|
|
*/ |
|
|
|
private ResultBean<String> addBDtStock(String kingDeeData, String FNumber){ |
|
|
|
ResultBean<String> rb=ResultBean.fireFail(); |
|
|
|
try{ |
|
|
|
rb= accessKingDeeInterface(KingDeeBillId.BD_STOCK.getID(), kingDeeData,KingDeeBillUrl.SAVE_URL.getURL()); |
|
|
|
String s = draftResultGetId(rb.getData()); |
|
|
|
return submitAndAudit(s); |
|
|
|
}catch (Exception e){ |
|
|
|
e.printStackTrace(); |
|
|
|
return rb.setMsg("仓库新增失败"); |
|
|
|
} |
|
|
|
} |
|
|
|
/** |
|
|
|
* 提交审核仓库 |
|
|
|
* @param id |
|
|
|
* @return |
|
|
|
*/ |
|
|
|
private ResultBean<String> submitAndAudit( String id){ |
|
|
|
ResultBean<String> rb=ResultBean.fireFail(); |
|
|
|
try{ |
|
|
|
String submitKDTempJson = getSubmitKDTempJson(KingDeeBillId.BD_STOCK.getID(),id ); |
|
|
|
ResultBean<String> resultBean1 = accessKingDeeInterface(KingDeeBillId.BD_STOCK.getID(), submitKDTempJson, |
|
|
|
KingDeeBillUrl.SUBMIT_URL.getURL()); |
|
|
|
if(!resultBean1.getSuccess()){ |
|
|
|
log.info("仓库提交失败!"); |
|
|
|
return rb.setMsg("仓库提交失败!"); |
|
|
|
} |
|
|
|
log.info("仓库提交成功!"); |
|
|
|
String auditKDTempJson = getAuditKDTempJson(KingDeeBillId.BD_STOCK.getID(), id); |
|
|
|
ResultBean<String> resultBean2 = |
|
|
|
accessKingDeeInterface(KingDeeBillId.BD_STOCK.getID(), auditKDTempJson, |
|
|
|
KingDeeBillUrl.AUDIT_URL.getURL()); |
|
|
|
if(!resultBean2.getSuccess()){ |
|
|
|
log.info("仓库审核失败!"); |
|
|
|
return rb.setMsg("仓库审核失败!"); |
|
|
|
} |
|
|
|
log.info("仓库审核成功!"); |
|
|
|
return resultBean2; |
|
|
|
} catch (Exception e){ |
|
|
|
e.printStackTrace(); |
|
|
|
return rb.setMsg("仓库提交审核失败"); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
yxt_djz
3 years ago