yxt_develop
/
anrui
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

巡检盘库问题修改

master
hp 3 years ago
parent
3d2863a1df
commit
0d046b2eaa
6 changed files with 131 additions and 65 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinventory/ScmVehicleInventoryService.java
  2. 8
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionMapper.java
  3. 8
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionMapper.xml
  4. 22
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionService.java
  5. 125
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspectionsheet/ScmVehiclePatrolinspectionsheetService.java
  6. 32
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehpatrolinspectionmonth/ScmVehPatrolinspectionmonthService.java

1
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinventory/ScmVehicleInventoryService.java
View File

@ -537,7 +537,6 @@ public class ScmVehicleInventoryService extends MybatisBaseService<ScmVehicleInv
if (StringUtils.isNotBlank(dto.getOrgPath())) {
patrolinspectionsheetDto.setOrgPath(dto.getOrgPath());
}
patrolinspectionsheetDto.setNewAdd(newAdd);
scmVehiclePatrolinspectionsheetService.savePatrolinspectionsheet(patrolinspectionsheetDto);
}
return rb.success().setMsg("保存成功");

8
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionMapper.java
View File

@ -111,4 +111,12 @@ public interface ScmVehiclePatrolinspectionMapper extends BaseMapper<ScmVehicleP
@Select("SELECT count(*) FROM scm_vehicle_patrolinspection WHERE createOrgSid = #{useOrgSid} and isDelete = 0 and (patrolInspectionStateKey = '000' or patrolInspectionStateKey = '001')")
int getToDoNum(@Param("useOrgSid") String useOrgSid);
@Update("update scm_vehicle_patrolinspection set isDelete = 1,state=0 where mainSid=#{sid} ")
void delBySid(@Param("sid") String sid);
AppScmVehiclePatrolinspectionDetailedsVo selectByMainSidAndVinNo(@Param("sid") String sid, @Param("vinNo") String vinNo);
@Select("SELECT * FROM scm_vehicle_patrolinspection where mainSid = #{sid} and vinNo = #{vinNo}")
ScmVehiclePatrolinspection getDetailedsByMainSid(@Param("sid") String sid, @Param("vinNo") String vinNo);
}

8
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionMapper.xml
View File

@ -45,7 +45,7 @@
<select id="getMonthByMainSid"
resultType="com.yxt.anrui.scm.api.scmvehpatrolinspectionmonth.VehPatrolinspectionmonthVo">
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.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 = '002' and svp.mainSid = #{mainSid}) AS processedNumber,
(SELECT count(*) FROM scm_vehicle_patrolinspection svp WHERE svp.patrolInspectionStateKey = '000' and svp.isDelete = 0 and svp.mainSid = #{mainSid}) AS notHandledNumber,
@ -111,6 +111,12 @@
FROM scm_vehicle_patrolinspection svp
WHERE vinNo = #{vinNo} AND createOrgSid = #{useOrgSid} ORDER BY id DESC
</select>
<select id="selectByMainSidAndVinNo"
resultType="com.yxt.anrui.scm.api.scmvehiclepatrolinspection.AppScmVehiclePatrolinspectionDetailedsVo">
SELECT *
FROM scm_vehicle_patrolinspection svp
WHERE vinNo = #{vinNo} AND mainSid =#{sid}
</select>
<update id="updateByMainSid">
update scm_vehicle_patrolinspection

22
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionService.java
View File

@ -145,7 +145,7 @@ public class ScmVehiclePatrolinspectionService extends MybatisBaseService<ScmVeh
}
String locationSid = record.getLocationSid();
ScmWarehouse scmWarehouse = scmWarehouseService.fetchBySid(locationSid);
if (scmWarehouse != null){
if (scmWarehouse != null) {
record.setLiableSid(scmWarehouse.getLibTubeSid());
record.setLiableName(scmWarehouse.getLibTubeName());
}
@ -214,7 +214,7 @@ public class ScmVehiclePatrolinspectionService extends MybatisBaseService<ScmVeh
String orgPath = params.getOrgPath();
if (StringUtils.isBlank(orgPath)) {
orgPath = sysStaffOrgFeign.getPathSidByUserSid(pagerQuery.getParams().getUserSid()).getData();
}else{
} else {
orgPath = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
}
params.setUseOrgSid(orgPath);
@ -265,7 +265,7 @@ public class ScmVehiclePatrolinspectionService extends MybatisBaseService<ScmVeh
String orgPath = paramsQuery.getOrgPath();
if (StringUtils.isBlank(orgPath)) {
orgPath = sysStaffOrgFeign.getPathSidByUserSid(pagerQuery.getParams().getUserSid()).getData();
}else{
} else {
orgPath = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
}
paramsQuery.setUseOrgSid(orgPath);
@ -294,7 +294,7 @@ public class ScmVehiclePatrolinspectionService extends MybatisBaseService<ScmVeh
}
if ("000".equals(pagerQuery.getParams().getState())) {
qw.eq("svp.patrolInspectionStateKey", pagerQuery.getParams().getState());
qw.eq("svp.isDelete",0);
qw.eq("svp.isDelete", 0);
}
if ("001".equals(pagerQuery.getParams().getState())) {
qw.eq("svp.patrolInspectionStateKey", pagerQuery.getParams().getState());
@ -361,6 +361,10 @@ public class ScmVehiclePatrolinspectionService extends MybatisBaseService<ScmVeh
baseMapper.deleteByVinNo(vinNo, id);
}
public void delBySid(String sid) {
baseMapper.delBySid(sid);
}
public List<AppScmVehiclePatrolinspectionPageVo> selectByVinNo(String vinNo, String useOrgSid) {
return baseMapper.selectByVinNo(vinNo, useOrgSid);
}
@ -371,10 +375,18 @@ public class ScmVehiclePatrolinspectionService extends MybatisBaseService<ScmVeh
String userSid = appToDoNumQuery.getUserSid();
if (StringUtils.isBlank(orgPath)) {
orgPath = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData();
}else{
} else {
orgPath = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
}
int count = baseMapper.getToDoNum(orgPath);
return rb.success().setData(String.valueOf(count));
}
public AppScmVehiclePatrolinspectionDetailedsVo selectByMainSidAndVinNo(String sid, String vinNo) {
return baseMapper.selectByMainSidAndVinNo(sid, vinNo);
}
public ScmVehiclePatrolinspection getDetailedsByMainSid(String sid,String vinNo) {
return baseMapper.getDetailedsByMainSid(sid,vinNo);
}
}

125
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspectionsheet/ScmVehiclePatrolinspectionsheetService.java
View File

@ -35,10 +35,12 @@ import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
import com.yxt.anrui.portal.api.sysuser.SysUserVo;
import com.yxt.anrui.scm.api.scmfile.ScmFile;
import com.yxt.anrui.scm.api.scmvehiclepatrolinspection.AppScmVehiclePatrolinspectionDetailedsVo;
import com.yxt.anrui.scm.api.scmvehiclepatrolinspection.AppScmVehiclePatrolinspectionPageVo;
import com.yxt.anrui.scm.api.scmvehiclepatrolinspection.ScmVehiclePatrolinspection;
import com.yxt.anrui.scm.api.scmvehiclepatrolinspectionsheet.*;
import com.yxt.anrui.scm.api.scmvehpatrolinspectionmonth.ScmVehPatrolinspectionmonthVo;
import com.yxt.anrui.scm.api.scmvehpatrolinspectionmonth.VehPatrolinspectionmonthVo;
import com.yxt.anrui.scm.api.scmvehpatrolinspectionmonth.VehRecordsQuery;
import com.yxt.anrui.scm.api.scmwarehouse.ScmWarehouse;
import com.yxt.anrui.scm.biz.scmfile.ScmFileService;
@ -423,32 +425,21 @@ public class ScmVehiclePatrolinspectionsheetService extends MybatisBaseService<S
* 应巡检展示的是当前记录表中减去标识为盘盈的记录、未巡检展示的是待巡检
*/
ResultBean rb = ResultBean.fireFail();
String s1 = "";
String type1 = "06"; //巡检相关照片
String oneKey = "001";
String oneValue = "问题未解决";
String orgPath = dto.getOrgPath();
String useOrgSid = "";
if (StringUtils.isBlank(orgPath)) {
useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(dto.getUserSid()).getData();
} else {
useOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
}
String vinNo = dto.getVinNo();
VehRecordsQuery vehRecordsQuery = new VehRecordsQuery();
vehRecordsQuery.setOrgPath(orgPath);
vehRecordsQuery.setUserSid(dto.getUserSid());
ScmVehiclePatrolinspectionsheet scmVehiclePatrolinspectionsheet = new ScmVehiclePatrolinspectionsheet();
SysUserVo sysUserVo = sysUserFeign.fetchBySid(dto.getUserSid()).getData();
ScmVehPatrolinspectionmonthVo scmVehPatrolinspectionmonthVo = null;
//查询是否有月度巡检记录
List<ScmVehPatrolinspectionmonthVo> monthVoList = scmVehPatrolinspectionmonthService.selectListAll();
ScmVehPatrolinspectionmonthVo scmVehPatrolinspectionmonthVo = null;
if (monthVoList.size() > 0) { // 有 根据生成巡检月度报告 判断 是否已生成报告
scmVehPatrolinspectionmonthVo = monthVoList.get(0);
if (scmVehPatrolinspectionmonthVo.getState() == 0) {
// 否 继续走新增
scmVehPatrolinspectionmonthVo = monthVoList.get(0);
// AppScmVehiclePatrolinspectionDetailedsVo patrolinspectionVo = scmVehiclePatrolinspectionService.selectByMainSidAndVinNo(monthVoList.get(0).getSid(), vinNo);
addPatrolinspectionsheet(dto, scmVehPatrolinspectionmonthVo);
} else if (scmVehPatrolinspectionmonthVo.getState() == 1) {
// 是 先生成月度巡检 和 巡检记录
@ -456,48 +447,97 @@ public class ScmVehiclePatrolinspectionsheetService extends MybatisBaseService<S
monthVoList = scmVehPatrolinspectionmonthService.selectListAll();
if (monthVoList.size() > 0) {
scmVehPatrolinspectionmonthVo = monthVoList.get(0);
addPatrolinspectionsheet(dto, scmVehPatrolinspectionmonthVo);
} else {
rb.setMsg("暂无需要巡检车辆");
}
}
} else { // 否 先生成月度巡检 和 巡检记录
scmVehPatrolinspectionmonthService.getInspectionRecords(vehRecordsQuery);
monthVoList = scmVehPatrolinspectionmonthService.selectListAll();
if (monthVoList.size() > 0) {
scmVehPatrolinspectionmonthVo = monthVoList.get(0);
addPatrolinspectionsheet(dto, scmVehPatrolinspectionmonthVo);
} else {
rb.setMsg("暂无需要巡检车辆");
}
}
List<AppScmVehiclePatrolinspectionPageVo> list = scmVehiclePatrolinspectionService.selectByVinNo(dto.getVinNo(), useOrgSid);
if (list.size() > 0) {
String id = list.get(0).getId();
String mainSid = list.get(0).getSid();
scmVehiclePatrolinspectionService.deleteByVinNo(dto.getVinNo(), id);
int count = baseMapper.selectByMainSidNum(mainSid);
if (count > 0) {
baseMapper.deleteByMainSid(mainSid);
}
return rb.success().setMsg("添加成功");
}
public void addPatrolinspectionsheet(ScmVehiclePatrolinspectionsheetDto dto, ScmVehPatrolinspectionmonthVo scmVehPatrolinspectionmonthVo) {
String s1 = "";
String type1 = "06"; //巡检相关照片
String oneKey = "001";
String oneValue = "问题未解决";
String useOrgSid = "";
String orgPath = dto.getOrgPath();
if (StringUtils.isBlank(orgPath)) {
useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(dto.getUserSid()).getData();
} else {
useOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
}
ScmVehiclePatrolinspection scmVehiclePatrolinspection = new ScmVehiclePatrolinspection();
scmVehiclePatrolinspection.setVinNo(dto.getVinNo());
scmVehiclePatrolinspection.setMainSid(scmVehPatrolinspectionmonthVo.getSid());
scmVehiclePatrolinspection.setLocation(dto.getWarehouse());
scmVehiclePatrolinspection.setLocationSid(dto.getWarehouseSid());
scmVehiclePatrolinspection.setPatrolInspectionState(oneValue);
scmVehiclePatrolinspection.setPatrolInspectionStateKey(oneKey);
scmVehiclePatrolinspection.setCreateOrgSid(useOrgSid);
scmVehiclePatrolinspection.setCreateBySid(dto.getUserSid());
scmVehiclePatrolinspection.setUseOrgSid(useOrgSid);
Boolean newAdd = dto.getNewAdd();
if(newAdd){
VehRecordsQuery vehRecordsQuery = new VehRecordsQuery();
vehRecordsQuery.setOrgPath(orgPath);
vehRecordsQuery.setUserSid(dto.getUserSid());
SysUserVo sysUserVo = sysUserFeign.fetchBySid(dto.getUserSid()).getData();
ScmVehiclePatrolinspectionsheet scmVehiclePatrolinspectionsheet = new ScmVehiclePatrolinspectionsheet();
// 待巡检记录列表添加数据
ScmVehiclePatrolinspection scmVehiclePatrolinspection = scmVehiclePatrolinspectionService.getDetailedsByMainSid(scmVehPatrolinspectionmonthVo.getSid(), dto.getVinNo());
if (scmVehiclePatrolinspection == null) {
scmVehiclePatrolinspection = new ScmVehiclePatrolinspection();
scmVehiclePatrolinspection.setVinNo(dto.getVinNo());
scmVehiclePatrolinspection.setMainSid(scmVehPatrolinspectionmonthVo.getSid());
scmVehiclePatrolinspection.setLocation(dto.getWarehouse());
scmVehiclePatrolinspection.setLocationSid(dto.getWarehouseSid());
scmVehiclePatrolinspection.setPatrolInspectionState(oneValue);
scmVehiclePatrolinspection.setPatrolInspectionStateKey(oneKey);
scmVehiclePatrolinspection.setCreateOrgSid(useOrgSid);
scmVehiclePatrolinspection.setCreateBySid(dto.getUserSid());
scmVehiclePatrolinspection.setUseOrgSid(useOrgSid);
scmVehiclePatrolinspection.setPushState(dto.getPushState());
scmVehiclePatrolinspection.setState(0);
scmVehiclePatrolinspectionService.save(scmVehiclePatrolinspection);
} else {
if ("002".equals(scmVehiclePatrolinspection.getPatrolInspectionStateKey())) {
scmVehiclePatrolinspection = new ScmVehiclePatrolinspection();
scmVehiclePatrolinspection.setVinNo(dto.getVinNo());
scmVehiclePatrolinspection.setMainSid(scmVehPatrolinspectionmonthVo.getSid());
scmVehiclePatrolinspection.setLocation(dto.getWarehouse());
scmVehiclePatrolinspection.setLocationSid(dto.getWarehouseSid());
scmVehiclePatrolinspection.setPatrolInspectionState(oneValue);
scmVehiclePatrolinspection.setPatrolInspectionStateKey(oneKey);
scmVehiclePatrolinspection.setCreateOrgSid(useOrgSid);
scmVehiclePatrolinspection.setCreateBySid(dto.getUserSid());
scmVehiclePatrolinspection.setUseOrgSid(useOrgSid);
scmVehiclePatrolinspection.setPushState(dto.getPushState());
scmVehiclePatrolinspection.setState(0);
scmVehiclePatrolinspectionService.save(scmVehiclePatrolinspection);
} else {
scmVehiclePatrolinspection.setVinNo(dto.getVinNo());
scmVehiclePatrolinspection.setMainSid(scmVehPatrolinspectionmonthVo.getSid());
scmVehiclePatrolinspection.setLocation(dto.getWarehouse());
scmVehiclePatrolinspection.setLocationSid(dto.getWarehouseSid());
scmVehiclePatrolinspection.setPatrolInspectionState(oneValue);
scmVehiclePatrolinspection.setPatrolInspectionStateKey(oneKey);
scmVehiclePatrolinspection.setCreateOrgSid(useOrgSid);
scmVehiclePatrolinspection.setCreateBySid(dto.getUserSid());
scmVehiclePatrolinspection.setUseOrgSid(useOrgSid);
scmVehiclePatrolinspection.setPushState(dto.getPushState());
scmVehiclePatrolinspection.setState(1);
int count = baseMapper.selectByMainSidNum(scmVehiclePatrolinspection.getSid());
if (count > 0) {
baseMapper.deleteByMainSid(scmVehiclePatrolinspection.getSid());
}
scmVehiclePatrolinspectionService.updateById(scmVehiclePatrolinspection);
}
}
scmVehiclePatrolinspection.setPushState(dto.getPushState());
scmVehiclePatrolinspectionService.save(scmVehiclePatrolinspection);
// 巡检记录列表添加数据
BeanUtil.copyProperties(dto, scmVehiclePatrolinspectionsheet, "sid");
ScmWarehouse scmWarehouse = scmWarehouseService.fetchBySid(dto.getWarehouseSid());
scmVehiclePatrolinspectionsheet.setDutyName(scmWarehouse.getLibTubeName());
@ -513,6 +553,7 @@ public class ScmVehiclePatrolinspectionsheetService extends MybatisBaseService<S
}
save(scmVehiclePatrolinspectionsheet);
//附件数据添加
scmFileService.deleteByLinkSidAndType(scmVehiclePatrolinspectionsheet.getSid(), type1);
List<String> images = dto.getImages();
if (images != null) {
@ -530,7 +571,7 @@ public class ScmVehiclePatrolinspectionsheetService extends MybatisBaseService<S
}
}
}
// 消息推送
List<String> receiveIdList = new ArrayList<>();
SysUserVo sysUserVos = sysUserFeign.fetchBySid(scmWarehouse.getLibTubeSid()).getData();
Integer id = sysUserVos.getId();
@ -542,7 +583,6 @@ public class ScmVehiclePatrolinspectionsheetService extends MybatisBaseService<S
appLiableListDto.setLiableSid(scmWarehouse.getLibTubeSid());
recipientSidList.add(dto.getLiableSid());
liableList.add(appLiableListDto);
// 消息推送
AppScmMessageFlowableQuery query = new AppScmMessageFlowableQuery();
Map<String, Object> appMap = new HashMap<>();
appMap.put("sid", dto.getMainSid());
@ -557,7 +597,6 @@ public class ScmVehiclePatrolinspectionsheetService extends MybatisBaseService<S
query.setName("供应链");
// 消息推送
messageFeign.sendMessage(query);
return rb.success().setMsg("添加成功");
}
// /**

32
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehpatrolinspectionmonth/ScmVehPatrolinspectionmonthService.java
View File

@ -208,30 +208,32 @@ public class ScmVehPatrolinspectionmonthService extends MybatisBaseService<ScmVe
List<String> mainList = new ArrayList<>();
//所有巡检记录
List<ScmVehiclePatrolinspectionVo> patrolinspectionVos = scmVehiclePatrolinspectionService.selectListAll(orgPath);
List<AppScmInventoryRecordsVo> list = new ArrayList<>();
if (patrolinspectionVos.size() > 0) {
for (ScmVehiclePatrolinspectionVo patrolinspectionVo : patrolinspectionVos) {
// 判断是否生成报告
ScmVehPatrolinspectionmonth scmVehPatrolinspectionmonth = fetchBySid(patrolinspectionVo.getMainSid());
if (patrolinspectionVos.size() > 0) {// 如果存在巡检记录
for (ScmVehiclePatrolinspectionVo patrolinspectionVo : patrolinspectionVos) { // 判断是否生成报告
ScmVehPatrolinspectionmonth scmVehPatrolinspectionmonth = fetchBySid(patrolinspectionVo.getMainSid()); //根据月度巡检管理表sid查询 是否生成报告
if (scmVehPatrolinspectionmonth.getState() == 0) { // 无生成 无法新生成记录
return rb.setMsg("上次巡检记录未生成报告，请先生成再操作！");
}
//问题未解决
if ("001".equals(patrolinspectionVo.getPatrolInspectionStateKey())) {
String vinNo = patrolinspectionVo.getVinNo();
String sid = patrolinspectionVo.getSid();
vinNoList.add(vinNo);
if (vinNoList.contains(vinNo)) {
mainList.add(sid);
if (scmVehPatrolinspectionmonth.getState() == 1) {
//问题未解决
if ("001".equals(patrolinspectionVo.getPatrolInspectionStateKey())) {
String vinNo = patrolinspectionVo.getVinNo();
String sid = patrolinspectionVo.getSid();
vinNoList.add(vinNo);
if (vinNoList.contains(vinNo)) {
mainList.add(sid);
}
}
if ("000".equals(patrolinspectionVo.getPatrolInspectionStateKey())) {
scmVehiclePatrolinspectionService.updateState(patrolinspectionVo.getSid());
}
}
if ("000".equals(patrolinspectionVo.getPatrolInspectionStateKey())) {
scmVehiclePatrolinspectionService.updateState(patrolinspectionVo.getSid());
}
}
appScmInventoryRecordsQuery.setVinNoList(vinNoList);
list = baseVehicleFeign.selectPatrolinspections(appScmInventoryRecordsQuery).getData();
} else {
} else { // 如果不存在
list = baseVehicleFeign.selectInventoryRecords(appScmInventoryRecordsQuery).getData();
}
list.removeAll(Collections.singleton(null));

Write Preview
Loading…
Cancel
Save