From 6a58fe2d489b535cdbbbafec5bc067b25c4c17b6 Mon Sep 17 00:00:00 2001 From: yxt_djz Date: Mon, 24 Oct 2022 21:40:55 +0800 Subject: [PATCH 01/10] =?UTF-8?q?=E9=87=91=E8=9D=B6=E5=87=BA=E5=BA=93?= =?UTF-8?q?=E5=8D=95=E5=8E=BB=E6=8E=89=E7=89=A9=E6=96=99=E6=89=B9=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fin/biz/kingdee/saloutstock/SalOutStockService.java | 6 +++--- .../yxt/anrui/fin/biz/kingdee/saloutstock/data_FEntity.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) 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 d4a87cbd64..2a4a80f3d3 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 @@ -49,9 +49,9 @@ public class SalOutStockService extends FinKingDeeService { JSONArray materialStocks = (JSONArray)result2.get("MaterialStock"); JSONObject materialStock = (JSONObject)materialStocks.get(0); boolean IsBatchManage = (boolean) materialStock.get("IsBatchManage"); - if(!IsBatchManage){ - f.setFlot(""); - } + //if(!IsBatchManage){//是否启用批号 + f.setFlot("");//没有启用批号 + //} } //业务表的主表数据集合 diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/saloutstock/data_FEntity.json b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/saloutstock/data_FEntity.json index 470b20265f..12ecab950b 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/saloutstock/data_FEntity.json +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/saloutstock/data_FEntity.json @@ -13,7 +13,7 @@ "FIsFree": false, "FOwnerTypeID": "BD_OwnerOrg", "Flot": { - "FNumber": "@KD_FMaterialID" + "FNumber": "" }, "FOwnerID": { "FNumber": "@KD_FSaleOrgId" From e305a1820b7b9417179adc5aa5dc32cd223a1615 Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Tue, 25 Oct 2022 09:20:24 +0800 Subject: [PATCH 02/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basevehicleout/BaseVehicleOutMapper.java | 2 + .../basevehicleout/BaseVehicleOutMapper.xml | 4 ++ .../basevehicleout/BaseVehicleOutService.java | 41 +++++++++++-------- 3 files changed, 29 insertions(+), 18 deletions(-) diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutMapper.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutMapper.java index 7ac5ab7c4d..c1c0e3d52a 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutMapper.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutMapper.java @@ -28,4 +28,6 @@ public interface BaseVehicleOutMapper extends BaseMapper { IPage selectPageVo(IPage page, @Param(Constants.WRAPPER)QueryWrapper qw); BaseVehicleOutDetailsVo details(String sid); + + int selectCountBySidVin(String vinSid); } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutMapper.xml index 584fee0a37..0b236cfdad 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutMapper.xml @@ -80,4 +80,8 @@ from base_vehicle_out where sid = #{sid} + + \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java index 2280c4d957..1f1eb0aefc 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java @@ -61,6 +61,11 @@ public class BaseVehicleOutService extends MybatisBaseService 0) { return rb.setMsg(dto.getVinNo() + "车辆不满足出库条件"); } + //查询是否已出库 + int counts = baseMapper.selectCountBySidVin(dto.getVinSid()); + if (counts > 0) { + return rb.setMsg("该车辆已出库，不允许重复出库"); + } BaseVehicleOut baseVehicleOut = new BaseVehicleOut(); BeanUtil.copyProperties(dto, baseVehicleOut, "sid"); if (StringUtils.isNotBlank(dto.getPrice())) { @@ -186,42 +191,42 @@ public class BaseVehicleOutService extends MybatisBaseService pagging = baseMapper.selectPageVo(page, qw); PagerVo p = PagerUtil.pageToVo(pagging, null); From 4ce04c6fe86cbb90f83dd57cd11fb0d057a4570f Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Tue, 25 Oct 2022 09:23:09 +0800 Subject: [PATCH 03/10] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ScmVehPatrolinspectionmonthService.java | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehpatrolinspectionmonth/ScmVehPatrolinspectionmonthService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehpatrolinspectionmonth/ScmVehPatrolinspectionmonthService.java index 7b16153419..33e443b312 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehpatrolinspectionmonth/ScmVehPatrolinspectionmonthService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehpatrolinspectionmonth/ScmVehPatrolinspectionmonthService.java @@ -264,10 +264,15 @@ public class ScmVehPatrolinspectionmonthService extends MybatisBaseService baseVehicleResultBean = baseVehicleFeign.selectByVinNoAndOrgSid(inspection.getVin(), orgPath); + if (baseVehicleResultBean.getSuccess()){ + BaseVehicle vehicle = baseVehicleResultBean.getData(); + if (vehicle != null){ + scmVehiclePatrolinspection.setVehicleSid(vehicle.getSid()); + scmVehiclePatrolinspection.setLocation(vehicle.getLocationName()); + scmVehiclePatrolinspection.setLocationSid(vehicle.getLocation()); + } + } scmVehiclePatrolinspection.setPatrolInspectionState("问题未解决"); scmVehiclePatrolinspection.setPatrolInspectionStateKey("001"); scmVehiclePatrolinspection.setCreateOrgSid(orgPath); From 4b5b1fa337320b68fb2e1c238155da177b265105 Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Tue, 25 Oct 2022 10:27:48 +0800 Subject: [PATCH 04/10] =?UTF-8?q?=E5=87=BA=E5=BA=93=E5=8D=95=E6=8E=A8?= =?UTF-8?q?=E9=80=81=E8=B0=83=E6=95=B4=E5=A4=87=E6=B3=A8=E6=A0=BC=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basevehicleout/BaseVehicleOutService.java | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java index 1f1eb0aefc..fc3291bf21 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java @@ -191,25 +191,29 @@ public class BaseVehicleOutService extends MybatisBaseService Date: Tue, 25 Oct 2022 10:33:27 +0800 Subject: [PATCH 05/10] =?UTF-8?q?=E5=87=BA=E5=BA=93=E5=8D=95=20=E8=B0=83?= =?UTF-8?q?=E6=8B=A8=E5=8D=95=20=E6=8F=90=E4=BA=A4=E5=88=B0=E5=BE=85?= =?UTF-8?q?=E5=AE=A1=E6=A0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../saloutstock/SalOutStockService.java | 23 ++++++++++++++++--- .../biz/kingdee/saloutstock/data_FEntity.json | 2 +- .../StkTransferDirectService.java | 10 ++++---- 3 files changed, 26 insertions(+), 9 deletions(-) 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 2a4a80f3d3..6a7008a67c 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,7 @@ 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.KingDeeCode; import com.yxt.anrui.fin.api.kingdee.saloutstock.SalOutStock; import com.yxt.anrui.fin.api.kingdee.stkinstock.StkInStock; import com.yxt.anrui.fin.biz.kingdee.FinKingDeeService; @@ -49,9 +50,11 @@ public class SalOutStockService extends FinKingDeeService { JSONArray materialStocks = (JSONArray)result2.get("MaterialStock"); JSONObject materialStock = (JSONObject)materialStocks.get(0); boolean IsBatchManage = (boolean) materialStock.get("IsBatchManage"); - //if(!IsBatchManage){//是否启用批号 + if(!IsBatchManage){//是否启用批号 f.setFlot("");//没有启用批号 - //} + }else{ + f.setFlot(f.getFMaterialID());//没有启用批号 + } } //业务表的主表数据集合 @@ -78,7 +81,21 @@ public class SalOutStockService extends FinKingDeeService { List fEntity = salOutStock.getFEntity(); List> vehicleListMap = createVehicleLists(fEntity); String kingDeeData = SalOutStockCastToKingDeeBillFields.getKingDeeData(map_fEntityModel_,vehicleListMap); - return accessKingDeeInterface(KingDeeBillId.SAL_OUTSTOCK.getID(),kingDeeData, KingDeeBillUrl.DRAFT_URL.getURL()); + // ResultBean stringResultBean = accessKingDeeInterface(KingDeeBillId.BD_MATERIAL.getID(),kingDeeData, KingDeeBillUrl.SAVE_URL.getURL()); + ResultBean stringResultBean = accessKingDeeInterface(KingDeeBillId.SAL_OUTSTOCK.getID(), kingDeeData, KingDeeBillUrl.SAVE_URL.getURL()); + String data = stringResultBean.getData(); + JSONObject jsonObject = JSONObject.parseObject(data.toString()); + JSONObject result = (JSONObject)jsonObject.get("Result"); + JSONObject result2 = (JSONObject)result.get("Result"); + log.info("StkTransferDirect:{}",data); + log.info("result:{}",result); + log.info("result2:{}",result2); + int id = (int)result.get("Id"); + ResultBean submit = submit(id+"",KingDeeBillId.SAL_OUTSTOCK.getID()); + if (!submit.getSuccess()) return rb.setCode(KingDeeCode.SUBMIT.getCode()).setData(submit.getData()); + /*ResultBean audit = audit(data,KingDeeBillId.SAL_OUTSTOCK.getID()); + if (!audit.getSuccess()) return rb.setCode(KingDeeCode.AUDIT.getCode()).setData(audit.getData());*/ + return stringResultBean; } catch (Exception e) { e.printStackTrace(); } diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/saloutstock/data_FEntity.json b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/saloutstock/data_FEntity.json index 12ecab950b..e719784bf5 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/saloutstock/data_FEntity.json +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/saloutstock/data_FEntity.json @@ -13,7 +13,7 @@ "FIsFree": false, "FOwnerTypeID": "BD_OwnerOrg", "Flot": { - "FNumber": "" + "FNumber": "@KD_Flot" }, "FOwnerID": { "FNumber": "@KD_FSaleOrgId" 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 d6eb9a0645..ebfee761fc 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 @@ -46,17 +46,17 @@ public class StkTransferDirectService extends FinKingDeeService { List> vehicleListMap = createVehicleLists(fBillEntry); String kingDeeData = StkTransferDirectCastToKingDeeBillFields.getKingDeeData(map_fEntityModel_,vehicleListMap); /*{"Result":{"ResponseStatus":{"IsSuccess":true,"Errors":[],"SuccessEntitys":[{"Id":102499,"Number":"","DIndex":0}],"SuccessMessages":[],"MsgCode":0},"Id":102499,"Number":"","NeedReturnData":[{}]}}*/ - ResultBean stringResultBean = accessKingDeeInterface(KingDeeBillId.STK_TRANSFERDIRECT.getID(), kingDeeData, KingDeeBillUrl.DRAFT_URL.getURL()); + ResultBean stringResultBean = accessKingDeeInterface(KingDeeBillId.STK_TRANSFERDIRECT.getID(), kingDeeData, KingDeeBillUrl.SAVE_URL.getURL()); String data = stringResultBean.getData(); - JSONObject jsonObject = JSONObject.parseObject(data.toString()); + JSONObject jsonObject = JSONObject.parseObject(data); JSONObject result = (JSONObject)jsonObject.get("Result"); JSONObject result2 = (JSONObject)result.get("Result"); log.info("StkTransferDirect:{}",data); log.info("result2:{}",result2); - String id = (String)result.get("id"); - ResultBean submit = submit(data,KingDeeBillId.STK_TRANSFERDIRECT.getID()); + int id = (int)result.get("Id"); + ResultBean submit = submit(id+"",KingDeeBillId.STK_TRANSFERDIRECT.getID()); if (!submit.getSuccess()) return rb.setCode(KingDeeCode.SUBMIT.getCode()).setData(submit.getData()); - ResultBean audit = audit(data,KingDeeBillId.STK_TRANSFERDIRECT.getID()); + ResultBean audit = audit(id+"",KingDeeBillId.STK_TRANSFERDIRECT.getID()); if (!audit.getSuccess()) return rb.setCode(KingDeeCode.AUDIT.getCode()).setData(audit.getData()); return stringResultBean; } catch (Exception e) { From e0bf498a10e7f403ec0cd4250371aecc94018dce Mon Sep 17 00:00:00 2001 From: yxt_djz Date: Tue, 25 Oct 2022 13:57:55 +0800 Subject: [PATCH 06/10] =?UTF-8?q?=E5=87=BA=E5=BA=93=E5=8D=95=20=E5=8E=BB?= =?UTF-8?q?=E6=8E=89=E4=BB=93=E5=BA=93=20=E5=BA=93=E5=AD=98=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E7=9A=84=E4=BC=A0=E9=80=92=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yxt/anrui/fin/biz/kingdee/saloutstock/data_FEntity.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/saloutstock/data_FEntity.json b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/saloutstock/data_FEntity.json index e719784bf5..9389777850 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/saloutstock/data_FEntity.json +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/saloutstock/data_FEntity.json @@ -19,10 +19,10 @@ "FNumber": "@KD_FSaleOrgId" }, "FStockID": { - "FNumber": "@KD_FStockID" + "FNumber": "" }, "FStockStatusID": { - "FNumber": "KCZT01_SYS" + "FNumber": "" }, "FSalUnitID": { "FNumber": "liang" From 6309bceceb2db766d1923210c64d7ff251508281 Mon Sep 17 00:00:00 2001 From: yxt_djz Date: Tue, 25 Oct 2022 13:58:24 +0800 Subject: [PATCH 07/10] =?UTF-8?q?=E5=87=BA=E5=BA=93=E5=8D=95=20=E5=8E=BB?= =?UTF-8?q?=E6=8E=89=E4=BB=93=E5=BA=93=20=E5=BA=93=E5=AD=98=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E7=9A=84=E4=BC=A0=E9=80=92=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/kingdee/saloutstock/SalOutStock.java | 40 +++++++++---------- .../StkTransferDirectService.java | 2 +- 2 files changed, 21 insertions(+), 21 deletions(-) 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 c1c4eac9f8..108387d02d 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 @@ -91,36 +91,16 @@ public class SalOutStock { @JsonProperty("FMaterialID") @NotBlank public String FMaterialID; - /** - * 库存单位:FUnitID (必填项) - */ /*@JsonProperty("FUnitID") - @NotBlank - public String FUnitID;*/ - /** - * 实发数量:FRealQty - */ /*@JsonProperty("FRealQty") - @NotBlank - public double FRealQty;*/ /** * 批号:FLot */ @JsonProperty("Flot") @NotBlank public String Flot; - /** - * 货主:FOwnerID (必填项) - */ /*@JsonProperty("FOwnerID") - @NotBlank - public String FOwnerID;*/ /** * 仓库:FStockID */ @JsonProperty("FStockID") @NotBlank public String FStockID; - /** - * 库存状态:FStockStatusID - *//* @JsonProperty("FStockStatusID") - @NotBlank - public String FStockStatusID;*/ /** * 销售单位:FSalUnitID */ @JsonProperty("FSalUnitID") @@ -145,6 +125,26 @@ public class SalOutStock { @JsonProperty("FEntrynote") @NotBlank public String FEntrynote=""; + /** + * 库存单位:FUnitID (必填项) + */ /*@JsonProperty("FUnitID") + @NotBlank + public String FUnitID;*/ + /** + * 实发数量:FRealQty + */ /*@JsonProperty("FRealQty") + @NotBlank + public double FRealQty;*/ + /** + * 货主:FOwnerID (必填项) + */ /*@JsonProperty("FOwnerID") + @NotBlank + public String FOwnerID;*/ + /** + * 库存状态:FStockStatusID + *//* @JsonProperty("FStockStatusID") + @NotBlank + public String FStockStatusID;*/ } public final static SalOutStock salOutStock = new SalOutStock(); 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 ebfee761fc..056076e0ae 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 @@ -34,7 +34,7 @@ public class StkTransferDirectService extends FinKingDeeService { Map map_fEntityModel_= object2Map(stkTransferDirect); List fBillEntry = stkTransferDirect.getFBillEntry(); for (StkTransferDirect.FBillEntry f: fBillEntry){ - f.setFDestStockId("ARZSCK");//调入仓库 默认为：分公司正式仓库 每隔分公司都有这个编码的仓库。 + f.setFDestStockId("ARZSCK");//调入仓库 默认为：分公司正式仓库 每个分公司都有这个编码的仓库。 //单据查看的json模板 JSONObject result2 = getMaterial(f); if(result2==null){ From 6cd3004bec33d64a19f582572e71f6fd160c8254 Mon Sep 17 00:00:00 2001 From: hp <2969694837@qq.com> Date: Tue, 25 Oct 2022 14:54:53 +0800 Subject: [PATCH 08/10] =?UTF-8?q?=E9=AA=8C=E8=BD=A6=E3=80=81=E7=9B=98?= =?UTF-8?q?=E5=BA=93=E3=80=81=E5=B7=A1=E6=A3=80=E9=97=AE=E9=A2=98=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/basevehicle/BaseVehicleFeign.java | 8 +- .../basevehicle/BaseVehicleFeignFallback.java | 4 +- .../base/biz/basevehicle/BaseVehicleRest.java | 8 +- .../biz/basevehicle/BaseVehicleService.java | 15 +-- .../AppScmVehicleStayInventoryDto.java | 3 + .../ScmVehicleInventoryMapper.xml | 1 + .../ScmVehicleInventoryService.java | 97 +++++++++++++------ ...cmVehiclePatrolinspectionsheetService.java | 30 +++--- .../ScmVehInventorymonthMapper.java | 3 + .../ScmVehInventorymonthService.java | 31 +++--- .../ScmVehPatrolinspectionmonthService.java | 11 ++- .../inventory/StayInventoryDto.java | 3 + .../scmvehicleexamine/AppSubmitDto.java | 2 + 13 files changed, 144 insertions(+), 72 deletions(-) diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java index efe258ccb9..6f2cc065d1 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java @@ -416,12 +416,12 @@ public interface BaseVehicleFeign { public ResultBean> getPcVinByWarehouseSid(@RequestBody PagerQuery pagerQuery); @ApiOperation("盘库根据用户sid 获取库存车辆信息") - @GetMapping("/selectInventoryRecords/{userSid}") - public ResultBean> selectInventoryRecords(@PathVariable("userSid") String userSid); + @PostMapping("/selectInventoryRecords") + public ResultBean> selectInventoryRecords(@RequestBody AppScmInventoryRecordsQuery appScmInventoryRecordsQuery); @ApiOperation("巡检根据用户sid 获取库存车辆信息") - @GetMapping("/selectPatrolinspections") - public ResultBean> selectPatrolinspections(@RequestParam(value = "userSid") String userSid, @RequestParam(value = "vinNoList") List vinNoList); + @PostMapping("/selectPatrolinspections") + public ResultBean> selectPatrolinspections(@RequestBody AppScmInventoryRecordsQuery appScmInventoryRecordsQuery); @ApiOperation("根据车架号和分公司sid查询车辆信息") @PostMapping("/selectByVinNoAndOrgSid") diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java index 40c4e291c9..18f1303970 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java @@ -317,12 +317,12 @@ public class BaseVehicleFeignFallback implements BaseVehicleFeign { } @Override - public ResultBean> selectInventoryRecords(String userSid) { + public ResultBean> selectInventoryRecords(AppScmInventoryRecordsQuery appScmInventoryRecordsQuery) { return null; } @Override - public ResultBean> selectPatrolinspections(String userSid, List vinNoList) { + public ResultBean> selectPatrolinspections(AppScmInventoryRecordsQuery appScmInventoryRecordsQuery) { return null; } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java index ed00a3fb2b..1bc84c5faf 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java @@ -1124,13 +1124,13 @@ public class BaseVehicleRest implements BaseVehicleFeign { } @Override - public ResultBean> selectInventoryRecords(String userSid) { - return baseVehicleService.selectInventoryRecords(userSid); + public ResultBean> selectInventoryRecords(AppScmInventoryRecordsQuery appScmInventoryRecordsQuery) { + return baseVehicleService.selectInventoryRecords(appScmInventoryRecordsQuery); } @Override - public ResultBean> selectPatrolinspections(String userSid, List vinNoList) { - return baseVehicleService.selectPatrolinspections(userSid, vinNoList); + public ResultBean> selectPatrolinspections(AppScmInventoryRecordsQuery appScmInventoryRecordsQuery) { + return baseVehicleService.selectPatrolinspections(appScmInventoryRecordsQuery); } @Override diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java index f229cf76fd..a01756a1e4 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java @@ -2035,26 +2035,29 @@ public class BaseVehicleService extends MybatisBaseService> selectInventoryRecords(String userSid) { + public ResultBean> selectInventoryRecords(AppScmInventoryRecordsQuery appScmInventoryRecordsQuery) { ResultBean rb = ResultBean.fireFail(); - String userOrgSid = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData(); +// String userOrgSid = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData(); + String orgPath = appScmInventoryRecordsQuery.getOrgPath(); //条件：本分公司、非删除、库存或采购退库中或调入或调出中 QueryWrapper qw = new QueryWrapper<>(); qw.and(wrapper -> wrapper.eq("bv.vehicleState", VehicleState.StockEnum.STOCK.getCode()).or().eq("bv.vehicleState", VehicleState.StockEnum.RETURNING_STOCK.getCode()).or().eq("bv.vehicleState", VehicleState.StockEnum.DCZ_STOCK.getCode()).or().eq("bv.vehicleState", VehicleState.StockEnum.DR_STOCK.getCode())); - List list = baseMapper.selectInventoryRecords(userOrgSid, qw); + List list = baseMapper.selectInventoryRecords(orgPath, qw); return rb.success().setData(list); } - public ResultBean> selectPatrolinspections(String userSid, List vinNoList) { + public ResultBean> selectPatrolinspections(AppScmInventoryRecordsQuery appScmInventoryRecordsQuery) { ResultBean rb = ResultBean.fireFail(); - String userOrgSid = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData(); +// String userOrgSid = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData(); //条件：本分公司、非删除、库存或采购退库中或调入或调出中 + String orgPath = appScmInventoryRecordsQuery.getOrgPath(); + List vinNoList = appScmInventoryRecordsQuery.getVinNoList(); QueryWrapper qw = new QueryWrapper<>(); qw.and(wrapper -> wrapper.eq("bv.vehicleState", VehicleState.StockEnum.STOCK.getCode()).or().eq("bv.vehicleState", VehicleState.StockEnum.RETURNING_STOCK.getCode()).or().eq("bv.vehicleState", VehicleState.StockEnum.DCZ_STOCK.getCode()).or().eq("bv.vehicleState", VehicleState.StockEnum.DR_STOCK.getCode())); if (vinNoList.size() > 0) { qw.notIn("bv.vinNo", vinNoList); } - List list = baseMapper.selectInventoryRecords(userOrgSid, qw); + List list = baseMapper.selectInventoryRecords(orgPath, qw); return rb.success().setData(list); } diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleinventory/AppScmVehicleStayInventoryDto.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleinventory/AppScmVehicleStayInventoryDto.java index 33f5d922e2..78904aab40 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleinventory/AppScmVehicleStayInventoryDto.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleinventory/AppScmVehicleStayInventoryDto.java @@ -54,6 +54,9 @@ public class AppScmVehicleStayInventoryDto implements Dto { @ApiModelProperty(value = "盘库sid") private String sid; + @ApiModelProperty("新增状态值") + private Boolean newAdd; + @ApiModelProperty("车架号") private String vinNo; // 车架号 diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinventory/ScmVehicleInventoryMapper.xml b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinventory/ScmVehicleInventoryMapper.xml index a1e03cf5be..c0b6cbf4f1 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinventory/ScmVehicleInventoryMapper.xml +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinventory/ScmVehicleInventoryMapper.xml @@ -146,6 +146,7 @@ WHERE svi.mainSid = #{sid} and svi.InventoryStateKey = #{inventoryStateKey} + + + \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerRest.java index 4532691ece..a672be6f27 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerRest.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerRest.java @@ -124,6 +124,11 @@ public class BaseManufacturerRest implements BaseManufacturerFeign { return baseManufacturerService.details(sid); } + @Override + public ResultBean>> selectSupplier(String manPurOrderTypeKey, String carBrandSid,String orgSid) { + return baseManufacturerService.selectSupplier(manPurOrderTypeKey,carBrandSid,orgSid); + } + @Override public ResultBean>> wcgysNamesDown(String orgSid) { return baseManufacturerService.wcgysNamesDown(orgSid); diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerService.java index 17fad9503a..1543e2f0ed 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerService.java @@ -642,7 +642,28 @@ public class BaseManufacturerService extends MybatisBaseService> selectByZjcAndUseOrgIsNull() { return baseMapper.selectByZjcAndUseOrgIsNull(); } + + public ResultBean>> selectSupplier(String manPurOrderTypeKey, String carBrandSid, String orgSid) { + ResultBean rb = ResultBean.fireFail(); + List> maps = new ArrayList<>(); + if (manPurOrderTypeKey.equals("001") || manPurOrderTypeKey.equals("004")) { + Map map = new HashMap<>(); + String manufacturerSid = baseVehicleBrandService.fetchBySid(carBrandSid).getManufacturerSid(); + BaseManufacturer baseManufacturer = fetchBySid(manufacturerSid); + map.put("sid", manufacturerSid); + map.put("manufacturerName", baseManufacturer.getManufacturerName()); + maps.add(map); + } else if (manPurOrderTypeKey.equals("002")) { + maps = baseMapper.selectOrgSidAndSupplierType(orgSid, "0004"); + } else if (manPurOrderTypeKey.equals("005")) { + maps = baseMapper.selectOrgSidAndSupplierType(orgSid, "0002"); + } else if (manPurOrderTypeKey.equals("003")) { + maps = baseMapper.selectOrgSidAndSupplierType(orgSid, "0005"); + } + return rb.success().setData(maps); + } } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationService.java index 8d33e5a0f6..649049f9cb 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationService.java @@ -45,6 +45,7 @@ import com.yxt.anrui.base.api.flow.FlowTaskVo; import com.yxt.anrui.base.biz.basemanufacturer.BaseManufacturerService; import com.yxt.anrui.base.biz.baseoutsourcingapplicationvehicle.BaseOutsourcingApplicationVehicleService; import com.yxt.anrui.base.biz.basevehicle.BaseVehicleService; +import com.yxt.anrui.base.biz.basevehiclebrand.BaseVehicleBrandService; import com.yxt.anrui.base.biz.commonappendix.CommonAppendixService; import com.yxt.anrui.base.common.enums.BillTypeEnum; import com.yxt.anrui.base.common.enums.ManPurOrderType; @@ -143,6 +144,8 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService createQueryWrapper(BaseOutsourcingApplicationQuery query) { // todo: 这里根据具体业务调整查询条件 @@ -200,10 +203,10 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService stringResultBean = messageFeign.pushMessage(messageFlowableQuery); //极光推送 @@ -459,13 +475,13 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService stringResultBean = messageFeign.pushMessage(messageFlowableQuery); // String msgSid = getMessage(uff, appMap, baseOutsourcingApplication); @@ -483,14 +499,14 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService stringResultBean = messageFeign.pushMessage(messageFlowableQuery); // String msgSid = getMessage(uff, appMap, baseOutsourcingApplication); @@ -528,12 +544,12 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService appMap = new HashMap<>(); - appMap.put("sid",bv.getBusinessSid()); - bv.getFormVariables().put("app",appMap); + Map appMap = new HashMap<>(); + appMap.put("sid", bv.getBusinessSid()); + bv.getFormVariables().put("app", appMap); //================添加app相关参数 - BaseOutsourcingApplicationDto dto= baseMapper.getBySid(bv.getBusinessSid()); - ResultBean rb = complete_handleProsess(bv,dto); + BaseOutsourcingApplicationDto dto = baseMapper.getBySid(bv.getBusinessSid()); + ResultBean rb = complete_handleProsess(bv, dto); String taskDefKey = rb.getData().getTaskDefKey(); Map stringObjectMap = BeanUtil.beanToMap(rb.getData()); updateFlowFiled(stringObjectMap); @@ -562,19 +578,19 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService stringResultBean = messageFeign.pushMessage(messageFlowableQuery); //======================添加消息推送结束 @@ -586,11 +602,11 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService complete_handleProsess(BusinessVariables bv, BaseOutsourcingApplicationDto dto) { - ResultBean rb = flowableFeign.handleProsess(bv); - Map stringObjectMap = BeanUtil.beanToMap(rb.getData()); - updateFlowFiled(stringObjectMap); - //消息推送===========开始 + public ResultBean complete_handleProsess(BusinessVariables bv, BaseOutsourcingApplicationDto dto) { + ResultBean rb = flowableFeign.handleProsess(bv); + Map stringObjectMap = BeanUtil.beanToMap(rb.getData()); + updateFlowFiled(stringObjectMap); + //消息推送===========开始 /* UpdateFlowFieldVo uff = rb.getData(); if (!"Event_end".equals(uff.getTaskDefKey())) { BaseOutsourcingApplication baseOutsourcingApplication = fetchBySid(bv.getBusinessSid()); @@ -607,8 +623,8 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService stringResultBean = messageFeign.pushMessage(messageFlowableQuery); }*/ - //消息推送结束===== - return rb; + //消息推送结束===== + return rb; } /** @@ -747,9 +763,9 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService appMap = new HashMap<>(); - appMap.put("sid",flowTaskVo.getBusinessSid()); - flowTaskVo.getValues().put("app",appMap); + Map appMap = new HashMap<>(); + appMap.put("sid", flowTaskVo.getBusinessSid()); + flowTaskVo.getValues().put("app", appMap); //=========添加app相关参数 BaseOutsourcingApplicationDto boad = baseMapper.getBySid(flowTaskVo.getBusinessSid()); ResultBean resultBean = flowableFeign.taskReject(fl); @@ -764,20 +780,20 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService> listResultBean = flowTaskFeign.getLatestTasks(procId); + ResultBean> listResultBean = flowTaskFeign.getLatestTasks(procId); String nextNodeUserSids = listResultBean.getData().get(0).getASSIGNEE_(); List receiveSidList = Arrays.asList(nextNodeUserSids.split(",")); - if(receiveSidList.size() == 1 && receiveSidList.get(0).equals(baseOutsourcingApplication.getCreateBySid())){ - messageFlowableQuery.setMsgContent("您提交的"+messageFlowableQuery.getModuleName()+"已被驳回,请重新提交"); - }else{ - messageFlowableQuery.setMsgContent(baseOutsourcingApplication.getCreateByName()+"提交的"+messageFlowableQuery.getModuleName()+",请审批"); + if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(baseOutsourcingApplication.getCreateBySid())) { + messageFlowableQuery.setMsgContent("您提交的" + messageFlowableQuery.getModuleName() + "已被驳回,请重新提交"); + } else { + messageFlowableQuery.setMsgContent(baseOutsourcingApplication.getCreateByName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批"); } messageFlowableQuery.setMsgTitle("外采申请"); @@ -875,7 +891,7 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService commonAppendixVos = commonAppendixService.selByLinkSid(sid); List stringList = new ArrayList<>(); if (commonAppendixVos != null && commonAppendixVos.size() > 0) { - stringList.add(fileUploadComponent.getUrlPrefix()+commonAppendixVos.get(0).getFilePath()); + stringList.add(fileUploadComponent.getUrlPrefix() + commonAppendixVos.get(0).getFilePath()); } ResultBean resultBean = appSubsetVersionFeign.selectLast(); AppSubVersionVo appSubVersionVo = resultBean.getData(); diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.java index 7cca54772d..48dd814be4 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.java @@ -445,8 +445,8 @@ public interface BaseVehicleMapper extends BaseMapper { IPage vehicleRebatePageList(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); - @Update("update base_vehicle set vehicleState = #{vehicleState},vehicleStateValue = #{vehicleStateValue},salePrice = #{salePrice} where vinNo = #{vinNo}") - void updateCallOutVehicleState(@Param("vehicleState") String vehicleState, @Param("vehicleStateValue") String vehicleStateValue,@Param("salePrice") Integer salePrice, @Param("vinNo") String vinNo); + @Update("update base_vehicle set vehicleState = #{vehicleState},vehicleStateValue = #{vehicleStateValue},salePrice = #{salePrice},salesDate = NOW() where vinNo = #{vinNo}") + void updateCallOutVehicleState(@Param("vehicleState") String vehicleState, @Param("vehicleStateValue") String vehicleStateValue, @Param("salePrice") Integer salePrice, @Param("vinNo") String vinNo); @Update("update base_vehicle set vinNo = #{vinNo} where sid = #{vehicleSid}") void updateVinNoByVehSid(@Param("vinNo") String vinNo, @Param("vehicleSid") String vehicleSid); @@ -457,13 +457,19 @@ public interface BaseVehicleMapper extends BaseMapper { List getVehBySpecialRebateSid(String specialRebateSid); - List> getPCInspectionVinList(@Param(Constants.WRAPPER) QueryWrapper qw); + List> getPCInspectionVinList(@Param(Constants.WRAPPER) QueryWrapper qw); IPage saleOrderVin(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw, @Param("names") String names); @Update("update base_vehicle set remarks = #{remarks} where sid = #{sid}") - void updateVehRemarks(@Param("remarks") String remarks,@Param("sid") String sid); + void updateVehRemarks(@Param("remarks") String remarks, @Param("sid") String sid); - IPage selectPayVehicleList(IPage page,@Param(Constants.WRAPPER) QueryWrapper qw); + IPage selectPayVehicleList(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + + @Update("update base_vehicle set salePrice = #{witPinMoney} where vinNo = #{vinNo} and useOrgSid = #{callOutOrgSid}") + void updateSalePrice(@Param("witPinMoney") String witPinMoney,@Param("vinNo") String vinNo,@Param("callOutOrgSid") String callOutOrgSid); + + @Update("update base_vehicle set contractPrice = #{witPinMoney},costPrice = #{witPinMoney} where vinNo = #{vinNo} and useOrgSid = #{callInOrgSid}") + void updateConAndCostPrice(@Param("witPinMoney") String witPinMoney,@Param("vinNo") String vinNo,@Param("callInOrgSid") String callInOrgSid); } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java index f229cf76fd..7be852d982 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java @@ -3110,4 +3110,11 @@ public class BaseVehicleService extends MybatisBaseService 0) { @@ -287,6 +288,14 @@ public class BaseVehicleOutService extends MybatisBaseService pagging = baseMapper.selectPageVo(page, qw); diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigMapper.xml index 41ec2c6345..9c397fdbf5 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigMapper.xml @@ -312,7 +312,8 @@ bvc.manufactorSettlementPrice, bvc.insideCode, bvm.brandName, - bvm.carBrand brandSid + bvm.carBrand brandSid, + bvm.vehicleType as vehicleTypeKey FROM base_vehmodel_config bvc LEFT JOIN base_vehicle_model bvm diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigService.java index c0f449686d..48a4d66822 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigService.java @@ -646,6 +646,12 @@ public class BaseVehmodelConfigService extends MybatisBaseService wrapper.like("bvm.vehicleTypeCode", query.getCode()).or().like("bmc.configCode", query.getCode())); + } qw.eq("bvm.isDelete", 0); qw.eq("bmc.isDelete", 0); IPage page = PagerUtil.queryToPage(pq); diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempFeign.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempFeign.java index 93b80f3b8b..5a69a1c9c6 100644 --- a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempFeign.java +++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempFeign.java @@ -45,6 +45,16 @@ public interface CrmCustomerTempFeign { @PostMapping("/listPage") public ResultBean> listPage(@RequestBody PagerQuery pq); + /** + * 潜在客户管理区分组织层级查询 + * + * @param pq + * @return + */ + @ApiOperation("潜在客户管理区分组织层级查询") + @PostMapping("/listPageByOrgPathSid") + public ResultBean> listPageByOrgPathSid(@RequestBody PagerQuery pq); + @ApiOperation("根据条件查询所有数据列表") @PostMapping("/listAll") public ResultBean> listAll(@RequestBody CrmCustomerTempQuery query); diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempFeignFallback.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempFeignFallback.java index 082e12e22f..2fa8ac5f1d 100644 --- a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempFeignFallback.java +++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempFeignFallback.java @@ -31,7 +31,12 @@ public class CrmCustomerTempFeignFallback implements CrmCustomerTempFeign { return rb.setMsg("接口anrui-crm/crmcustomertemp/listPage无法访问"); } - @Override + @Override + public ResultBean> listPageByOrgPathSid(PagerQuery pq) { + return null; + } + + @Override public ResultBean> listAll(CrmCustomerTempQuery query){ ResultBean rb = ResultBean.fireFail(); return rb.setMsg("接口anrui-crm/crmcustomertemp/listAll无法访问"); diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempQuery.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempQuery.java index 752a331007..7e6c26bd27 100644 --- a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempQuery.java +++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempQuery.java @@ -24,6 +24,9 @@ import lombok.Data; @Data public class CrmCustomerTempQuery implements Query { + @ApiModelProperty(value = "组织全路径") + private String orgSidPath; + @ApiModelProperty("客户类型key（自然人/法人）") private String customerTypeKey; diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempMapper.xml b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempMapper.xml index 195e6c2259..164573a16e 100644 --- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempMapper.xml +++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempMapper.xml @@ -4,7 +4,7 @@