diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeService.java index 6f9d906d2f..93e744f4fe 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeService.java @@ -25,7 +25,7 @@ import java.util.Map; public class FinKingDeeService { public static final Logger log = LoggerFactory.getLogger(FinKingDeeService.class); @Autowired - private SysMappingFeign sysMappingFeign; + public SysMappingFeign sysMappingFeign; /** * 调用金蝶的保存接口 * @param data diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/bdmaterial/BdMaterialService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/bdmaterial/BdMaterialService.java index 6f6dd9a784..334951983f 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/bdmaterial/BdMaterialService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/bdmaterial/BdMaterialService.java @@ -46,8 +46,6 @@ public class BdMaterialService extends FinKingDeeService { } map_fEntityModel_.put("IsDeleteEntry", "True"); map_fEntityModel_.put("FMATERIALID", 0 + ""); - map_fEntityModel_.put("FMaterialGroup","02"); - map_fEntityModel_.put("F_PAEZ_Base","02"); rb= draftBdMaterial(map_fEntityModel_); if (rb.getSuccess()) { list_r.add(rb.getData()); @@ -60,7 +58,6 @@ public class BdMaterialService extends FinKingDeeService { bdMaterials.forEach(bdMaterial -> { som.add(BeanUtil.beanToMap(bdMaterial)); }); - // "存货类别 FCategoryID,物料分组 FMaterialGroup,车辆类型 F_PAEZ_Base 车辆系别 F_PAEZ_Base2 车辆马力 F_PAEZ_Base3 车辆驱动 F_PAEZ_Base4" List params = getKeyItems(); List>> list = makeMappingInfosParams(som,params,"FName", "物料","CWXT"); @@ -112,8 +109,6 @@ public class BdMaterialService extends FinKingDeeService { } map_fEntityModel_.put("IsDeleteEntry","False"); map_fEntityModel_.put("FMATERIALID",FMATERIALID); - map_fEntityModel_.put("FMaterialGroup","02"); - map_fEntityModel_.put("F_PAEZ_Base","02"); rb= saveBdMaterial(map_fEntityModel_); if (rb.getSuccess()) { list_r.add(rb.getData()); diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/saloutstock/SalOutStockService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/saloutstock/SalOutStockService.java index 6572c5889d..9191aa6f4e 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/saloutstock/SalOutStockService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/saloutstock/SalOutStockService.java @@ -4,6 +4,8 @@ import com.yxt.anrui.fin.api.kingdee.KingDeeBillId; import com.yxt.anrui.fin.api.kingdee.KingDeeBillUrl; import com.yxt.anrui.fin.api.kingdee.saloutstock.SalOutStock; import com.yxt.anrui.fin.biz.kingdee.FinKingDeeService; +import com.yxt.anrui.portal.api.sysmapping.SysMappingInfoQuery; +import com.yxt.anrui.portal.api.sysmapping.SysMappingInfoVo; import com.yxt.common.core.result.ResultBean; import org.springframework.stereotype.Service; @@ -11,7 +13,7 @@ import java.util.List; import java.util.Map; /** - * 保存采购出库单 + * 保存销售出库单 */ @Service public class SalOutStockService extends FinKingDeeService { @@ -27,6 +29,24 @@ public class SalOutStockService extends FinKingDeeService { try { //业务表的主表数据集合 Map map_fEntityModel_= object2Map(salOutStock); + + //项目类别 + String F_PAEZ_AssistantType = map_fEntityModel_.get("F_PAEZ_AssistantType"); + String F_PAEZ_AssistantKey = map_fEntityModel_.get("F_PAEZ_AssistantKey"); + SysMappingInfoQuery smiq=new SysMappingInfoQuery(); + smiq.setMap_sourceKey("CWXT"); + smiq.setMap_object("销售出库单"); + smiq.setMap_item("项目类别"); + smiq.setDictKey(F_PAEZ_AssistantKey); + smiq.setDictTypeCode(F_PAEZ_AssistantType); + ResultBean sysMappingInfoVoResultBean = sysMappingFeign.selectMappingInfo(smiq); + boolean success = sysMappingInfoVoResultBean.getSuccess(); + if(!success){ + return rb.setMsg(sysMappingInfoVoResultBean.getMsg()); + } + String F_PAEZ_Assistant=sysMappingInfoVoResultBean.getData().getMap_itemKey();//TODO 根据应付类别的code,key查询金蝶系统中的应付类别的编码 映射来源“CWXT”/“财务系统” + map_fEntityModel_.put("F_PAEZ_Assistant",F_PAEZ_Assistant); + //准备 物料列表的数据 ForEntryBill List fEntity = salOutStock.getFEntity(); List> vehicleListMap = createVehicleLists(fEntity);