diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerretware/BaseManufacturerRetwareService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerretware/BaseManufacturerRetwareService.java index e5d5e4b0cb..332e1b7558 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerretware/BaseManufacturerRetwareService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerretware/BaseManufacturerRetwareService.java @@ -306,7 +306,7 @@ public class BaseManufacturerRetwareService extends MybatisBaseService dto, String eventType) { - ResultBean rb = ResultBean.fireFail(); if (null == dto || dto.size() <= 0 || eventType.isEmpty()) { return rb.setMsg("参数错误"); } - for (BaseVehicleDto baseVehicleDto : dto) { BaseVehicle baseVehicle = baseVehicleService.selectByVinNoAndOrgSid(baseVehicleDto.getVinNo(), baseVehicleDto.getUseOrgSid()); if (null == baseVehicle) baseVehicle = new BaseVehicle(); - baseVehicleService.copyToBean(baseVehicleDto, baseVehicle); //BeanUtil.copyProperties(baseVehicleDto, baseVehicle, new CopyOptions().setIgnoreNullValue(true)); //更新车辆台账数据 @@ -187,68 +184,75 @@ public class BaseVehicleRest implements BaseVehicleFeign { baseVehicleService.saveVeh_tc(baseVehicle); } //入账生成台账 //外采入库生成台账 - try{ - if (eventType.equals(OperVehicleState.EventType.RZ_SAVEVEH.getCode())|| - eventType.equals(OperVehicleState.EventType.WC_SAVEVEH.getCode())){ - StkInStock stkInStock=new StkInStock(); - /** - * // 入库日期:FDate (必填项) - */ - stkInStock.setFDate(DateUtil.now()); - /** - * // 采购部门:FPurchaseDeptId (必填项) - */ - stkInStock.setFPurchaseDeptId("05.04"); - /** - * //采购组织:FPurchaseOrgId (必填项) - */ - stkInStock.setFPurchaseOrgId("101"); - /** - * // 供应商:FSupplierId (必填项) - */ - stkInStock.setFSupplierId("010001"); - /** - * //分配目标组织:TOrgId (必填项) - */ - stkInStock.setTOrgId("100012"); - /** - * // 物料列表:FInStockEntry (必填项) - */ - List fInStockEntry=new ArrayList<>(); - for (BaseVehicleDto baseVehicleDto : dto) { - StkInStock.FInStockEntry sf=new StkInStock.FInStockEntry(); - /** - * 车辆类型 - */ - sf.setCllx("03"); - /** - * // 批号:FLot - */ - sf.setFLot("11112222"); - /** - * // 物料编码:FMaterialId (必填项) - */ - sf.setFMaterialId(baseVehicleDto.getVinNo()); - /** - * // 仓库:FStockId - */ - sf.setFStockId("CK001"); - /** - * 物料分组 - */ - sf.setWlfz("01"); - fInStockEntry.add(sf); - } - stkInStock.setFInStockEntry(fInStockEntry); - finKingDeeFeign.draftStkInStock(stkInStock); - } - }catch (Exception e){ - e.printStackTrace(); - } - + if (eventType.equals(OperVehicleState.EventType.RZ_SAVEVEH.getCode())|| + eventType.equals(OperVehicleState.EventType.WC_SAVEVEH.getCode())){ + kingdeeStkInStock(dto); + } return rb.success().setMsg("保存成功"); } + /** + * 推送金蝶采购入库单 + * @param dto + */ + private void kingdeeStkInStock(List dto ) { + try{ + StkInStock stkInStock=new StkInStock(); + /** + * // 入库日期:FDate (必填项) + */ + stkInStock.setFDate(DateUtil.now()); + /** + * // 采购部门:FPurchaseDeptId (必填项) + */ + stkInStock.setFPurchaseDeptId("05.04"); + /** + * //采购组织:FPurchaseOrgId (必填项) + */ + stkInStock.setFPurchaseOrgId("101"); + /** + * // 供应商:FSupplierId (必填项) + */ + stkInStock.setFSupplierId("010001"); + /** + * //分配目标组织:TOrgId (必填项) + */ + stkInStock.setTOrgId("100012"); + /** + * // 物料列表:FInStockEntry (必填项) + */ + List fInStockEntry=new ArrayList<>(); + for (BaseVehicleDto baseVehicleDto : dto) { + StkInStock.FInStockEntry sf=new StkInStock.FInStockEntry(); + /** + * 车辆类型 + */ + sf.setCllx("03"); + /** + * // 批号:FLot + */ + sf.setFLot("11112222"); + /** + * // 物料编码:FMaterialId (必填项) + */ + sf.setFMaterialId(baseVehicleDto.getVinNo()); + /** + * // 仓库:FStockId + */ + sf.setFStockId("CK001"); + /** + * 物料分组 + */ + sf.setWlfz("01"); + fInStockEntry.add(sf); + } + stkInStock.setFInStockEntry(fInStockEntry); + finKingDeeFeign.draftStkInStock(stkInStock); + }catch (Exception e){ + e.printStackTrace(); + } + } + /*** * 只是更新验车推送数据作用,验车推送需要更新的字段属性 */