root
/
smart-erp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

[feat] 

品质管理 退料品质单
修改退料品质页面，修改根据退料品质单类型设置品质报告类型语句，新增员工和委外退料类型；
修改加载审批弹窗controller接口，关联查询申请人姓名；
修改退料品质报告单审核通过后更新数据service方法，添加员工退料和委外退料类型的处理；
新增更新员工退料单品质数据service方法；
dev
王晓迪 2 months ago
parent
facc89a98b
commit
baf04da900
3 changed files with 52 additions and 9 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. 7
      ruoyi-admin/src/main/java/com/ruoyi/quality/controller/QualityOrderReportController.java
  2. 46
      ruoyi-admin/src/main/java/com/ruoyi/quality/service/impl/QualityOrderReportServiceImpl.java
  3. 8
      ruoyi-admin/src/main/resources/templates/quality/returnQualityOrder/returnStartingQuality.html

7
ruoyi-admin/src/main/java/com/ruoyi/quality/controller/QualityOrderReportController.java
View File

@ -4,11 +4,13 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.process.general.service.IProcessService;
import com.ruoyi.quality.domain.*;
import com.ruoyi.quality.domain.VO.QualityOrderReportVO;
import com.ruoyi.quality.service.*;
import com.ruoyi.system.domain.Vo.BaseEmpRequisiteOrderVO;
import com.ruoyi.system.mapper.SysUserMapper;
import com.ruoyi.system.service.ISysRoleService;
import com.ruoyi.warehouse.domain.WarehouseInventoryReportDamageChild;
import com.ruoyi.warehouse.service.IWarehouseOutOrderService;
@ -70,6 +72,9 @@ public class QualityOrderReportController extends BaseController
@Autowired
private ISysRoleService roleService;
@Autowired
private SysUserMapper sysUserMapper;
@RequiresPermissions("quality:qualityReport:view")
@GetMapping()
public String qualityReport()
@ -158,6 +163,8 @@ public class QualityOrderReportController extends BaseController
String processInstanceId = task.getProcessInstanceId();
ProcessInstance processInstance = runtimeService.createProcessInstanceQuery().processInstanceId(processInstanceId).singleResult();
QualityOrderReportVO qualityOrderReportVO = qualityOrderReportService.selectQualityOrderReportById(new Long(processInstance.getBusinessKey()));
SysUser user = sysUserMapper.selectUserByLoginName(qualityOrderReportVO.getApplyUser());
qualityOrderReportVO.setApplyUserName(user.getUserName());
mmap.put("formData", qualityOrderReportVO);
mmap.put("taskId", taskId);
String verifyName = task.getTaskDefinitionKey().substring(0, 1).toUpperCase() + task.getTaskDefinitionKey().substring(1);

46
ruoyi-admin/src/main/java/com/ruoyi/quality/service/impl/QualityOrderReportServiceImpl.java
View File

@ -19,13 +19,11 @@ import com.ruoyi.process.todoitem.mapper.BizTodoItemMapper;
import com.ruoyi.quality.domain.*;
import com.ruoyi.quality.domain.VO.QualityOrderReportVO;
import com.ruoyi.quality.mapper.*;
import com.ruoyi.system.domain.BaseReturnOrder;
import com.ruoyi.system.domain.MakeReturnOrder;
import com.ruoyi.system.domain.SysMakeOrder;
import com.ruoyi.system.domain.SysMakeorderBom;
import com.ruoyi.system.mapper.MakeReturnOrderMapper;
import com.ruoyi.system.mapper.SysMakeOrderMapper;
import com.ruoyi.system.mapper.SysMakeorderBomMapper;
import com.ruoyi.system.mapper.SysUserMapper;
import com.ruoyi.system.mapper.*;
import com.ruoyi.system.service.ISysRoleService;
import com.ruoyi.warehouse.domain.WarehouseStorageOrder;
import com.ruoyi.warehouse.domain.WarehouseStorageOrderDetail;
@ -115,6 +113,9 @@ public class QualityOrderReportServiceImpl implements IQualityOrderReportService
@Autowired
private MakeReturnOrderMapper makeReturnOrderMapper;
@Autowired
private BaseReturnOrderMapper baseReturnOrderMapper;
/**
* 查询品质管理品质单报告
*
@ -1189,6 +1190,8 @@ public class QualityOrderReportServiceImpl implements IQualityOrderReportService
if(qualityOrder.getQualityOrderType().equals("6")){//生产退料
updateMakeReturnOrder(returnOrderCode,qualifiedNum,unQualifiedNum);
}else if(qualityOrder.getQualityOrderType().equals("4")||qualityOrder.getQualityOrderType().equals("7")){//员工退料、委外退料
updateBaseReturnOrder(returnOrderCode,qualifiedNum,unQualifiedNum);
}
/*
* 合格数大于0生成入库单*/
@ -1203,7 +1206,13 @@ public class QualityOrderReportServiceImpl implements IQualityOrderReportService
storageOrderDetail.setRefundsExchangesNum(unQualifiedNum);
if(qualityOrder.getQualityOrderType().equals("6")){//生产退料
storageOrderDetail.setWarehouseOrderType("6");//生产退料单
storageOrderDetail.setWarehouseStorageType("8");//生产退料
storageOrderDetail.setWarehouseStorageType("8");
}else if(qualityOrder.getQualityOrderType().equals("4")){//员工退料
storageOrderDetail.setWarehouseOrderType("4");//员工退料单
storageOrderDetail.setWarehouseStorageType("6");
}else if(qualityOrder.getQualityOrderType().equals("7")){//委外退料
storageOrderDetail.setWarehouseOrderType("7");//委外退料单
storageOrderDetail.setWarehouseStorageType("9");
}
int detailResult = storageDetailMapper.insertWarehouseStorageOrderDetail(storageOrderDetail);
if(detailResult<=0){
@ -1215,6 +1224,12 @@ public class QualityOrderReportServiceImpl implements IQualityOrderReportService
if(qualityOrder.getQualityOrderType().equals("6")){//生产退料
storageOrder.setWarehouseOrderType("6");//生产退料单
storageOrder.setWarehouseStorageType("8");//生产退料
}else if(qualityOrder.getQualityOrderType().equals("4")){//员工退料
storageOrder.setWarehouseOrderType("4");//员工退料单
storageOrder.setWarehouseStorageType("6");
}else if(qualityOrder.getQualityOrderType().equals("7")){//委外退料
storageOrder.setWarehouseOrderType("7");//委外退料单
storageOrder.setWarehouseStorageType("9");
}
storageOrder.setWarehouseDeptType("0");//入库部门：仓库
int storageResult = storageOrderMapper.insertWarehouseStorageOrder(storageOrder);
@ -1317,6 +1332,27 @@ public class QualityOrderReportServiceImpl implements IQualityOrderReportService
return makeReturnOrderMapper.updateMakeReturnOrder(returnOrder);
}
/*
* 更新员工退料单品质数据*/
public int updateBaseReturnOrder(String returnOrderCode, int qualifiedNum, int unQualifiedNum){
BaseReturnOrder returnOrder = baseReturnOrderMapper.selectBaseReturnOrderByCode(returnOrderCode);
if(returnOrder == null){
throw new BusinessException("关联退料单不存在！请检查");
}
//更新退料单合格数、不良数
int returnQualifiedNum = Optional.ofNullable(returnOrder.getQualifiedNum())
.orElse(0);
int returnUnqualifiedNum = Optional.ofNullable(returnOrder.getUnqualifiedNum())
.orElse(0);
returnQualifiedNum = returnQualifiedNum + qualifiedNum;
returnUnqualifiedNum = returnUnqualifiedNum + unQualifiedNum;
returnOrder.setQualifiedNum(returnQualifiedNum);
returnOrder.setUnqualifiedNum(returnUnqualifiedNum);
returnOrder.setUpdateBy(ShiroUtils.getLoginName());
returnOrder.setUpdateTime(DateUtils.getNowDate());
return baseReturnOrderMapper.updateBaseReturnOrder(returnOrder);
}
}

8
ruoyi-admin/src/main/resources/templates/quality/returnQualityOrder/returnStartingQuality.html
View File

@ -501,13 +501,13 @@
};
}
var qualityOrderType = $("#qualityOrderType").val();
if(qualityOrderType === "3"){//员工退料
if(qualityOrderType === "4"){//员工退料
qualityReport.qualityOrderReportType = "4";//员工退料品质
}else if(qualityOrderType === "4"){//开发退料
}else if(qualityOrderType === "5"){//开发退料
qualityReport.qualityOrderReportType = "5";//开发退料品质
}else if(qualityOrderType === "5"){//生产退料
}else if(qualityOrderType === "6"){//生产退料
qualityReport.qualityOrderReportType = "6";//生产退料品质
}else if(qualityOrderType === "6"){//委外退料
}else if(qualityOrderType === "7"){//委外退料
qualityReport.qualityOrderReportType = "7";//委外退料品质
}
qualityReport.unqualifiedDataList = unqualifyList;

Write Preview
Loading…
Cancel
Save