From e46961e8fc501f74d3c8284599b47f562d1bc809 Mon Sep 17 00:00:00 2001 From: hp <2969694837@qq.com> Date: Fri, 14 Oct 2022 14:43:11 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E5=B7=A1=E6=A3=80=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ScmVehiclePatrolinspection.java | 2 ++ .../ScmVehiclePatrolinspectionsheetDto.java | 2 ++ .../biz/scmvehicleinventory/ScmVehicleInventoryService.java | 3 ++- .../ScmVehiclePatrolinspectionMapper.xml | 4 ++-- .../ScmVehiclePatrolinspectionService.java | 1 + .../ScmVehiclePatrolinspectionsheetService.java | 2 ++ .../ScmVehPatrolinspectionmonthService.java | 2 ++ 7 files changed, 13 insertions(+), 3 deletions(-) diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspection/ScmVehiclePatrolinspection.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspection/ScmVehiclePatrolinspection.java index 3104a12621..4354b93307 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspection/ScmVehiclePatrolinspection.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspection/ScmVehiclePatrolinspection.java @@ -71,5 +71,7 @@ public class ScmVehiclePatrolinspection extends BaseEntity { private String createOrgSid; // 创建组织 @ApiModelProperty("使用组织") private String useOrgSid; // 使用组织 + @ApiModelProperty("推送状态 0 未推送 1 已推送") + private int pushState; } diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspectionsheet/ScmVehiclePatrolinspectionsheetDto.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspectionsheet/ScmVehiclePatrolinspectionsheetDto.java index 00c61d8f80..5ee5cdb922 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspectionsheet/ScmVehiclePatrolinspectionsheetDto.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspectionsheet/ScmVehiclePatrolinspectionsheetDto.java @@ -100,4 +100,6 @@ public class ScmVehiclePatrolinspectionsheetDto implements Dto { private String warehouseSid; @ApiModelProperty("存放地点") private String warehouse; + @ApiModelProperty("推送状态 0 未推送 1 已推送") + private int pushState; } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinventory/ScmVehicleInventoryService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinventory/ScmVehicleInventoryService.java index a048449366..5571196b22 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinventory/ScmVehicleInventoryService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinventory/ScmVehicleInventoryService.java @@ -367,7 +367,7 @@ public class ScmVehicleInventoryService extends MybatisBaseService SELECT count(*), (SELECT count(*) FROM scm_vehicle_patrolinspection svp WHERE svp.state = '1' and svp.mainSid = #{mainSid}) AS totalNumber, - (SELECT count(*) FROM scm_vehicle_patrolinspection svp WHERE svp.patrolInspectionStateKey = '001' and svp.mainSid = #{mainSid}) AS unHandledNumber, + (SELECT count(*) FROM scm_vehicle_patrolinspection svp WHERE svp.patrolInspectionStateKey = '001' and svp.pushState = 1 and svp.mainSid = #{mainSid}) AS unHandledNumber, (SELECT count(*) FROM scm_vehicle_patrolinspection svp WHERE svp.patrolInspectionStateKey = '002' and svp.mainSid = #{mainSid}) AS processedNumber, - (SELECT count(*) FROM scm_vehicle_patrolinspection svp WHERE svp.patrolInspectionStateKey = '000' and svp.mainSid = #{mainSid}) AS notHandledNumber, + (SELECT count(*) FROM scm_vehicle_patrolinspection svp WHERE svp.patrolInspectionStateKey = '000' and svp.isDelete = 0 and svp.mainSid = #{mainSid}) AS notHandledNumber, (SELECT count(*) FROM scm_vehicle_patrolinspection svp WHERE svp.patrolInspectionStateKey = '000' and svp.mainSid = #{mainSid}) AS surplusNumber, (SELECT count(*) FROM scm_vehicle_patrolinspection svp WHERE svp.patrolInspectionStateKey = '003' and svp.mainSid = #{mainSid}) AS normalNumber FROM scm_vehicle_patrolinspection svp diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionService.java index bbb342d56c..1af3293b0c 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionService.java @@ -264,6 +264,7 @@ public class ScmVehiclePatrolinspectionService extends MybatisBaseService qw = new QueryWrapper<>(); + qw.eq("svp.isDelete", 0); if (StringUtils.isNotBlank(pagerQuery.getParams().getUseOrgSid())) { qw.eq("svp.createOrgSid", pagerQuery.getParams().getUseOrgSid()); } diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspectionsheet/ScmVehiclePatrolinspectionsheetService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspectionsheet/ScmVehiclePatrolinspectionsheetService.java index 958fb24fe5..22ccaffa94 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspectionsheet/ScmVehiclePatrolinspectionsheetService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspectionsheet/ScmVehiclePatrolinspectionsheetService.java @@ -441,8 +441,10 @@ public class ScmVehiclePatrolinspectionsheetService extends MybatisBaseService 0) { @@ -258,6 +259,7 @@ public class ScmVehPatrolinspectionmonthService extends MybatisBaseService Date: Fri, 14 Oct 2022 14:43:21 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E5=AE=8C=E5=96=84=E7=9B=B4=E6=8E=A5?= =?UTF-8?q?=E8=B0=83=E6=8B=A8=E5=8D=95=E7=9A=84=E8=B0=83=E5=85=A5=E8=B0=83?= =?UTF-8?q?=E5=87=BA=E7=BB=84=E7=BB=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fin/api/kingdee/KingDeeDocumentStatus.java | 5 +++++ .../fin/api/kingdee/saloutstock/SalOutStock.java | 9 +++------ .../stktransferdirect/StkTransferDirect.java | 6 +++--- .../fin/biz/kingdee/FinKingDeeFeignRest.java | 7 +++++-- .../anrui/fin/biz/kingdee/FinKingDeeService.java | 15 +++++++++++++++ .../fin/biz/kingdee/bdmaterial/data_data.json | 2 +- .../StkTransferDirectService.java | 4 ++++ .../stktransferdirect/data_FBillEntry.json | 6 +++--- .../ScmVehicleEnterlibraryService.java | 2 +- .../ScmVehicleGressionService.java | 2 +- 10 files changed, 41 insertions(+), 17 deletions(-) create mode 100644 anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/KingDeeDocumentStatus.java diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/KingDeeDocumentStatus.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/KingDeeDocumentStatus.java new file mode 100644 index 0000000000..85a6512688 --- /dev/null +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/KingDeeDocumentStatus.java @@ -0,0 +1,5 @@ +package com.yxt.anrui.fin.api.kingdee; + +public enum KingDeeDocumentStatus { + /*SAVE,SUBMIT;*/ +} diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/saloutstock/SalOutStock.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/saloutstock/SalOutStock.java index ded9a94adc..f66e0d64e9 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/saloutstock/SalOutStock.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/saloutstock/SalOutStock.java @@ -129,19 +129,16 @@ public class SalOutStock { /** * 销售折让:F_PAEZ_Decimal3 */ @JsonProperty("F_PAEZ_Decimal3") - @NotBlank - public String F_PAEZ_Decimal3; + public String F_PAEZ_Decimal3="0"; /** * 赠送套餐:F_PAEZ_Decimal4 */ @JsonProperty("F_PAEZ_Decimal4") - @NotBlank - public String F_PAEZ_Decimal4; + public String F_PAEZ_Decimal4="0"; /** * 返利金额:F_PAEZ_Decimal */ @JsonProperty("F_PAEZ_Decimal") - @NotBlank - public String F_PAEZ_Decimal; + public String F_PAEZ_Decimal="0"; /** * 备注:FEntrynote */ diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/stktransferdirect/StkTransferDirect.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/stktransferdirect/StkTransferDirect.java index 2c2120c319..be3618c452 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/stktransferdirect/StkTransferDirect.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/stktransferdirect/StkTransferDirect.java @@ -95,9 +95,9 @@ public class StkTransferDirect { @NotBlank(message = "FOwnerIdHead不能为空") public String FOwnerIdHead;*/ /* 调出库存组织:FStockOutOrgId (必填项)*/ - @JsonProperty("FStockOutOrgId") + /* @JsonProperty("FStockOutOrgId") @NotBlank(message = "FStockOutOrgId不能为空") - public String FStockOutOrgId; + public String FStockOutOrgId;*/ /* 调入库存组织:FStockOrgId (必填项)*/ @JsonProperty("FStockOrgId") @NotBlank(message = "FStockOrgId不能为空") @@ -145,7 +145,7 @@ public class StkTransferDirect { /* 日期:FDate (必填项)*/ stkTransferDirect.setFDate(sdf.format(date)); /* 调出库存组织:FStockOutOrgId (必填项)*/ - stkTransferDirect.setFStockOutOrgId("101"); + //stkTransferDirect.setFStockOutOrgId("101"); /* 调出货主类型:FOwnerTypeOutIdHead (必填项)*/ //stkTransferDirect.setFOwnerTypeOutIdHead("BD_OwnerOrg"); /* 调拨类型:FTransferBizType (必填项)*/ diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeFeignRest.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeFeignRest.java index eefd1e9b98..4d288c0f1e 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeFeignRest.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeFeignRest.java @@ -127,7 +127,10 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign { */ @Autowired private CNRecpaypurposeService cNRecpaypurposeService; - + /** + */ + @Autowired + private FinKingDeeService finKingDeeService; @ApiOperation("入账暂存应付单的接口") @PostMapping("/draftEntryBill") @ResponseBody @@ -219,7 +222,7 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign { @Override public ResultBean getKingDataInfoByNumber(@PathVariable("formId") String formId, @PathVariable("number") String number) { - return null;// bdCustomerService.accessKingDeeInterface(formId,number); + return finKingDeeService.accessKingDeeInterface(formId,number); } @ApiOperation("单据查询") 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 93e744f4fe..b2874b4de4 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 @@ -2,6 +2,8 @@ package com.yxt.anrui.fin.biz.kingdee; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; +import com.yxt.anrui.fin.api.kingdee.KingDeeBillId; +import com.yxt.anrui.fin.api.kingdee.KingDeeBillUrl; import com.yxt.anrui.fin.api.kingdee.KingDeeResult; import com.yxt.anrui.portal.api.sysmapping.SysMappingFeign; import com.yxt.anrui.portal.api.sysmapping.SysMappingInfoQueryBatch; @@ -263,6 +265,19 @@ public class FinKingDeeService { } return rb.success(); } + + public ResultBean accessKingDeeInterface(String formId, String number) { + String getKDForNumbers = getGetKDForNumbers(formId, number); + try { + ResultBean kingDataInfoByNumber = accessKingDeeInterface(formId, getKDForNumbers, + KingDeeConfig.userName_administrator,KingDeeConfig.password_administrator, KingDeeBillUrl.VIEW_URL.getURL()); + return kingDataInfoByNumber; + } catch (Exception e) { + e.printStackTrace(); + } + return new ResultBean().fail().setMsg("查询异常"); + } + /** * 调用金蝶接口的数据格式 */ diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/bdmaterial/data_data.json b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/bdmaterial/data_data.json index 5606e2a1a5..7318e63684 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/bdmaterial/data_data.json +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/bdmaterial/data_data.json @@ -1,6 +1,6 @@ { "Creator": "", - "NeedUpDateFields": ["FName","FNumber","FMaterialGroup","F_PAEZ_Base"], + "NeedUpDateFields": [], "NeedReturnFields": [], "IsDeleteEntry": "@KD_IsDeleteEntry", "SubSystemId": "", diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/stktransferdirect/StkTransferDirectService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/stktransferdirect/StkTransferDirectService.java index b4c996df9f..b336b440b8 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/stktransferdirect/StkTransferDirectService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/stktransferdirect/StkTransferDirectService.java @@ -7,6 +7,8 @@ import com.yxt.anrui.fin.biz.kingdee.FinKingDeeService; import com.yxt.common.core.result.ResultBean; import org.springframework.stereotype.Service; +import java.text.SimpleDateFormat; +import java.util.Date; import java.util.List; import java.util.Map; @@ -21,6 +23,8 @@ public class StkTransferDirectService extends FinKingDeeService { public ResultBean draftStkTransferDirect(StkTransferDirect stkTransferDirect) { //stkTransferDirect=StkTransferDirect.createStkTransferDirect(); ResultBean rb=ResultBean.fireFail(); + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd"); + stkTransferDirect.setFDate(sdf.format(new Date())); try { //业务表的主表数据集合 Map map_fEntityModel_= object2Map(stkTransferDirect); diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/stktransferdirect/data_FBillEntry.json b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/stktransferdirect/data_FBillEntry.json index 4d5fd67466..e3c96ffc18 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/stktransferdirect/data_FBillEntry.json +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/stktransferdirect/data_FBillEntry.json @@ -27,7 +27,7 @@ "FBusinessDate": "@KD_FDate", "FOwnerTypeOutId": "BD_OwnerOrg", "FOwnerOutId": { - "FNumber": "@KD_FStockOutOrgId" + "FNumber": "@KD_FStockOrgId" }, "FOwnerTypeId": "BD_OwnerOrg", "FOwnerId": { @@ -44,10 +44,10 @@ }, "FKeeperTypeOutId": "BD_KeeperOrg", "FKeeperOutId": { - "FNumber": "@KD_FStockOutOrgId" + "FNumber": "@KD_FStockOrgId" }, "FDestMaterialId": { - "FNUMBER": " JX091054" + "FNUMBER": "@KD_FMaterialId" }, "FPriceUnitID": { "FNumber": "liang" diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleenterlibrary/ScmVehicleEnterlibraryService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleenterlibrary/ScmVehicleEnterlibraryService.java index 037d5e77a0..21729f65f6 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleenterlibrary/ScmVehicleEnterlibraryService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleenterlibrary/ScmVehicleEnterlibraryService.java @@ -357,7 +357,7 @@ public class ScmVehicleEnterlibraryService extends MybatisBaseService FPAYBILLENTRYs = new ArrayList<>(); StkTransferDirect stkTransferDirect = new StkTransferDirect(); // stkTransferDirect.setFStockOutOrgId("101"); //调出库存组织 - stkTransferDirect.setFStockOutOrgId(sysOrganizationVo.getOrgCode()); //调出库存组织 + // stkTransferDirect.setFStockOutOrgId(sysOrganizationVo.getOrgCode()); //调出库存组织 // stkTransferDirect.setFStockOrgId("101"); //调入库存组织 stkTransferDirect.setFStockOrgId(sysOrganizationVo.getOrgCode()); //调入库存组织 stkTransferDirect.setFDate(simpleDateFormat.format(baseVehicleVo.getPriceDate())); //日期 From 04a73bae32470639c689d0db1fc82f01ae459f73 Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Fri, 14 Oct 2022 15:30:30 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E6=8E=A8=E9=80=81=E5=87=BA=E7=BA=B3?= =?UTF-8?q?=E4=BB=98=E6=AC=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/basemanufacturerbank/BaseManufacturerBankMapper.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerbank/BaseManufacturerBankMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerbank/BaseManufacturerBankMapper.xml index fa138d3ce7..fc8dae51cb 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerbank/BaseManufacturerBankMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerbank/BaseManufacturerBankMapper.xml @@ -70,7 +70,7 @@ left join base_vehicle_brand bvb on bvb.manufacturerSid = bm.sid left join base_vehicle_model bvm on bvm.carBrand = bvb.sid where bvm.sid = #{modelSid} - and bmb.dueBankValue = '订金账户' + and bmb.dueBankValue = '订金账户' and bmb.isDelete = 0 AND BM.isDelete = 0 \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigRest.java index 82a9341705..854ac57920 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigRest.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigRest.java @@ -183,6 +183,118 @@ public class BaseModelConfigRest implements BaseModelConfigFeign { return rb.success().setMsg("保存成功"); } + @Override + public ResultBean fastSave(BaseModelConfigDto dto) { + ResultBean rb = ResultBean.fireFail(); + String userSid = dto.getUserSid(); + String sid = sysOrganizationFeign.getUseOrgByUserSid(userSid).getData().getSid(); + BaseModelConfig entity = new BaseModelConfig(); + dto.fillEntity(entity); + String configName = ""; + //颜色 + if (StringUtils.isNotBlank(dto.getCarColor())) { + configName += dto.getCarColor() + "/"; + } + //缓速器 + if (StringUtils.isNotBlank(dto.getSlowMachine())) { + configName += dto.getSlowMachine() + "/"; + } + //后视镜 + if (StringUtils.isNotBlank(dto.getRearViewMirror())) { + configName += dto.getRearViewMirror() + "/"; + } + //轮胎 + if (StringUtils.isNotBlank(dto.getTireSize())) { + configName += dto.getTireSize() + "/"; + } + //驾驶室规格 + if (StringUtils.isNotBlank(dto.getSpecification())) { + configName += dto.getSpecification() + "/"; + } + //后桥 + if (StringUtils.isNotBlank(dto.getRearAxleValue())) { + configName += dto.getRearAxleValue() + "/"; + } + //后桥速比 + if (StringUtils.isNotBlank(dto.getRearAxleRatio())) { + configName += dto.getRearAxleRatio() + "/"; + } + //空调 + if (StringUtils.isNotBlank(dto.getAirConditioner())) { + configName += dto.getAirConditioner() + "/"; + } + //轮毂材质 + if (StringUtils.isNotBlank(dto.getHubMaterial())) { + configName += dto.getHubMaterial() + "/"; + } + //导流罩 + if (StringUtils.isNotBlank(dto.getBaffleModel())) { + configName += dto.getBaffleModel() + "/"; + } + //悬架 + if (StringUtils.isNotBlank(dto.getSuspension())) { + configName += dto.getSuspension() + "/"; + } + //座椅 + if (StringUtils.isNotBlank(dto.getSeat())) { + configName += dto.getSeat() + "/"; + } + //护轮罩 + if (StringUtils.isNotBlank(dto.getTireCover())) { + configName += dto.getTireCover() + "/"; + } + //鞍座 + if (StringUtils.isNotBlank(dto.getSaddle())) { + configName += dto.getSaddle() + "/"; + } + //轴距 + if (StringUtils.isNotBlank(dto.getWheelbase())) { + configName += dto.getWheelbase() + "/"; + } + //保险杠 + if (StringUtils.isNotBlank(dto.getBumper())) { + configName += dto.getBumper() + "/"; + } + //配置包 + if (StringUtils.isNotBlank(dto.getConfiguringBao())) { + configName += dto.getConfiguringBao() + "/"; + } + //独立热源 + if (StringUtils.isNotBlank(dto.getIndependentSources())) { + configName += dto.getIndependentSources() + "/"; + } + //燃料箱 + if (StringUtils.isNotBlank(dto.getFuelTank())) { + configName += dto.getFuelTank() + "/"; + } + //多媒体 + if (StringUtils.isNotBlank(dto.getMultimedia())) { + configName += dto.getMultimedia() + "/"; + } + //货箱 + if (StringUtils.isNotBlank(dto.getPackingCase())) { + configName += dto.getPackingCase() + "/"; + } + entity.setConfigName(configName); + configName += dto.getOtherConfig(); + List stringList = baseModelConfigService.checkByConfigName(sid); + for (String s : stringList) { + if (s.equals(configName)){ + return rb.setMsg("该常用配置已存在"); + } + } + entity.setCreateOrgSId(sid); + // 配置编码 + int i1 = baseModelConfigService.selectCount(); + String num = String.format("%04d", i1 + 1); // 不足4位补0 + entity.setConfigCode(num); + boolean isSave = baseModelConfigService.save(entity); + if (!isSave) { + return rb.setMsg("保存失败"); + } + return rb.success().setMsg("保存成功"); + } + @Override public ResultBean update(BaseModelConfigDto dto, String sid) { ResultBean rb = ResultBean.fireFail(); diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java index b77ecb9f6a..14b33e19fb 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java @@ -371,10 +371,12 @@ public class ScmApplyInboundService extends MybatisBaseService 0){ scmApplyInboundDto.setVehicleList(scmApplyInboundVehicleDtos1); + scmApplyInboundDto.setNum(String.valueOf(scmApplyInboundVehicleDtos1.size())); + scmApplyInboundDto.setScmFiles(dto.getScmFiles()); saveOrUpdateApplyInBound(scmApplyInboundDto); } int i = Integer.parseInt(num) - scmApplyInboundVehicleDtos1.size(); - baseMapper.updateNumBySid(String.valueOf(i),busSid); + baseMapper.updateNumBySid(String.valueOf(i),businessSid); BusinessVariables bv = new BusinessVariables(); BeanUtil.copyProperties(dto, bv); bv.setOrgSidPath(orgSidPath); @@ -427,6 +429,7 @@ public class ScmApplyInboundService extends MybatisBaseService resultBean1 = flowableFeign.startProcess(bv); UpdateFlowFieldVo uff = resultBean1.getData(); @@ -434,6 +437,7 @@ public class ScmApplyInboundService extends MybatisBaseService