UDI
/
udi-wms-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: 0517优化

Browse Source
dev_kcyj
chenhc 1 year ago
parent 0b257f3087
commit fc6daa33f2
17 changed files with 151 additions and 4 deletions
Show Stats Download Patch File Download Diff File

4
src/main/java/com/glxp/api/constant/ConstantStatus.java
Unescape Escape View File

@ -308,6 +308,10 @@ public class ConstantStatus {
public static final String BUS_ORDER_CGJH = "CGJH";
public static final String BUS_ORDER_CGDD = "CGDD";
public static final String BUS_ORDER_DECPSG = "DECPSG";
public static final String BUS_ORDER_DECGJH = "DECGJH";
public static final String BUS_ORDER_DECGDD = "DECGDD";
// 1:领用单据类型；2.产品申购类型；3.采购计划单据类型 4.盘点单据类型,5:采购订单
public static final int BUS_TYPE_LY = 1;

54
src/main/java/com/glxp/api/controller/purchase/IoPurChangeService.java
Unescape Escape View File

@ -17,6 +17,7 @@ import com.glxp.api.entity.inout.PurReceiveEntity;
import com.glxp.api.entity.purchase.*;
import com.glxp.api.service.basic.IBasicBusTypeChangeService;
import com.glxp.api.service.basic.IBasicBussinessTypeService;
import com.glxp.api.service.basic.SysApprovalFlowService;
import com.glxp.api.service.inout.IoOrderDetailBizService;
import com.glxp.api.service.inout.IoOrderService;
import com.glxp.api.service.inout.impl.ReceiveDetailService;
@ -26,6 +27,7 @@ import com.glxp.api.service.purchase.impl.PurApplyDetailService;
import com.glxp.api.service.purchase.impl.PurApplyService;
import com.glxp.api.service.purchase.impl.PurOrderDetailService;
import com.glxp.api.service.purchase.impl.PurPlanDetailService;
import com.glxp.api.service.system.SystemParamConfigService;
import com.glxp.api.util.*;
import org.springframework.stereotype.Service;
@ -64,6 +66,11 @@ public class IoPurChangeService {
@Resource
IoOrderService ioOrderService;
@Resource
SysApprovalFlowService sysApprovalFlowService;
@Resource
SystemParamConfigService systemParamConfigService;
@Resource
IoOrderDetailBizService ioOrderDetailBizService;
@Resource
@ -89,11 +96,28 @@ public class IoPurChangeService {
PurPlanEntity purPlanEntity = new PurPlanEntity();
List<PurPlanDetailEntity> purPlanDetailEntityList = new ArrayList<>();
if (purApplyEntity.getStatus() == 3) {
Integer pageType = purApplyEntity.getPageType();
if (pageType==2){
basicBusTypeChangeEntity = basicBusTypeChangeService.selectByOriginAction(ConstantStatus.BUS_ORDER_DECPSG);
}else {
basicBusTypeChangeEntity = basicBusTypeChangeService.selectByOriginAction(ConstantStatus.BUS_ORDER_CPSG);
}
if (basicBusTypeChangeEntity != null && StrUtil.isNotEmpty(basicBusTypeChangeEntity.getTargetBusAction()) && basicBusTypeChangeEntity.isEnable() == true) {
purPlanEntity.setBillNo(gennerOrderUtils.createStOrderNo(new OrderNoTypeBean(Constant.JH_ORDER, "yyyyMMdd")));
purPlanEntity.setBillDate(purApplyEntity.getBillDate());
purPlanEntity.setStatus(basicBusTypeChangeEntity.getBusAuditStatus());
Integer busAuditStatus = basicBusTypeChangeEntity.getBusAuditStatus();
boolean sys_approval_flow = "1".equals(systemParamConfigService.selectValueByParamKey("sys_approval_flow"));
if (busAuditStatus == 2 && sys_approval_flow){//提交审核
String approvalFlowId = sysApprovalFlowService.getApprovalFlowId();
purPlanEntity.setApprovalFlowId(approvalFlowId);
sysApprovalFlowService.generateFlow(approvalFlowId,purPlanEntity.getBillNo(),"cgjh");
}
if (busAuditStatus == 3 && sys_approval_flow){//提交审核
String approvalFlowId = sysApprovalFlowService.getApprovalFlowId();
purPlanEntity.setApprovalFlowId(approvalFlowId);
sysApprovalFlowService.generateFlowTG(approvalFlowId,purPlanEntity.getBillNo(),"cgjh");
}
purPlanEntity.setRemark(purApplyEntity.getRemark());
purPlanEntity.setEmergency(purApplyEntity.getEmergency());
purPlanEntity.setArrivalTime(purApplyEntity.getArrivalTime());
@ -106,6 +130,7 @@ public class IoPurChangeService {
purPlanEntity.setApplyInv(purApplyEntity.getInvCode());
purPlanEntity.setApplyBillNo(purApplyEntity.getBillNo());
purPlanEntity.setApplyRemark(purApplyEntity.getRemark());
purPlanEntity.setPageType(purApplyEntity.getPageType());
if (basicBusTypeChangeEntity.getBusBeforeTime() != null) {
purPlanEntity.setCreateTime(MsDateUtil.timeProcess(purApplyEntity.getCreateTime(), basicBusTypeChangeEntity.getBusBeforeTime()));
purPlanEntity.setUpdateTime(MsDateUtil.timeProcess(purApplyEntity.getCreateTime(), basicBusTypeChangeEntity.getBusBeforeTime()));
@ -170,7 +195,12 @@ public class IoPurChangeService {
//根据供应商分组
Map<String, List<PurPlanDetailEntity>> purPlanDetailMap = purPlanDetailEntityList1.stream().collect(Collectors.groupingBy(PurPlanDetailEntity::getSupId));
purPlanDetailMap.put("not", purPlanDetailEntityList2);
Integer pageType = purPlanEntity.getPageType();
if (pageType==2){
basicBusTypeChangeEntity = basicBusTypeChangeService.selectByOriginAction(ConstantStatus.BUS_ORDER_DECGJH);
}else {
basicBusTypeChangeEntity = basicBusTypeChangeService.selectByOriginAction(ConstantStatus.BUS_ORDER_CGJH);
}
if (basicBusTypeChangeEntity != null && StrUtil.isNotEmpty(basicBusTypeChangeEntity.getTargetBusAction()) && basicBusTypeChangeEntity.isEnable() == true) {
for (String key : purPlanDetailMap.keySet()) {
PurOrderEntity purOrderEntity = new PurOrderEntity();
@ -184,6 +214,18 @@ public class IoPurChangeService {
purOrderEntity.setSupId(key);
}
purOrderEntity.setStatus(basicBusTypeChangeEntity.getBusAuditStatus());
Integer busAuditStatus = basicBusTypeChangeEntity.getBusAuditStatus();
boolean sys_approval_flow = "1".equals(systemParamConfigService.selectValueByParamKey("sys_approval_flow"));
if (busAuditStatus == 2 && sys_approval_flow){//提交审核
String approvalFlowId = sysApprovalFlowService.getApprovalFlowId();
purOrderEntity.setApprovalFlowId(approvalFlowId);
sysApprovalFlowService.generateFlow(approvalFlowId,purOrderEntity.getBillNo(),"cgdd");
}
if (busAuditStatus == 3 && sys_approval_flow){//提交审核
String approvalFlowId = sysApprovalFlowService.getApprovalFlowId();
purOrderEntity.setApprovalFlowId(approvalFlowId);
sysApprovalFlowService.generateFlowTG(approvalFlowId,purOrderEntity.getBillNo(),"cgdd");
}
purOrderEntity.setRemark(purPlanEntity.getRemark());
purOrderEntity.setEmergency(purPlanEntity.getEmergency());
purOrderEntity.setArrivalTime(purPlanEntity.getArrivalTime());
@ -197,6 +239,7 @@ public class IoPurChangeService {
purOrderEntity.setUpdateUser(purPlanEntity.getAuditUser());
purOrderEntity.setBillType(ConstantStatus.BUS_ORDER_CGDD);
purOrderEntity.setPurPlanId(purPlanEntity.getBillNo());
purOrderEntity.setPageType(purPlanEntity.getPageType());
if (basicBusTypeChangeEntity.getBusBeforeTime() != null) {
purOrderEntity.setCreateTime(MsDateUtil.timeProcess(new Date(), basicBusTypeChangeEntity.getBusBeforeTime()));
purOrderEntity.setUpdateTime(new Date());
@ -552,4 +595,15 @@ public class IoPurChangeService {
}
}
public PurReceiveEntity getPurReceiveEntityByApprovalFlowId(String approvalFlowId) {
return receiveService.getPurReceiveEntityByApprovalFlowId(approvalFlowId);
}
public PurApplyEntity getPurApplyEntityByApprovalFlowId(String approvalFlowId) {
return purApplyService.getPurApplyEntityByApprovalFlowId(approvalFlowId);
}
public PurPlanEntity getPurPlanEntityByApprovalFlowId(String approvalFlowId) {
return purPlanService.getPurPlanEntityByApprovalFlowId(approvalFlowId);
}
}

6
src/main/java/com/glxp/api/entity/dev/DeviceRepairApplyDetailEntity.java
Unescape Escape View File

@ -220,4 +220,10 @@ public class DeviceRepairApplyDetailEntity {
*/
@TableField(value = "livePath")
private String livePath;
/**
* 诊断图片
*/
@TableField(value = "diagnosisLivePath")
private String diagnosisLivePath;
}

5
src/main/java/com/glxp/api/entity/dev/DeviceRepairEntity.java
Unescape Escape View File

@ -271,6 +271,11 @@ public class DeviceRepairEntity {
@TableField(value = "livePath")
private String livePath;
/**
* 诊断图片
*/
@TableField(value = "diagnosisLivePath")
private String diagnosisLivePath;
/**
* 维修后现场图片

2
src/main/java/com/glxp/api/req/dev/DeviceRepairApplyAddParam.java
Unescape Escape View File

@ -96,7 +96,7 @@ public class DeviceRepairApplyAddParam {
public List<DeviceRepairApplyDetailEntity> getDetailEntityList(Long applyId, DeviceInfoService deviceInfoService, AuthAdmin user) {
List<DeviceStatusEnum> enums = new ArrayList<>();
enums.add( DeviceStatusEnum.NORMAL);
List<DeviceInfoVo> list = deviceInfoService.listVoByCodes(details.stream().map(ApplyDetail::getDeviceCode).collect(Collectors.toList()), user.getLocDeptCode(), enums);
List<DeviceInfoVo> list = deviceInfoService.listVoByCodes(details.stream().map(ApplyDetail::getDeviceCode).collect(Collectors.toList()), null, enums);
if (list.size() != details.size()) {
throw new JsonException("设备状态异常或信息不符，请确认");
}

2
src/main/java/com/glxp/api/req/dev/DeviceRepairApplyDetailDiagnosisParam.java
Unescape Escape View File

@ -22,6 +22,8 @@ public class DeviceRepairApplyDetailDiagnosisParam {
@NotBlank(message = "诊断信息不能为空")
String diagnosisInfo;
String diagnosisLivePath;
Boolean innerFlag;
String repairUserName;

2
src/main/java/com/glxp/api/res/purchase/PurApplyResponse.java
Unescape Escape View File

@ -95,6 +95,6 @@ public class PurApplyResponse {
private String flowAuditByName;
private String approvalFlowId;
private Integer pageType;
}

2
src/main/java/com/glxp/api/res/purchase/PurOrderResponse.java
Unescape Escape View File

@ -91,4 +91,6 @@ public class PurOrderResponse {
private String flowAuditByName;
private String approvalFlowId;
private Integer pageType;
}

2
src/main/java/com/glxp/api/res/purchase/PurPlanResponse.java
Unescape Escape View File

@ -96,4 +96,6 @@ public class PurPlanResponse {
*/
@TableField(value = "importStatus")
private Integer importStatus;
private Integer pageType;
}

2
src/main/java/com/glxp/api/service/basic/SysApprovalFlowService.java
Unescape Escape View File

@ -20,4 +20,6 @@ public interface SysApprovalFlowService extends IService<SysApprovalFlow> {
SysApprovalFlow getApprovalFlowByMxId(String approvalFlowMxId);
boolean nodePermissions(String id);
void generateFlowTG(String approvalFlowId, String billNo, String cgjh);
}

45
src/main/java/com/glxp/api/service/basic/impl/SysApprovalFlowServiceImpl.java
Unescape Escape View File

@ -5,12 +5,16 @@ import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.glxp.api.controller.purchase.IoPurChangeService;
import com.glxp.api.dao.basic.SysApprovalFlowMapper;
import com.glxp.api.dao.basic.SysApprovalFlowMxMapper;
import com.glxp.api.entity.auth.AuthAdmin;
import com.glxp.api.entity.basic.SysApprovalFlow;
import com.glxp.api.entity.basic.SysApprovalFlowConfigMx;
import com.glxp.api.entity.basic.SysApprovalFlowMx;
import com.glxp.api.entity.inout.PurReceiveEntity;
import com.glxp.api.entity.purchase.PurApplyEntity;
import com.glxp.api.entity.purchase.PurPlanEntity;
import com.glxp.api.enums.ApprovalFlowEnum;
import com.glxp.api.enums.ApprovalStatusEnum;
import com.glxp.api.exception.JsonException;
@ -38,6 +42,8 @@ public class SysApprovalFlowServiceImpl extends ServiceImpl<SysApprovalFlowMappe
private SysApprovalFlowConfigService sysApprovalFlowConfigService;
@Resource
CustomerService customerService;
@Resource
IoPurChangeService purChangeService;
@Override
@ -189,6 +195,27 @@ public class SysApprovalFlowServiceImpl extends ServiceImpl<SysApprovalFlowMappe
return true;
}
@Override
public void generateFlowTG(String approvalFlowId, String title, String type) {
SysApprovalFlow sysApprovalFlow = new SysApprovalFlow();
sysApprovalFlow.setId(approvalFlowId);
sysApprovalFlow.setTitle(title);
sysApprovalFlow.setType(type);
sysApprovalFlow.setStatus(ApprovalFlowEnum.TG.getCode());
Long userId = customerService.getUserId();
String userName = customerService.getUserBean().getEmployeeName();
Date date = new Date();
sysApprovalFlow.setUserId(userId + "");
sysApprovalFlow.setUserName(userName);
sysApprovalFlow.setCreateUser(userId + "");
sysApprovalFlow.setCreateTime(date);
sysApprovalFlow.setUpdateUser(userId + "");
sysApprovalFlow.setUpdateTime(date);
sysApprovalFlowMapper.insert(sysApprovalFlow);
}
private void updateDocumentStatus(String approvalFlowId,Date date,String approvalUserId,String userName) {
//子状态有一个驳回 为 驳回；全部审核通过 为通过 ；其他为 审核中
QueryWrapper<SysApprovalFlowMx> qw = new QueryWrapper<>();
@ -225,6 +252,24 @@ public class SysApprovalFlowServiceImpl extends ServiceImpl<SysApprovalFlowMappe
sysApprovalFlow.setUpdateUser(approvalUserId);
sysApprovalFlow.setUpdateUserName(userName);
sysApprovalFlowMapper.updateById(sysApprovalFlow);
if (newStatus == ApprovalFlowEnum.TG.getCode()) {
if (sysApprovalFlow.getType().equals("ly")){//领用单扭转
PurReceiveEntity purReceiveEntity = purChangeService.getPurReceiveEntityByApprovalFlowId(approvalFlowId);
purReceiveEntity.setStatus(3);
purChangeService.purReceiveChange(purReceiveEntity);
}
if (sysApprovalFlow.getType().equals("sg")){//申购单扭转
PurApplyEntity purApplyEntity = purChangeService.getPurApplyEntityByApprovalFlowId(approvalFlowId);
purApplyEntity.setStatus(3);
purChangeService.purApplyChange(purApplyEntity);
}
if (sysApprovalFlow.getType().equals("cgjh")){//采购计划单扭转
PurPlanEntity purPlanEntity = purChangeService.getPurPlanEntityByApprovalFlowId(approvalFlowId);
purPlanEntity.setStatus(3);
purChangeService.purPlanChange(purPlanEntity);
}
}
}
}

2
src/main/java/com/glxp/api/service/dev/impl/DeviceRepairApplyDetailServiceImpl.java
Unescape Escape View File

@ -99,6 +99,7 @@ public class DeviceRepairApplyDetailServiceImpl extends ServiceImpl<DeviceRepair
.setCreateDeptCode(user.getLocDeptCode()).setCreateDeptName(user.getDeptName())
.setCreateTime(now).setDiagnosisInfo(param.getDiagnosisInfo()).setInnerFlag(param.getInnerFlag())
.setRepairUserName(param.getRepairUserName()).setRepairUserPhone(param.getRepairUserPhone()).setRepairDeptCode(param.getRepairDeptCode())
.setDiagnosisLivePath(param.getDiagnosisLivePath())
;
deviceRepairService.createRepair(repairEntity);
}
@ -111,6 +112,7 @@ public class DeviceRepairApplyDetailServiceImpl extends ServiceImpl<DeviceRepair
.set(DeviceRepairApplyDetailEntity::getConfirmUserName, user.getEmployeeName())
.set(DeviceRepairApplyDetailEntity::getConfirmDeptCode, user.getLocDeptCode())
.set(DeviceRepairApplyDetailEntity::getConfirmDeptName, user.getDeptName())
.set(DeviceRepairApplyDetailEntity::getDiagnosisLivePath, param.getDiagnosisLivePath())
.set(DeviceRepairApplyDetailEntity::getConfirmTime, now)
.set(!param.getRepairFlag(), DeviceRepairApplyDetailEntity::getFinishTime, now)
.eq(DeviceRepairApplyDetailEntity::getApplyId, param.getApplyId())

3
src/main/java/com/glxp/api/service/inout/impl/ReceiveService.java
Unescape Escape View File

@ -72,4 +72,7 @@ public class ReceiveService extends ServiceImpl<ReceiveDao, PurReceiveEntity> {
}
public PurReceiveEntity getPurReceiveEntityByApprovalFlowId(String approvalFlowId) {
return receiveDao.selectOne(new QueryWrapper<PurReceiveEntity>().eq("approvalFlowId", approvalFlowId).last("limit 1"));
}
}

1
src/main/java/com/glxp/api/service/purchase/PurPlanService.java
Unescape Escape View File

@ -24,4 +24,5 @@ public interface PurPlanService {
PurPlanEntity selectByBillNo(String billNo);
PurPlanEntity getPurPlanEntityByApprovalFlowId(String approvalFlowId);
}

4
src/main/java/com/glxp/api/service/purchase/impl/PurApplyService.java
Unescape Escape View File

@ -59,4 +59,8 @@ public class PurApplyService extends ServiceImpl<PurApplyDao, PurApplyEntity> {
public Boolean deleteById(long id) {
return purApplyDao.deleteById(id);
}
public PurApplyEntity getPurApplyEntityByApprovalFlowId(String approvalFlowId) {
return purApplyDao.selectOne(new QueryWrapper<PurApplyEntity>().eq("approvalFlowId", approvalFlowId).last("limit 1"));
}
}

5
src/main/java/com/glxp/api/service/purchase/impl/PurPlanServiceImpl.java
Unescape Escape View File

@ -63,4 +63,9 @@ public class PurPlanServiceImpl implements PurPlanService {
public PurPlanEntity selectByBillNo(String billNo) {
return purPlanDao.selectOne(new QueryWrapper<PurPlanEntity>().eq("billNo", billNo).last("limit 1"));
}
@Override
public PurPlanEntity getPurPlanEntityByApprovalFlowId(String approvalFlowId) {
return purPlanDao.selectOne(new QueryWrapper<PurPlanEntity>().eq("approvalFlowId", approvalFlowId).last("limit 1"));
}
}

10
src/main/resources/schemas/schema_v2.4.sql
Unescape Escape View File

@ -3379,3 +3379,13 @@ CALL Pro_Temp_ColumnWork('device_repair', 'livePath',
CALL Pro_Temp_ColumnWork('device_repair', 'serviceLivePath',
'varchar(1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT''维修后现场照片''',
1);
CALL Pro_Temp_ColumnWork('device_repair', 'diagnosisLivePath',
'varchar(1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT''诊断照片''',
1);
CALL Pro_Temp_ColumnWork('device_repair_apply_detail', 'diagnosisLivePath',
'varchar(1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT''诊断照片''',
1);
INSERT IGNORE INTO basic_bustype_change(`id`, `originAction`, `originName`, `targetAction`, `type`, `enable`, `createUser`, `updateUser`, `createTime`, `updateTime`, `remark`, `auditStatus`, `busAuditStatus`, `targetBusAction`, `beforeTime`, `busBeforeTime`) VALUES (1724370174626394116, 'DECPSG', '设备产品申购', NULL, 2, 1, NULL, '1', NULL, '2023-11-14 18:14:44', NULL, 2, 3, 'DECGJH', NULL, NULL);
INSERT IGNORE INTO basic_bustype_change(`id`, `originAction`, `originName`, `targetAction`, `type`, `enable`, `createUser`, `updateUser`, `createTime`, `updateTime`, `remark`, `auditStatus`, `busAuditStatus`, `targetBusAction`, `beforeTime`, `busBeforeTime`) VALUES (1724370174626394117, 'DECGJH', '设备采购计划', NULL, 3, 1, NULL, '1', NULL, '2023-11-14 18:14:34', NULL, 2, 1, 'DECGDD', NULL, NULL);
INSERT IGNORE INTO basic_bustype_change(`id`, `originAction`, `originName`, `targetAction`, `type`, `enable`, `createUser`, `updateUser`, `createTime`, `updateTime`, `remark`, `auditStatus`, `busAuditStatus`, `targetBusAction`, `beforeTime`, `busBeforeTime`) VALUES (1724370174626394118, 'DECGDD', '设备采购订单', NULL, 5, 1, NULL, '1', NULL, '2023-11-14 18:14:22', NULL, 2, 2, NULL, NULL, NULL);

Write Preview
Loading…
Cancel
Save