Browse Source

[fix]

品质管理 品质单
修改品质单委外入库仓库暂收生成品质单service方法;
修改品质报告更新生产成品品质审批通过信息service方法;
dev
王晓迪 3 months ago
parent
commit
df21527426
  1. 35
      ruoyi-admin/src/main/java/com/ruoyi/quality/service/impl/QualityOrderReportServiceImpl.java
  2. 284
      ruoyi-admin/src/main/java/com/ruoyi/quality/service/impl/QualityOrderServiceImpl.java

35
ruoyi-admin/src/main/java/com/ruoyi/quality/service/impl/QualityOrderReportServiceImpl.java

@ -1,6 +1,7 @@
package com.ruoyi.quality.service.impl; package com.ruoyi.quality.service.impl;
import java.util.*; import java.util.*;
import java.util.stream.Collectors;
import com.github.pagehelper.Page; import com.github.pagehelper.Page;
import com.ruoyi.aftersales.domain.AfterSalesShippingDevice; import com.ruoyi.aftersales.domain.AfterSalesShippingDevice;
@ -502,8 +503,14 @@ public class QualityOrderReportServiceImpl implements IQualityOrderReportService
更新品质单详情合格数不良数 更新品质单详情合格数不良数
*/ */
QualityOrderDetail qualityOrderDetail = orderDetailMapper.selectQualityOrderDetailByCode(qualityOrderCode); QualityOrderDetail qualityOrderDetail = orderDetailMapper.selectQualityOrderDetailByCode(qualityOrderCode);
qualityOrderDetail.setQualityQualifiedNum(qualifiedNum); int detailQualifiedNum = Optional.ofNullable(qualityOrderDetail.getQualityQualifiedNum())
qualityOrderDetail.setQualityUnqualifiedNum(unQualifiedNum); .orElse(0);
int detailUnQualifiedNum = Optional.ofNullable(qualityOrderDetail.getQualityUnqualifiedNum())
.orElse(0);
detailQualifiedNum = detailQualifiedNum + qualifiedNum;
detailUnQualifiedNum = detailUnQualifiedNum + unQualifiedNum;
qualityOrderDetail.setQualityQualifiedNum(detailQualifiedNum);
qualityOrderDetail.setQualityUnqualifiedNum(detailUnQualifiedNum);
//更新待审核数 //更新待审核数
int detailPendingReviewNum = Optional.ofNullable(qualityOrderDetail.getPendingReviewNum()) int detailPendingReviewNum = Optional.ofNullable(qualityOrderDetail.getPendingReviewNum())
.orElse(0); .orElse(0);
@ -515,8 +522,6 @@ public class QualityOrderReportServiceImpl implements IQualityOrderReportService
/** /**
更新品质单合格数不良数*/ 更新品质单合格数不良数*/
QualityOrder qualityOrder = qualityOrderMapper.selectQualityOrderByCode(qualityOrderCode); QualityOrder qualityOrder = qualityOrderMapper.selectQualityOrderByCode(qualityOrderCode);
qualityOrder.setQualityQualifiedNum(qualifiedNum);
qualityOrder.setQualityUnqualifiedNum(unQualifiedNum);
//更新待审核数 //更新待审核数
int orderPendingReviewNum = Optional.ofNullable(qualityOrder.getPendingReviewNum()) int orderPendingReviewNum = Optional.ofNullable(qualityOrder.getPendingReviewNum())
.orElse(0); .orElse(0);
@ -524,10 +529,16 @@ public class QualityOrderReportServiceImpl implements IQualityOrderReportService
qualityOrder.setPendingReviewNum(orderPendingReviewNum); qualityOrder.setPendingReviewNum(orderPendingReviewNum);
qualityOrder.setUpdateBy(loginName); qualityOrder.setUpdateBy(loginName);
qualityOrder.setUpdateTime(DateUtils.getNowDate()); qualityOrder.setUpdateTime(DateUtils.getNowDate());
//更新品质单合格数、不良数
int orderQualifiedNum = Optional.ofNullable(qualityOrder.getQualityQualifiedNum()) int orderQualifiedNum = Optional.ofNullable(qualityOrder.getQualityQualifiedNum())
.orElse(0); .orElse(0);
int orderUnqualifiedNum = Optional.ofNullable(qualityOrder.getQualityUnqualifiedNum()) int orderUnqualifiedNum = Optional.ofNullable(qualityOrder.getQualityUnqualifiedNum())
.orElse(0);; .orElse(0);
orderQualifiedNum = orderQualifiedNum + qualifiedNum;
orderUnqualifiedNum = orderUnqualifiedNum + unQualifiedNum;
qualityOrder.setQualityQualifiedNum(orderQualifiedNum);
qualityOrder.setQualityUnqualifiedNum(orderUnqualifiedNum);
int qualityNum = orderQualifiedNum + orderUnqualifiedNum + orderPendingReviewNum; int qualityNum = orderQualifiedNum + orderUnqualifiedNum + orderPendingReviewNum;
if(qualityNum < qualityOrder.getThisArrivedNum()){ if(qualityNum < qualityOrder.getThisArrivedNum()){
qualityOrder.setQualityStatus("1");//部分品质 qualityOrder.setQualityStatus("1");//部分品质
@ -564,9 +575,14 @@ public class QualityOrderReportServiceImpl implements IQualityOrderReportService
if(qualityNum == qualityOrder.getThisArrivedNum()){ if(qualityNum == qualityOrder.getThisArrivedNum()){
QualityShippingDevice tempDevice = new QualityShippingDevice(); QualityShippingDevice tempDevice = new QualityShippingDevice();
//查找本品质单包含的未被提交为不良的设备 //查找本品质单包含的未被提交为不良的设备
tempDevice.setQualityAuditStatus("0");//未提交 // tempDevice.setQualityAuditStatus("0");//未提交
tempDevice.setQualityOrderCode(qualityOrderCode); tempDevice.setQualityOrderCode(qualityOrderCode);
List<QualityShippingDevice> qualityShippingDevices = shippingDeviceMapper.selectQualityShippingDeviceList(tempDevice); List<QualityShippingDevice> list = shippingDeviceMapper.selectQualityShippingDeviceList(tempDevice);
//过滤出未被添加到不良分类审核,或者之前添加过被审核拒绝,之后重新品质都没有被添加通过为不合格 0-待审核,2-审核拒绝
List<QualityShippingDevice> qualityShippingDevices = list.stream()
.filter(item ->item.getQualityAuditStatus().equals("0")
||item.getQualityAuditStatus().equals("2")).collect(Collectors.toList());
if(StringUtils.isNotEmpty(qualityShippingDevices)){ if(StringUtils.isNotEmpty(qualityShippingDevices)){
for (QualityShippingDevice shippingDevice: qualityShippingDevices) { for (QualityShippingDevice shippingDevice: qualityShippingDevices) {
String deviceId = shippingDevice.getShippingDeviceId(); String deviceId = shippingDevice.getShippingDeviceId();
@ -633,6 +649,7 @@ public class QualityOrderReportServiceImpl implements IQualityOrderReportService
storageOrderDetail.setWarehouseStorageType("5");//生产入库 storageOrderDetail.setWarehouseStorageType("5");//生产入库
storageOrderDetail.setWarehouseOrderType("1");//生产订单 storageOrderDetail.setWarehouseOrderType("1");//生产订单
storageOrderDetail.setWarehouseDeptType("0");//入库部门:仓库 storageOrderDetail.setWarehouseDeptType("0");//入库部门:仓库
storageOrderDetail.setRefundsExchangesNum(unQualifiedNum);
int detailResult = storageDetailMapper.insertWarehouseStorageOrderDetail(storageOrderDetail); int detailResult = storageDetailMapper.insertWarehouseStorageOrderDetail(storageOrderDetail);
if(detailResult<=0){ if(detailResult<=0){
throw new BusinessException("新增入库单详情失败"); throw new BusinessException("新增入库单详情失败");
@ -882,9 +899,11 @@ public class QualityOrderReportServiceImpl implements IQualityOrderReportService
int storageQualifyNum = storageQualifiedNum + unStorageQualifiedNum; int storageQualifyNum = storageQualifiedNum + unStorageQualifiedNum;
if(storageQualifyNum < storageOrder.getTemporaryQualifiedNum()){ if(storageQualifyNum < storageOrder.getTemporaryQualifiedNum()){
storageOrder.setWarehouseQualityStatus("1");//部分品质 storageOrder.setWarehouseQualityStatus("1");//部分品质
storageOrder.setWarehouseStorageStatus("2");//待入库
} }
if(storageQualifyNum == storageOrder.getTemporaryQualifiedNum()){ if(storageQualifyNum == storageOrder.getTemporaryQualifiedNum()){
storageOrder.setWarehouseQualityStatus("2");//全部品质 storageOrder.setWarehouseQualityStatus("2");//全部品质
storageOrder.setWarehouseStorageStatus("2");//待入库
} }
storageOrder.setUpdateBy(loginName); storageOrder.setUpdateBy(loginName);
storageOrder.setUpdateTime(DateUtils.getNowDate()); storageOrder.setUpdateTime(DateUtils.getNowDate());
@ -1048,7 +1067,7 @@ public class QualityOrderReportServiceImpl implements IQualityOrderReportService
warehouseStorageOrder.setWarehouseOrderType("2");//退换货订单 warehouseStorageOrder.setWarehouseOrderType("2");//退换货订单
warehouseStorageOrder.setWarehouseDeptType("0");//仓库 warehouseStorageOrder.setWarehouseDeptType("0");//仓库
warehouseStorageOrder.setNotifyArrivedNum(qualityReportVO.getProcessBadNum()); warehouseStorageOrder.setNotifyArrivedNum(qualityReportVO.getProcessBadNum());
warehouseStorageOrder.setQualityQualifiedNum(qualityReportVO.getQualityHasqualifiedNum()); warehouseStorageOrder.setQualityQualifiedNum(0);
warehouseStorageOrder.setQualityUnqualifiedNum(qualityReportVO.getProcessBadNum()); warehouseStorageOrder.setQualityUnqualifiedNum(qualityReportVO.getProcessBadNum());
warehouseStorageOrder.setDeliveryInspectionTime(qualityReportVO.getDeliveryInspectionTime()); warehouseStorageOrder.setDeliveryInspectionTime(qualityReportVO.getDeliveryInspectionTime());
warehouseStorageOrder.setQualityTime(qualityReportVO.getCheckoutCompletionTime()); warehouseStorageOrder.setQualityTime(qualityReportVO.getCheckoutCompletionTime());

284
ruoyi-admin/src/main/java/com/ruoyi/quality/service/impl/QualityOrderServiceImpl.java

@ -540,8 +540,13 @@ public class QualityOrderServiceImpl implements IQualityOrderService
} }
// 构建QualityOrderDetail,假设其他属性与QualityOrder相同,故不重复设置 // 构建QualityOrderDetail,假设其他属性与QualityOrder相同,故不重复设置
insertQualityOrderDetailByWarehouseStorageOrder(warehouseStorageOrder, detail, qualityOrderCode); QualityOrderDetail qualityOrderDetail = insertQualityOrderDetailByWarehouseStorageOrder(warehouseStorageOrder, detail, qualityOrderCode);
qualityOrderDetail.setQualityOrderType("0");//采购订单
qualityOrderDetail.setQualityStorageStatus("0");//采购入库
int insertResult= orderDetailMapper.insertQualityOrderDetail(qualityOrderDetail);
if (insertResult <= 0){
throw new BusinessException("新增品质单详情失败");
}
} }
} }
@ -551,38 +556,41 @@ public class QualityOrderServiceImpl implements IQualityOrderService
* */ * */
@Override @Override
public void insertQualityOrderByOutsourceStorageOrder(WarehouseStorageOrder warehouseStorageOrder, List<WarehouseStorageOrderDetail> storageOrderDetailList) { public void insertQualityOrderByOutsourceStorageOrder(WarehouseStorageOrder warehouseStorageOrder, List<WarehouseStorageOrderDetail> storageOrderDetailList) {
QualityOrder qualityOrder = new QualityOrder();
qualityOrder.setCreateTime(DateUtils.getNowDate());
qualityOrder.setCreateBy(warehouseStorageOrder.getCreateBy());
//使用redis自动生成品质单号
String qualityOrderCode = redisCache.generateBillNo("PZ");
qualityOrder.setQualityOrderCode(qualityOrderCode);
qualityOrder.setInStorageCode(warehouseStorageOrder.getWarehouseStorageCode());
qualityOrder.setRelatedOrderCode(warehouseStorageOrder.getRelatedOrderCode());
qualityOrder.setQualityStatus("0");
qualityOrder.setQualityOrderType("2");
qualityOrder.setQualityStorageStatus("2");
// 计算本次到货数合计
int totalReceivedQuantity = storageOrderDetailList.stream()
.mapToInt(WarehouseStorageOrderDetail::getActualArriveNum)
.sum();
qualityOrder.setThisArrivedNum(totalReceivedQuantity);
qualityOrder.setWarehouseCode(warehouseStorageOrder.getWarehouseCode());
qualityOrder.setWarehouseName(warehouseStorageOrder.getWarehouseName());
qualityOrder.setDeliveryInspectionTime(warehouseStorageOrder.getDeliveryInspectionTime());
qualityOrder.setCreateBy(ShiroUtils.getLoginName());
qualityOrder.setCreateTime(DateUtils.getNowDate());
qualityOrderMapper.insertQualityOrder(qualityOrder);
//新增三个子表的数据
for (WarehouseStorageOrderDetail detail : storageOrderDetailList) { for (WarehouseStorageOrderDetail detail : storageOrderDetailList) {
QualityOrder qualityOrder = new QualityOrder();
//使用redis自动生成品质单号
String qualityOrderCode = redisCache.generateBillNo("PZ");
qualityOrder.setQualityOrderCode(qualityOrderCode);
qualityOrder.setInStorageCode(warehouseStorageOrder.getWarehouseStorageCode());
qualityOrder.setRelatedOrderCode(warehouseStorageOrder.getRelatedOrderCode());
qualityOrder.setQualityStatus("0");
qualityOrder.setQualityOrderType("2");
qualityOrder.setQualityStorageStatus("2");
qualityOrder.setMaterialNo(detail.getMaterialNo());
qualityOrder.setMaterialName(detail.getMaterialName());
// 暂收合格数为品质单检验数
qualityOrder.setThisArrivedNum(detail.getTemporaryQualifiedNum());
qualityOrder.setPendingReviewNum(0);
qualityOrder.setQualityQualifiedNum(0);
qualityOrder.setQualityUnqualifiedNum(0);
qualityOrder.setWarehouseCode(warehouseStorageOrder.getWarehouseCode());
qualityOrder.setWarehouseName(warehouseStorageOrder.getWarehouseName());
qualityOrder.setDeliveryInspectionTime(warehouseStorageOrder.getDeliveryInspectionTime());
// 构建QualityOrderDetail,假设其他属性与QualityOrder相同,故不重复设置 // 构建QualityOrderDetail,假设其他属性与QualityOrder相同,故不重复设置
insertQualityOrderDetailByWarehouseStorageOrder(warehouseStorageOrder, detail, qualityOrderCode); QualityOrderDetail qualityOrderDetail = insertQualityOrderDetailByWarehouseStorageOrder(warehouseStorageOrder, detail, qualityOrderCode);
insertQualityOrderReportByWarehouseStorageOrder(detail,qualityOrderCode); qualityOrderDetail.setQualityOrderType("2");//委外订单
insertQualityOrderUnqualifiedByWarehouseStorageOrder(detail); qualityOrderDetail.setQualityStorageStatus("2");//委外入库
// ... int insertResult= orderDetailMapper.insertQualityOrderDetail(qualityOrderDetail);
if (insertResult <= 0){
throw new BusinessException("新增品质单详情失败");
}
qualityOrder.setCreateBy(ShiroUtils.getLoginName());
qualityOrder.setCreateTime(DateUtils.getNowDate());
qualityOrderMapper.insertQualityOrder(qualityOrder);
} }
} }
/* /*
@ -707,103 +715,7 @@ public class QualityOrderServiceImpl implements IQualityOrderService
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
@Override @Override
public int updateMakeOutStartingQuality(QualityOrder qualityOrder) { public int updateMakeOutStartingQuality(QualityOrder qualityOrder) {
String loginName = ShiroUtils.getLoginName(); return 0;
qualityOrder.setUpdateBy(loginName);
qualityOrder.setUpdateTime(DateUtils.getNowDate());
qualityOrder.setQualityEmployee(loginName);
List<QualityOrderDetail> qualityOrderDetailList = qualityOrder.getQualityOrderDetailList();
if (CollectionUtils.isEmpty(qualityOrderDetailList)){
throw new BusinessException("品质单详情数据为空");
}
for (QualityOrderDetail qualityOrderDetail : qualityOrderDetailList) {
qualityOrderDetail.setUpdateBy(loginName);
qualityOrderDetail.setUpdateTime(DateUtils.getNowDate());
Long qualityOrderDetailId = qualityOrderDetail.getQualityOrderDetailId();
QualityOrderDetail tempQualityOrderDetail = orderDetailMapper.selectQualityOrderDetailById(qualityOrderDetailId);
Integer qualifiedNum = tempQualityOrderDetail.getQualityQualifiedNum();
Integer unqualifiedNum = tempQualityOrderDetail.getQualityUnqualifiedNum();
if (qualifiedNum == null || unqualifiedNum == null){
throw new BusinessException("请先进行品质报告操作");
}
qualityOrderDetail.setInStorageCode(qualityOrder.getInStorageCode());
//更新品质单详情数据
int updateQualityOrderDetailResult = orderDetailMapper.updateQualityOrderDetail(qualityOrderDetail);
if (updateQualityOrderDetailResult <= 0){
throw new BusinessException("更新品质单详情数据失败");
}
}
//根据品质单号从数据库查询 用于更新入库单
QualityOrder tempQualityOrder = qualityOrderMapper.selectQualityOrderByCode(qualityOrder.getQualityOrderCode());
String qualityStatus = tempQualityOrder.getQualityStatus();
String qualityStorageStatus = tempQualityOrder.getQualityStorageStatus();
Integer thisArrivedNumSum = 0;
Integer qualityQualifiedNumSum = 0;
Integer qualityUnqualifiedNumSum = 0;
// 检查thisArrivedNum是否含有null值
// 检查qualityQualifiedNum是否含有null值
boolean hasQualityQualifiedNumNull = qualityOrderDetailList.stream()
.anyMatch(item -> item.getQualityQualifiedNum() == null);
// 检查qualityUnqualifiedNum是否含有null值
boolean hasQualityUnqualifiedNumNull = qualityOrderDetailList.stream()
.anyMatch(item -> item.getQualityUnqualifiedNum() == null);
if (hasQualityQualifiedNumNull) {
throw new BusinessException("存在品质已合格数为空,请检查!");
}
if (hasQualityUnqualifiedNumNull) {
throw new BusinessException("存在品质不合格数为空,请检查!");
}
// 计算各个字段的总和
qualityQualifiedNumSum = qualityOrderDetailList.stream()
.mapToInt(QualityOrderDetail::getQualityQualifiedNum)
.sum();
qualityUnqualifiedNumSum = qualityOrderDetailList.stream()
.mapToInt(QualityOrderDetail::getQualityUnqualifiedNum)
.sum();
//插入主表中本次到货数
qualityOrder.setThisArrivedNum(thisArrivedNumSum);
//插入主表中品质合格数
qualityOrder.setQualityQualifiedNum(qualityQualifiedNumSum);
//插入主表中品质不合格数
qualityOrder.setQualityUnqualifiedNum(qualityUnqualifiedNumSum);
// if (thisArrivedNum == qualityQualifiedNum){
//全部品质
qualityOrder.setQualityStatus("2");
tempQualityOrder.setQualityStatus("2");
// }else {
// //部分品质
// qualityOrder.setQualityStatus("1");
// tempQualityOrder.setQualityStatus("1");
// }
//如果品质时修改交检时间
tempQualityOrder.setDeliveryInspectionTime(qualityOrder.getDeliveryInspectionTime());
tempQualityOrder.setQualityQualifiedNum(qualityQualifiedNumSum);
tempQualityOrder.setQualityUnqualifiedNum(qualityUnqualifiedNumSum);
tempQualityOrder.setThisArrivedNum(thisArrivedNumSum);
//数据生成到入库单中,后续进行入库操作
int updateStorageOrderResult = warehouseStorageOrderService.updateWarehouseStorageOrderByOutQualityOrder(tempQualityOrder, qualityOrderDetailList);
if (updateStorageOrderResult <= 0){
throw new BusinessException("更新入库单数据失败");
}
int updateResult = qualityOrderMapper.updateQualityOrder(qualityOrder);
if (updateResult <= 0){
log.warn("更新品质单失败,未影响任何行");
}
return updateResult;
} }
/** /**
@ -842,109 +754,7 @@ public class QualityOrderServiceImpl implements IQualityOrderService
*/ */
@Override @Override
public int updateMakeStartingQuality(QualityOrder qualityOrder) { public int updateMakeStartingQuality(QualityOrder qualityOrder) {
return 0;
String loginName = ShiroUtils.getLoginName();
qualityOrder.setUpdateBy(loginName);
qualityOrder.setUpdateTime(DateUtils.getNowDate());
qualityOrder.setQualityEmployee(loginName);
//生成入库单号
String warehouseStorageCode = redisCache.generateBillNo("RK");
qualityOrder.setInStorageCode(warehouseStorageCode);
List<QualityOrderDetail> qualityOrderDetailList = qualityOrder.getQualityOrderDetailList();
if (CollectionUtils.isEmpty(qualityOrderDetailList)){
throw new BusinessException("品质单详情数据为空");
}
for (QualityOrderDetail qualityOrderDetail : qualityOrderDetailList) {
qualityOrderDetail.setUpdateBy(loginName);
qualityOrderDetail.setUpdateTime(new Date());
Long qualityOrderDetailId = qualityOrderDetail.getQualityOrderDetailId();
QualityOrderDetail tempQualityOrderDetail = orderDetailMapper.selectQualityOrderDetailById(qualityOrderDetailId);
Integer qualifiedNum = tempQualityOrderDetail.getQualityQualifiedNum();
Integer unqualifiedNum = tempQualityOrderDetail.getQualityUnqualifiedNum();
if (qualifiedNum == null || unqualifiedNum == null){
throw new BusinessException("请先进行品质报告操作");
}
//更新品质单详情数据
int updateQualityOrderDetailResult = orderDetailMapper.updateQualityOrderDetail(qualityOrderDetail);
if (updateQualityOrderDetailResult <= 0){
throw new BusinessException("更新品质单详情数据失败");
}
}
//根据品质单号从数据库查询 用于更新入库单
QualityOrder tempQualityOrder = qualityOrderMapper.selectQualityOrderByCode(qualityOrder.getQualityOrderCode());
tempQualityOrder.setWarehouseCode(warehouseStorageCode);
String qualityStatus = tempQualityOrder.getQualityStatus();
String qualityStorageStatus = tempQualityOrder.getQualityStorageStatus();
Integer thisArrivedNumSum = 0;
Integer qualityQualifiedNumSum = 0;
Integer qualityUnqualifiedNumSum = 0;
// 检查thisArrivedNum是否含有null值
// 检查qualityQualifiedNum是否含有null值
boolean hasQualityQualifiedNumNull = qualityOrderDetailList.stream()
.anyMatch(item -> item.getQualityQualifiedNum() == null);
// 检查qualityUnqualifiedNum是否含有null值
boolean hasQualityUnqualifiedNumNull = qualityOrderDetailList.stream()
.anyMatch(item -> item.getQualityUnqualifiedNum() == null);
if (hasQualityQualifiedNumNull) {
throw new BusinessException("存在品质已合格数为空,请检查!");
}
if (hasQualityUnqualifiedNumNull) {
throw new BusinessException("存在品质不合格数为空,请检查!");
}
// 计算各个字段的总和
qualityQualifiedNumSum = qualityOrderDetailList.stream()
.mapToInt(QualityOrderDetail::getQualityQualifiedNum)
.sum();
qualityUnqualifiedNumSum = qualityOrderDetailList.stream()
.mapToInt(QualityOrderDetail::getQualityUnqualifiedNum)
.sum();
//插入主表中本次到货数
qualityOrder.setThisArrivedNum(thisArrivedNumSum);
//插入主表中品质合格数
qualityOrder.setQualityQualifiedNum(qualityQualifiedNumSum);
//插入主表中品质不合格数
qualityOrder.setQualityUnqualifiedNum(qualityUnqualifiedNumSum);
// if (thisArrivedNum == qualityQualifiedNum){
//全部品质
qualityOrder.setQualityStatus("2");
tempQualityOrder.setQualityStatus("2");
// }else {
// //部分品质
// qualityOrder.setQualityStatus("1");
// tempQualityOrder.setQualityStatus("1");
// }
//如果品质时修改交检时间
tempQualityOrder.setDeliveryInspectionTime(qualityOrder.getDeliveryInspectionTime());
tempQualityOrder.setQualityQualifiedNum(qualityQualifiedNumSum);
tempQualityOrder.setQualityUnqualifiedNum(qualityUnqualifiedNumSum);
tempQualityOrder.setThisArrivedNum(thisArrivedNumSum);
//数据生成到入库单中,后续进行入库操作
int updateStorageOrderResult = warehouseStorageOrderService.insertWarehouseStorageOrderByMakeQualityOrder(tempQualityOrder, qualityOrderDetailList);
if (updateStorageOrderResult <= 0){
throw new BusinessException("更新入库单数据失败");
}
int updateResult = qualityOrderMapper.updateQualityOrder(qualityOrder);
if (updateResult <= 0){
log.warn("更新品质单失败,未影响任何行");
}
return updateResult;
} }
//品质单不合格分类表 //品质单不合格分类表
@ -985,7 +795,7 @@ public class QualityOrderServiceImpl implements IQualityOrderService
} }
//品质单详情表 //品质单详情表
private void insertQualityOrderDetailByWarehouseStorageOrder(WarehouseStorageOrder warehouseStorageOrder, WarehouseStorageOrderDetail warehouseStorageOrderDetail, String qualityOrderCode) { private QualityOrderDetail insertQualityOrderDetailByWarehouseStorageOrder(WarehouseStorageOrder warehouseStorageOrder, WarehouseStorageOrderDetail warehouseStorageOrderDetail, String qualityOrderCode) {
QualityOrderDetail qualityOrderDetail = new QualityOrderDetail(); QualityOrderDetail qualityOrderDetail = new QualityOrderDetail();
@ -994,8 +804,8 @@ public class QualityOrderServiceImpl implements IQualityOrderService
qualityOrderDetail.setInStorageCode(warehouseStorageOrder.getWarehouseStorageCode()); qualityOrderDetail.setInStorageCode(warehouseStorageOrder.getWarehouseStorageCode());
qualityOrderDetail.setRelatedOrderCode(warehouseStorageOrder.getRelatedOrderCode()); qualityOrderDetail.setRelatedOrderCode(warehouseStorageOrder.getRelatedOrderCode());
qualityOrderDetail.setQualityStatus("0"); qualityOrderDetail.setQualityStatus("0");
qualityOrderDetail.setQualityOrderType("0"); // qualityOrderDetail.setQualityOrderType("0");
qualityOrderDetail.setQualityStorageStatus("0"); // qualityOrderDetail.setQualityStorageStatus("0");
qualityOrderDetail.setMaterialNo(warehouseStorageOrderDetail.getMaterialNo()); qualityOrderDetail.setMaterialNo(warehouseStorageOrderDetail.getMaterialNo());
qualityOrderDetail.setMaterialBrand(warehouseStorageOrderDetail.getMaterialBrand()); qualityOrderDetail.setMaterialBrand(warehouseStorageOrderDetail.getMaterialBrand());
qualityOrderDetail.setMaterialDescribe(warehouseStorageOrderDetail.getMaterialDescribe()); qualityOrderDetail.setMaterialDescribe(warehouseStorageOrderDetail.getMaterialDescribe());
@ -1015,9 +825,7 @@ public class QualityOrderServiceImpl implements IQualityOrderService
qualityOrderDetail.setDeliveryInspectionTime(warehouseStorageOrder.getDeliveryInspectionTime()); qualityOrderDetail.setDeliveryInspectionTime(warehouseStorageOrder.getDeliveryInspectionTime());
qualityOrderDetail.setCreateTime(new Date()); qualityOrderDetail.setCreateTime(new Date());
qualityOrderDetail.setCreateBy(warehouseStorageOrderDetail.getCreateBy()); qualityOrderDetail.setCreateBy(warehouseStorageOrderDetail.getCreateBy());
int insertResult= orderDetailMapper.insertQualityOrderDetail(qualityOrderDetail);
if (insertResult <= 0){ return qualityOrderDetail;
throw new BusinessException("新增品质单详情失败");
}
} }
} }

Loading…
Cancel
Save