From ff5f46c2749de2bd551766499dff9d597b8f5ba9 Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Mon, 24 Oct 2022 14:47:35 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E9=87=91=E8=9D=B6=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E8=B4=A6=E6=88=B7=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../anrui/fin/biz/kingdee/KingDeeConfig.java | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/KingDeeConfig.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/KingDeeConfig.java index 97d328f0ff..4d9406c181 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/KingDeeConfig.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/KingDeeConfig.java @@ -12,44 +12,44 @@ public class KingDeeConfig { /** * 登录金蝶的账户信息 2022010测试 */ - /* public static String acctID = "61dce6601125a0";*/ + public static String acctID = "61dce6601125a0"; /** * 登录金蝶的账户信息 正式系统 正式系统 正式系统 正式系统 正式系统 正式系统 正式系统 正式系统 正式系统 正式系统 */ - public static String acctID = "5e84c526016ed7"; +// public static String acctID = "5e84c526016ed7"; /** * 登录金蝶的账户信息 2022010测试的 */ - //public static String userName = "信息部2"; + public static String userName = "信息部2"; /** * 登录金蝶的账户信息 */ - //public static String password = "123321"; + public static String password = "123321"; /** * 登录金蝶的账户信息 2022010测试 */ - //public static String userName_administrator = "administrator"; + public static String userName_administrator = "administrator"; /** * 登录金蝶的账户信息 2022010测试 */ - //public static String password_administrator = "ANrui123456."; + public static String password_administrator = "ANrui123456."; /** * 登录金蝶的账户信息 正式系统正式系统正式系统正式系统正式系统 正式系统 正式系统 正式系统 正式系统 */ - public static String userName = "信息部"; +// public static String userName = "信息部"; /** * 登录金蝶的账户信息 正式系统正式系统正式系统正式系统正式系统 正式系统 正式系统 正式系统 正式系统 */ - public static String password = "ywzx0750"; +// public static String password = "ywzx0750"; /** * 登录金蝶的账户信息 正式系统 正式系统 正式系统 正式系统 */ - public static String userName_administrator = "Administrator"; +// public static String userName_administrator = "Administrator"; /** * 登录金蝶的账户信息 正式系统 正式系统 正式系统 正式系统 */ - public static String password_administrator = "hebei@anrui202108."; +// public static String password_administrator = "hebei@anrui202108."; /** * 登录金蝶的账户信息 */ From 2306ba614b49a0fc0cd0ec5e1e500b319dbfba82 Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Mon, 24 Oct 2022 15:09:26 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E8=BD=A6=E8=BE=86=E5=87=BA=E5=BA=93?= =?UTF-8?q?=E7=9A=84=E5=87=BA=E5=BA=93=E5=8D=95=E7=9A=84=E8=BF=94=E5=88=A9?= =?UTF-8?q?=E6=83=85=E5=86=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basevehicleout/BaseVehicleOutService.java | 46 +++++++++++++++++-- 1 file changed, 43 insertions(+), 3 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 038dcb53b3..f6342c3eb7 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 @@ -14,7 +14,6 @@ import com.yxt.anrui.fin.api.kingdee.saloutstock.SalOutStock; import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign; import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo; import com.yxt.anrui.scm.api.scmwarehouse.ScmWarehouseFeign; -import com.yxt.anrui.scm.api.scmwarehouse.ScmWarehouseVo; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.core.query.PagerQuery; @@ -189,7 +188,48 @@ public class BaseVehicleOutService extends MybatisBaseService 0) { salOutStock.setFEntity(fEntityList); From c8129da0863b461e5aa60571c7687655db75abbf Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Mon, 24 Oct 2022 15:33:27 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E8=BD=A6=E8=BE=86=E5=87=BA=E5=BA=93?= =?UTF-8?q?=E7=9A=84=E5=87=BA=E5=BA=93=E5=8D=95=E7=9A=84=E9=94=80=E5=94=AE?= =?UTF-8?q?=E9=83=A8=E9=97=A8code?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/biz/basevehicleout/BaseVehicleOutService.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 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 f6342c3eb7..2280c4d957 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 @@ -148,14 +148,14 @@ public class BaseVehicleOutService extends MybatisBaseService resultBean1 = sysOrganizationFeign.selectByPSid(baseVehicle.getCreateOrgSid(), "销售支持部"); - if (resultBean1.getSuccess()) { - SysOrganizationVo vo = resultBean1.getData(); + String orgDeptSid = dto.getOrgSid(); + ResultBean resultBean = sysOrganizationFeign.fetchBySid(orgDeptSid); + if (resultBean.getSuccess()) { + SysOrganizationVo vo = resultBean.getData(); if (vo != null) { salOutStock.setFSaleDeptID(vo.getOrgCode()); } - }*/ + } //项目类别key和项目类别type salOutStock.setF_PAEZ_AssistantType("payType"); salOutStock.setF_PAEZ_AssistantKey(dto.getTypeKey()); From 1935a26ed1f65d91b4497ad3f9640b5afc74fea1 Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Mon, 24 Oct 2022 15:39:06 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E5=85=AC=E5=8F=B8=E9=97=B4=E8=B0=83?= =?UTF-8?q?=E8=BD=A6=E6=94=B6=E8=BD=A6=E6=97=B6=E5=BA=93=E5=AD=98=E5=9C=B0?= =?UTF-8?q?=E7=82=B9=E6=9F=A5=E8=AF=A2=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ScmVehicleEnterlibraryService.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) 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 4546f89d37..b5a5ca9242 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 @@ -60,7 +60,6 @@ import com.yxt.anrui.scm.api.scmfile.ScmFile; import com.yxt.anrui.scm.api.scmvehicleenterlibrary.*; import com.yxt.anrui.scm.api.scmvehicleexamine.AppToDoNumQuery; import com.yxt.anrui.scm.api.scmwarehouse.ScmWarehouse; -import com.yxt.anrui.scm.api.scmwarehouse.ScmWarehouseVo; import com.yxt.anrui.scm.biz.scmfile.ScmFileService; import com.yxt.anrui.scm.biz.scmwarehouse.ScmWarehouseService; import com.yxt.common.base.config.component.FileUploadComponent; @@ -501,8 +500,10 @@ public class ScmVehicleEnterlibraryService extends MybatisBaseService Date: Mon, 24 Oct 2022 15:54:15 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E5=85=AC=E5=8F=B8=E9=97=B4=E8=B0=83?= =?UTF-8?q?=E8=BD=A6=E6=94=B6=E8=BD=A6=E6=97=B6=E5=9B=9E=E6=AC=BE=E9=80=9A?= =?UTF-8?q?=E8=B7=AF=E7=9A=84=E5=BC=82=E5=B8=B8=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ScmVehicleEnterlibraryService.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) 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 b5a5ca9242..e30ad9378c 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 @@ -540,10 +540,12 @@ public class ScmVehicleEnterlibraryService extends MybatisBaseService list = new ArrayList<>(); list.add(baseVehicleDto); From bdbfddc73204adacb0a57b69a4d6f19dea70ac19 Mon Sep 17 00:00:00 2001 From: hp <2969694837@qq.com> Date: Mon, 24 Oct 2022 16:55:14 +0800 Subject: [PATCH 6/6] =?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 --- .../ScmVehicleExamineMapper.java | 3 ++ .../ScmVehicleExamineService.java | 21 ++++++---- ...cmVehiclePatrolinspectionsheetService.java | 39 ++++++++----------- .../ScmVehInventoryreportService.java | 13 +++---- .../ScmVehPatrolinspectionreportService.java | 14 +++---- 5 files changed, 45 insertions(+), 45 deletions(-) diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineMapper.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineMapper.java index 48a183f401..0556d47d7a 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineMapper.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineMapper.java @@ -105,4 +105,7 @@ public interface ScmVehicleExamineMapper extends BaseMapper { @Select("SELECT count(*) FROM scm_vehicle_examine WHERE useOrgSid = #{useOrgSid} and inspectionResult = '1' ") int getToDoNum(@Param("useOrgSid") String useOrgSid); + + @Select("SELECT count(*) FROM scm_vehicle_examine WHERE vinNo = #{vinNo} and useOrgSid = #{orgPath} and inspectionResult = '2' ") + int getCountByVinNo(@Param("vinNo") String vinNo, @Param("orgPath") String orgPath); } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineService.java index e02be0058b..d6c226fd58 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineService.java @@ -233,7 +233,7 @@ public class ScmVehicleExamineService extends MybatisBaseService sysOrganizationVoResultBean = sysOrganizationFeign.fetchBySid(orgPath); - if(sysOrganizationVoResultBean.getSuccess()){ + if (sysOrganizationVoResultBean.getSuccess()) { SysOrganizationVo sysOrganizationVo = sysOrganizationVoResultBean.getData(); orgName = sysOrganizationVo.getName(); } + String vinNo = dto.getVin(); + int countByVinNo = baseMapper.getCountByVinNo(vinNo, orgPath); + if (countByVinNo > 0) { + return rb.setMsg("该车架号已存在，请勿重复验车！"); + } String staffSid = sysUserFeign.getUserOrgInfoByUserSid(dto.getUserSid()).getData().getStaffSid(); SysStaffinfoVo data = sysUserFeign.getSysUserByMobile(staffSid).getData(); String s1 = ""; @@ -645,9 +650,9 @@ public class ScmVehicleExamineService extends MybatisBaseService0){ + if (deposit > 0) { finPaymentrecordDto.setCost(price - deposit / num);//付款金额 - }else{ + } else { finPaymentrecordDto.setCost(price);//付款金额 } finPaymentrecordDto.setBusSid(scmVehicleExamine.getBusinessSid());//外采申请sid @@ -709,9 +714,9 @@ public class ScmVehicleExamineService extends MybatisBaseService @@ -317,7 +315,6 @@ public class ScmVehiclePatrolinspectionsheetService extends MybatisBaseService receiveIdList = new ArrayList<>(); List liableList = new ArrayList<>(); AppLiableListDto appLiableListDto = new AppLiableListDto(); List recipientSidList = new ArrayList<>(); @@ -325,18 +322,16 @@ public class ScmVehiclePatrolinspectionsheetService extends MybatisBaseService appMap = new HashMap<>(); + appMap.put("sid", dto.getMainSid()); + query.setRecipientSidList(recipientSidList); + query.setAppMap(appMap); query.setMsgTitle("月度巡检问题"); query.setMsgContent(sysUserVo.getName() + "提交的月度巡检问题,请查阅"); query.setMsgSource("供应链"); - query.setMsgTargetUri(MsgTargetUriEnum.GYLPKBG.getUri()); + query.setMsgTargetUri(MsgTargetUriEnum.GYLXJWT.getUri()); query.setApp_type("2"); query.setModuleSid("98ff0724-5df4-4fc7-ab6d-3996e7706acd"); query.setName("供应链"); @@ -364,7 +359,6 @@ public class ScmVehiclePatrolinspectionsheetService extends MybatisBaseService receiveIdList = new ArrayList<>(); List liableList = new ArrayList<>(); List recipientSidList = new ArrayList<>(); AppLiableListDto appLiableListDto = new AppLiableListDto(); @@ -372,18 +366,16 @@ public class ScmVehiclePatrolinspectionsheetService extends MybatisBaseService appMap = new HashMap<>(); + appMap.put("sid", dto.getMainSid()); + query.setRecipientSidList(recipientSidList); + query.setAppMap(appMap); query.setMsgTitle("月度巡检问题"); query.setMsgContent(sysUserVo.getName() + "提交的月度巡检问题,请查阅"); query.setMsgSource("供应链"); - query.setMsgTargetUri(MsgTargetUriEnum.GYLPKBG.getUri()); + query.setMsgTargetUri(MsgTargetUriEnum.GYLXJWT.getUri()); query.setApp_type("2"); query.setModuleSid("98ff0724-5df4-4fc7-ab6d-3996e7706acd"); query.setName("供应链"); @@ -512,13 +504,14 @@ public class ScmVehiclePatrolinspectionsheetService extends MybatisBaseService appMap = new HashMap<>(); + appMap.put("sid", dto.getMainSid()); + query.setRecipientSidList(recipientSidList); + query.setAppMap(appMap); query.setMsgTitle("月度巡检问题"); query.setMsgContent(sysUserVo.getName() + "提交的月度巡检问题,请查阅"); query.setMsgSource("供应链"); - query.setMsgTargetUri(MsgTargetUriEnum.GYLPKBG.getUri()); + query.setMsgTargetUri(MsgTargetUriEnum.GYLXJWT.getUri()); query.setApp_type("2"); query.setModuleSid("98ff0724-5df4-4fc7-ab6d-3996e7706acd"); query.setName("供应链"); diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinventoryreport/ScmVehInventoryreportService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinventoryreport/ScmVehInventoryreportService.java index 69fa29b3ac..e45c55aad7 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinventoryreport/ScmVehInventoryreportService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinventoryreport/ScmVehInventoryreportService.java @@ -49,7 +49,9 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; +import java.util.Map; /** * Project: aaa(aaa)
@@ -153,19 +155,16 @@ public class ScmVehInventoryreportService extends MybatisBaseService receiveIdList = new ArrayList<>(); List recipientSidList = new ArrayList<>(); for (RecipientListDto recipientListDto : recipientList) { - SysUserVo sysUserVos = sysUserFeign.fetchBySid(recipientListDto.getSid()).getData(); - Integer id = sysUserVos.getId(); recipientSidList.add(recipientListDto.getSid()); - receiveIdList.add(String.valueOf(id)); } AppScmMessageFlowableQuery query = new AppScmMessageFlowableQuery(); - query.setMainSid(dto.getMainSid()); - query.setList(recipientSidList); - query.setReceiveIdList(receiveIdList); + Map appMap = new HashMap<>(); + appMap.put("sid", dto.getMainSid()); + query.setRecipientSidList(recipientSidList); + query.setAppMap(appMap); query.setMsgTitle("供应链"); query.setMsgContent(sysUserVo.getName() + "提交的月度盘库报告,请查阅"); query.setMsgSource("供应链"); diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehpatrolinspectionreport/ScmVehPatrolinspectionreportService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehpatrolinspectionreport/ScmVehPatrolinspectionreportService.java index 54fc95ed4b..75c35687af 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehpatrolinspectionreport/ScmVehPatrolinspectionreportService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehpatrolinspectionreport/ScmVehPatrolinspectionreportService.java @@ -67,7 +67,9 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; +import java.util.Map; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.Future; @@ -188,22 +190,20 @@ public class ScmVehPatrolinspectionreportService extends MybatisBaseService receiveIdList = new ArrayList<>(); List recipientSidList = new ArrayList<>(); List list = dto.getList(); for (AppLiableListDto appLiableListDto : list) { - SysUserVo data = sysUserFeign.fetchBySid(appLiableListDto.getLiableSid()).getData(); - receiveIdList.add(String.valueOf(data.getId())); recipientSidList.add(appLiableListDto.getLiableSid()); } AppScmMessageFlowableQuery query = new AppScmMessageFlowableQuery(); - query.setMainSid(dto.getMainSid()); - query.setList(recipientSidList); - query.setReceiveIdList(receiveIdList); + Map appMap = new HashMap<>(); + appMap.put("sid", dto.getMainSid()); + query.setRecipientSidList(recipientSidList); + query.setAppMap(appMap); query.setMsgTitle("月度巡检问题"); query.setMsgContent(sysUserVo.getName() + "提交的月度巡检问题,请查阅"); query.setMsgSource("供应链"); - query.setMsgTargetUri(MsgTargetUriEnum.GYLPKBG.getUri()); + query.setMsgTargetUri(MsgTargetUriEnum.GYLXJWT.getUri()); query.setApp_type("2"); query.setModuleSid("98ff0724-5df4-4fc7-ab6d-3996e7706acd"); query.setName("供应链");