|
|
|
|
@ -3,13 +3,13 @@ package com.op.plan.service.impl;
|
|
|
|
|
import com.baomidou.dynamic.datasource.annotation.DS;
|
|
|
|
|
import com.op.common.core.context.SecurityContextHolder;
|
|
|
|
|
import com.op.common.core.utils.DateUtils;
|
|
|
|
|
import com.op.common.core.utils.bean.BeanUtils;
|
|
|
|
|
import com.op.common.core.utils.uuid.IdUtils;
|
|
|
|
|
import com.op.plan.domain.ProOrderWorkorder;
|
|
|
|
|
import com.op.plan.domain.ProWorkorderProcessDetail;
|
|
|
|
|
import com.op.plan.mapper.ProOrderMapper;
|
|
|
|
|
import com.op.plan.mapper.ProOrderWorkorderBatchMapper;
|
|
|
|
|
import com.op.plan.mapper.ProOrderWorkorderMapper;
|
|
|
|
|
import com.op.plan.mapper.ProWorkorderProcessDetailMapper;
|
|
|
|
|
import com.op.common.core.web.domain.AjaxResult;
|
|
|
|
|
import com.op.plan.domain.*;
|
|
|
|
|
import com.op.plan.domain.dto.ProOrderDTO;
|
|
|
|
|
import com.op.plan.domain.dto.SplitOrderDTO;
|
|
|
|
|
import com.op.plan.mapper.*;
|
|
|
|
|
import com.op.plan.service.IProOrderWorkorderService;
|
|
|
|
|
import org.apache.commons.lang.StringUtils;
|
|
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
|
|
@ -17,8 +17,10 @@ import org.springframework.stereotype.Service;
|
|
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
|
|
import org.springframework.util.CollectionUtils;
|
|
|
|
|
|
|
|
|
|
import java.util.ArrayList;
|
|
|
|
|
import java.util.List;
|
|
|
|
|
import java.util.*;
|
|
|
|
|
|
|
|
|
|
import static com.op.common.core.web.domain.AjaxResult.error;
|
|
|
|
|
import static com.op.common.core.web.domain.AjaxResult.success;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
@ -37,6 +39,10 @@ public class ProOrderWorkorderServiceImpl implements IProOrderWorkorderService {
|
|
|
|
|
private ProOrderMapper proOrderMapper;
|
|
|
|
|
@Autowired
|
|
|
|
|
private ProWorkorderProcessDetailMapper proWorkorderProcessDetailMapper;
|
|
|
|
|
@Autowired
|
|
|
|
|
private ProWetMaterialPlanDetailMapper proWetMaterialPlanDetailMapper;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* 查询生产工单
|
|
|
|
|
*
|
|
|
|
|
@ -182,4 +188,289 @@ public class ProOrderWorkorderServiceImpl implements IProOrderWorkorderService {
|
|
|
|
|
//下达工单
|
|
|
|
|
return proOrderWorkorderMapper.downProOrderWorkorderByWorkorderIds(workorderIds);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* 通过工单信息查询订单信息和工单信息
|
|
|
|
|
*
|
|
|
|
|
* @param proOrderWorkorder
|
|
|
|
|
* @return
|
|
|
|
|
*/
|
|
|
|
|
@Override
|
|
|
|
|
@DS("#header.poolName")
|
|
|
|
|
public AjaxResult getOrderAndWorkInfo(ProOrderWorkorder proOrderWorkorder) {
|
|
|
|
|
boolean run = true;
|
|
|
|
|
while (run) {
|
|
|
|
|
ProOrderWorkorder fatherWorkOrder = proOrderWorkorderMapper.selectWorkOrderByCode(proOrderWorkorder.getParentOrder());
|
|
|
|
|
// 如果存在父工单
|
|
|
|
|
if (fatherWorkOrder != null ){
|
|
|
|
|
BeanUtils.copyProperties(fatherWorkOrder,proOrderWorkorder);
|
|
|
|
|
}else {
|
|
|
|
|
run = false;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
// 通过母订单id查询母订单详情
|
|
|
|
|
ProOrder proOrder = proOrderMapper.selectProOrderById(proOrderWorkorder.getOrderId());
|
|
|
|
|
// 递归查询子订单
|
|
|
|
|
recursiveQueryChildOrder(proOrder);
|
|
|
|
|
// 通过获取到的工单信息获取父工单
|
|
|
|
|
formatProOrderWorkorder(proOrderWorkorder);
|
|
|
|
|
|
|
|
|
|
Map orderAndWork = new HashMap();
|
|
|
|
|
orderAndWork.put("order",proOrder);
|
|
|
|
|
orderAndWork.put("workOrder",proOrderWorkorder);
|
|
|
|
|
|
|
|
|
|
return success(orderAndWork);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* 通过子工单获取批次信息list（父工单批次信息）
|
|
|
|
|
*
|
|
|
|
|
* @param proOrderWorkorder
|
|
|
|
|
* @return
|
|
|
|
|
*/
|
|
|
|
|
@Override
|
|
|
|
|
@DS("#header.poolName")
|
|
|
|
|
public AjaxResult getWorkBatchList(ProOrderWorkorder proOrderWorkorder) {
|
|
|
|
|
boolean run = true;
|
|
|
|
|
while (run){
|
|
|
|
|
ProOrderWorkorder fatherWorkOrder = proOrderWorkorderMapper.selectWorkOrderByCode(proOrderWorkorder.getParentOrder());
|
|
|
|
|
// 如果存在父工单
|
|
|
|
|
if (fatherWorkOrder != null){
|
|
|
|
|
BeanUtils.copyProperties(fatherWorkOrder,proOrderWorkorder);
|
|
|
|
|
}else {
|
|
|
|
|
run = false;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
// 通过父工单id查询对应批次信息list
|
|
|
|
|
return success(proOrderWorkorderBatchMapper.selectWorkOrderBatchList(proOrderWorkorder.getWorkorderId()));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* 提交修改工单接口
|
|
|
|
|
*
|
|
|
|
|
* @param splitOrderDTO
|
|
|
|
|
* @return
|
|
|
|
|
*/
|
|
|
|
|
@Override
|
|
|
|
|
@DS("#header.poolName")
|
|
|
|
|
@Transactional
|
|
|
|
|
public AjaxResult subChangeWorkOrder(SplitOrderDTO splitOrderDTO) {
|
|
|
|
|
|
|
|
|
|
// 获得子工单对象——(这里没有用BeanUtils是因为若依与这个冲突造成死循环得到错误的结果)
|
|
|
|
|
ProOrderWorkorder proWorkOrder = splitOrderDTO.getProOrderWorkorder();
|
|
|
|
|
// 通过子工单获得所有工单信息,并将所有工单信息放入list中
|
|
|
|
|
List<ProOrderWorkorder> workOrderList = new ArrayList<>();
|
|
|
|
|
// 将获得的工单的id存放
|
|
|
|
|
List<String> ids = new ArrayList<>();
|
|
|
|
|
boolean getworkOrder = true;
|
|
|
|
|
// 将工单放入list
|
|
|
|
|
workOrderList.add(proWorkOrder);
|
|
|
|
|
// 将id放入
|
|
|
|
|
ids.add(proWorkOrder.getWorkorderId());
|
|
|
|
|
|
|
|
|
|
// 用于循环
|
|
|
|
|
ProOrderWorkorder childWorkOrder = new ProOrderWorkorder();
|
|
|
|
|
BeanUtils.copyProperties(proWorkOrder,childWorkOrder);
|
|
|
|
|
|
|
|
|
|
while (getworkOrder) {
|
|
|
|
|
// 通过parentOrder查询父工单信息
|
|
|
|
|
ProOrderWorkorder fatherWorkOrder = proOrderWorkorderMapper.selectWorkOrderByCode(childWorkOrder.getParentOrder());
|
|
|
|
|
if (fatherWorkOrder != null){
|
|
|
|
|
// 将重置对象
|
|
|
|
|
BeanUtils.copyProperties(fatherWorkOrder,childWorkOrder);
|
|
|
|
|
// 将工单放入list
|
|
|
|
|
workOrderList.add(fatherWorkOrder);
|
|
|
|
|
// 将id放入
|
|
|
|
|
ids.add(fatherWorkOrder.getWorkorderId());
|
|
|
|
|
}else {
|
|
|
|
|
// 终止循环
|
|
|
|
|
getworkOrder = false;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
boolean checkout = true;
|
|
|
|
|
|
|
|
|
|
// 校验批次编号是否存在（重复问题）
|
|
|
|
|
String[] workorderIds = (String[]) ids.toArray(new String[ids.size()]);
|
|
|
|
|
List<String> batchCodes = proOrderWorkorderBatchMapper.selectCodeByWorkOrderIds(workorderIds);
|
|
|
|
|
for (int i = 0; i < batchCodes.size(); i++) {
|
|
|
|
|
for (int j = 0; j < splitOrderDTO.getFormFields().size(); j++) {
|
|
|
|
|
if (batchCodes.get(i).equals(splitOrderDTO.getFormFields().get(j).getBatchCode())) {
|
|
|
|
|
checkout = false;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// for (ProOrderWorkorder proOrderWorkorder : workOrderList){
|
|
|
|
|
// System.out.println("这里是你的工单！！！！！"+proOrderWorkorder.getWorkorderCode());
|
|
|
|
|
// System.out.println("这里是工单拆分数量！！！！！！"+proOrderWorkorder.getQuantitySplit());
|
|
|
|
|
// }
|
|
|
|
|
|
|
|
|
|
if (checkout){
|
|
|
|
|
// 删除所有工单s下的批次信息
|
|
|
|
|
int i = proOrderWorkorderBatchMapper.deleteProOrderWorkorderBatchByWorkorderIds(workorderIds);
|
|
|
|
|
// 创建订单信息，并将信息copy进去
|
|
|
|
|
ProOrder proOrder = new ProOrder();
|
|
|
|
|
BeanUtils.copyProperties(splitOrderDTO.getProduct(),proOrder);
|
|
|
|
|
// 设置换算基数，用于获得换算值
|
|
|
|
|
Long quantity = proOrder.getQuantity();
|
|
|
|
|
// 创建批次表通用对象
|
|
|
|
|
ProOrderWorkorderBatch workBatch = setCommonBatchAttribute();
|
|
|
|
|
boolean run = true;
|
|
|
|
|
// 获取单位换算值
|
|
|
|
|
Long conver = 1L;
|
|
|
|
|
int index = workOrderList.size();
|
|
|
|
|
while (run) {
|
|
|
|
|
// 获得对应工单
|
|
|
|
|
ProOrderWorkorder proOrderWorkorder = workOrderList.get(--index);
|
|
|
|
|
// 更新订单
|
|
|
|
|
proOrder.setUpdateBy(SecurityContextHolder.getUserName());
|
|
|
|
|
proOrder.setUpdateTime(DateUtils.getNowDate());
|
|
|
|
|
proOrder.setQuantitySplit(proOrder.getQuantitySplit()+Long.valueOf(proOrder.getAtrr1()));
|
|
|
|
|
proOrderMapper.updateProOrder(proOrder);
|
|
|
|
|
// 设置工单信息
|
|
|
|
|
proOrderWorkorder.setUpdateBy(SecurityContextHolder.getUserName());
|
|
|
|
|
proOrderWorkorder.setUpdateTime(DateUtils.getNowDate());
|
|
|
|
|
// 拆分数量
|
|
|
|
|
proOrderWorkorder.setQuantitySplit(Long.valueOf(proOrder.getAtrr1()));
|
|
|
|
|
// 2.将工单信息更新至数据库
|
|
|
|
|
if (splitOrderDTO.getProdLineCode() != null){
|
|
|
|
|
proOrderWorkorder.setProdLineCode(splitOrderDTO.getProdLineCode());
|
|
|
|
|
}
|
|
|
|
|
if (splitOrderDTO.getProductDate() != null){
|
|
|
|
|
proOrderWorkorder.setProductDate(splitOrderDTO.getProductDate());
|
|
|
|
|
}
|
|
|
|
|
if (splitOrderDTO.getShiftId() != null){
|
|
|
|
|
proOrderWorkorder.setShiftId(splitOrderDTO.getShiftId());
|
|
|
|
|
}
|
|
|
|
|
if (splitOrderDTO.getRouteCode() != null){
|
|
|
|
|
proOrderWorkorder.setRouteCode(splitOrderDTO.getRouteCode());
|
|
|
|
|
}
|
|
|
|
|
proOrderWorkorderMapper.updateProOrderWorkorder(proOrderWorkorder);
|
|
|
|
|
|
|
|
|
|
// System.out.println("这里是workorderCode------------》"+proOrderWorkorder.getWorkorderCode());
|
|
|
|
|
// 生成对应批次表
|
|
|
|
|
workBatch.setWorkorderId(proOrderWorkorder.getWorkorderId());
|
|
|
|
|
|
|
|
|
|
// 生成批次表信息并更新至数据库
|
|
|
|
|
for (Batch batch : splitOrderDTO.getFormFields()) {
|
|
|
|
|
// 生成批次id
|
|
|
|
|
workBatch.setBatchId(IdUtils.fastSimpleUUID());
|
|
|
|
|
// 生成批次号
|
|
|
|
|
workBatch.setBatchCode(batch.getBatchCode());
|
|
|
|
|
// 生成批次数量
|
|
|
|
|
workBatch.setBatchQuantity(batch.getBatchQuantity()*conver);
|
|
|
|
|
// 更新至数据库
|
|
|
|
|
proOrderWorkorderBatchMapper.insertProOrderWorkorderBatch(workBatch);
|
|
|
|
|
|
|
|
|
|
// 测试
|
|
|
|
|
// System.out.println("这里是workorderId----------->"+workBatch.getWorkorderId());
|
|
|
|
|
// System.out.println("这里是拆分数量----------->"+workBatch.getBatchQuantity());
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// 如果存在子节点
|
|
|
|
|
if (proOrder.getChildren().size()>0){
|
|
|
|
|
ProOrderDTO newProOrder = (ProOrderDTO) proOrder.getChildren().get(0);
|
|
|
|
|
// 更新换算值
|
|
|
|
|
conver = (newProOrder.getQuantity() / quantity);
|
|
|
|
|
// 将child信息重新赋值给proOrder
|
|
|
|
|
BeanUtils.copyProperties(newProOrder, proOrder);
|
|
|
|
|
} else {
|
|
|
|
|
// 结束循环
|
|
|
|
|
run = false;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
return success();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
return error(500, "批次号不能重复");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* 校验工单是否可以修改
|
|
|
|
|
* 如果工单已生成湿料计划则不允许修改
|
|
|
|
|
*
|
|
|
|
|
* @return
|
|
|
|
|
*/
|
|
|
|
|
@Override
|
|
|
|
|
@DS("#header.poolName")
|
|
|
|
|
public AjaxResult checkWorkOrder(String id) {
|
|
|
|
|
ProWetMaterialPlanDetail proWetMaterialPlanDetail = proWetMaterialPlanDetailMapper.selectProWetMaterialPlanDetailByWorkId(id);
|
|
|
|
|
if (proWetMaterialPlanDetail != null){
|
|
|
|
|
return error(500,"工单已有湿料计划！不可修改！");
|
|
|
|
|
}
|
|
|
|
|
return success();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* 格式化工单信息（递归处理）
|
|
|
|
|
*
|
|
|
|
|
* @param proOrderWorkorder
|
|
|
|
|
*/
|
|
|
|
|
private void formatProOrderWorkorder(ProOrderWorkorder proOrderWorkorder) {
|
|
|
|
|
// 通过班次id查询班次名称
|
|
|
|
|
String shiftDesc = proOrderMapper.selectShiftNameById(proOrderWorkorder.getShiftId());
|
|
|
|
|
// 通过设备code查询出机型名称
|
|
|
|
|
String prodLineName = proOrderMapper.selectProdLineName(proOrderWorkorder.getProdLineCode());
|
|
|
|
|
// 通过工单id查询批次号
|
|
|
|
|
List<String> batchCodeList = proOrderMapper.selectBatchCodesById(proOrderWorkorder.getWorkorderId());
|
|
|
|
|
List<StringBuilder> batchCodes = new ArrayList<>();
|
|
|
|
|
// 格式化数据
|
|
|
|
|
for (String batchCode : batchCodeList) {
|
|
|
|
|
batchCodes.add(new StringBuilder(batchCode).append(";").append("\n"));
|
|
|
|
|
}
|
|
|
|
|
// 将查询结果设置到当前工单对象
|
|
|
|
|
proOrderWorkorder.setShiftDesc(shiftDesc);
|
|
|
|
|
proOrderWorkorder.setProdLineCode(prodLineName);
|
|
|
|
|
proOrderWorkorder.setBatchCodeList(batchCodes);
|
|
|
|
|
|
|
|
|
|
// 通过母工单workorder_id查询子工单
|
|
|
|
|
List<ProOrderWorkorder> childWorkorders = proOrderWorkorderMapper.selectChildWorkOrder(proOrderWorkorder.getWorkorderCode());
|
|
|
|
|
if (!childWorkorders.isEmpty()) {
|
|
|
|
|
for (ProOrderWorkorder childWorkorder : childWorkorders) {
|
|
|
|
|
formatProOrderWorkorder(childWorkorder); // 递归处理子工单
|
|
|
|
|
}
|
|
|
|
|
proOrderWorkorder.setChildren(childWorkorders); // 设置子工单列表
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* 查询订单方法（递归）
|
|
|
|
|
*
|
|
|
|
|
* @param proOrder
|
|
|
|
|
*/
|
|
|
|
|
private void recursiveQueryChildOrder(ProOrder proOrder) {
|
|
|
|
|
// 查询子订单列表
|
|
|
|
|
List<ProOrder> childOrders = proOrderMapper.selectChildProOrderByCode(proOrder.getOrderCode());
|
|
|
|
|
if (!childOrders.isEmpty()) {
|
|
|
|
|
// 递归处理子订单
|
|
|
|
|
for (ProOrder childOrder : childOrders) {
|
|
|
|
|
recursiveQueryChildOrder(childOrder);
|
|
|
|
|
}
|
|
|
|
|
// 将子订单列表设置到当前订单对象
|
|
|
|
|
proOrder.setChildren(childOrders);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* 设置批次表通用
|
|
|
|
|
*
|
|
|
|
|
* @return
|
|
|
|
|
*/
|
|
|
|
|
private ProOrderWorkorderBatch setCommonBatchAttribute() {
|
|
|
|
|
ProOrderWorkorderBatch workBatch = new ProOrderWorkorderBatch();
|
|
|
|
|
// 更新者
|
|
|
|
|
workBatch.setUpdateBy(SecurityContextHolder.getUserName());
|
|
|
|
|
// 创建更新时间
|
|
|
|
|
workBatch.setUpdateTime(DateUtils.getNowDate());
|
|
|
|
|
// 设置创建时间
|
|
|
|
|
workBatch.setCreateTime(DateUtils.getNowDate());
|
|
|
|
|
// 创建者
|
|
|
|
|
workBatch.setCreateBy(SecurityContextHolder.getUserName());
|
|
|
|
|
// 设置单据状态（1正常）
|
|
|
|
|
workBatch.setStatus("1");
|
|
|
|
|
return workBatch;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
wws
1 year ago