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

[feat] 

品质管理 品质单
修改根据品质报告单生成退换货单service方法，添加品质备注赋值；
修改品质单查询来料品质单列表、查询生产、查询退料列表service方法，根据品质状态查询值是否为空调用不同方法；
新增查询未全部品质完成来料品质单、生产品质单、退料品质单mapper方法；
dev
王晓迪 1 week ago
parent
4d64d39189
commit
0e4b4ff389
6 changed files with 84 additions and 3 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. 4
      ruoyi-admin/src/main/java/com/ruoyi/quality/controller/ReturnQualityOrderController.java
  2. 13
      ruoyi-admin/src/main/java/com/ruoyi/quality/mapper/QualityOrderMapper.java
  3. 3
      ruoyi-admin/src/main/java/com/ruoyi/quality/service/IQualityOrderService.java
  4. 1
      ruoyi-admin/src/main/java/com/ruoyi/quality/service/impl/QualityOrderReportServiceImpl.java
  5. 12
      ruoyi-admin/src/main/java/com/ruoyi/quality/service/impl/QualityOrderServiceImpl.java
  6. 54
      ruoyi-admin/src/main/resources/mapper/quality/QualityOrderMapper.xml

4
ruoyi-admin/src/main/java/com/ruoyi/quality/controller/ReturnQualityOrderController.java
View File

@ -42,11 +42,11 @@ public class ReturnQualityOrderController extends BaseController {
}
/**
* 查询来料品质管理品质单列表
* 查询退料品质管理品质单列表
*/
@PostMapping("/qualityOrderList")
@ResponseBody
public TableDataInfo iqcOrderList(QualityOrder qualityOrder)
public TableDataInfo returnOrderList(QualityOrder qualityOrder)
{
startPage();//
List<QualityOrder> list = qualityOrderService.selectReturnQualityOrderList(qualityOrder);

13
ruoyi-admin/src/main/java/com/ruoyi/quality/mapper/QualityOrderMapper.java
View File

@ -99,11 +99,24 @@ public interface QualityOrderMapper
* 查询来料品质单*/
public List<QualityOrder> selectIqcQualityOrderList(QualityOrder qualityOrder);
/*
* 查询未完成来料品质单*/
public List<QualityOrder> selectIqcQualityOrderListUndo(QualityOrder qualityOrder);
/*
* 查询生产品质单*/
public List<QualityOrder> selectMakeQualityOrderList(QualityOrder qualityOrder);
/*
* 查询未完成生产品质单*/
public List<QualityOrder> selectMakeQualityOrderListUndo(QualityOrder qualityOrder);
/*
* 查询退料品质单*/
public List<QualityOrder> selectReturnQualityOrderList(QualityOrder qualityOrder);
/*
* 查询未完成退料品质单*/
public List<QualityOrder> selectReturnQualityOrderListUndo(QualityOrder qualityOrder);
}

3
ruoyi-admin/src/main/java/com/ruoyi/quality/service/IQualityOrderService.java
View File

@ -118,9 +118,10 @@ public interface IQualityOrderService
*/
int updateMakeStartingQuality(QualityOrder qualityOrder);
//查询来料品质单列表
List<QualityOrder> selectIqcQualityOrderList(QualityOrder qualityOrder);
//查询来料品质单列表
//查询生产品质单列表
List<QualityOrder> selectMakeQualityOrderList(QualityOrder qualityOrder);
/*

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

@ -998,6 +998,7 @@ public class QualityOrderReportServiceImpl implements IQualityOrderReportService
refundsExchanges.setRelatedOrderCode(qualityReportVO.getQualityOrderCode());
refundsExchanges.setInStorageCode(qualityReportVO.getInStorageCode());
refundsExchanges.setQualityTime(qualityReportVO.getCheckoutCompletionTime());
refundsExchanges.setQualityRemark(qualityReportVO.getRemark());
refundsExchanges.setMaterialTotal(1);
refundsExchanges.setNumTotal(qualityReportVO.getProcessBadNum());
refundsExchanges.setDeliveryInspectionTime(qualityReportVO.getDeliveryInspectionTime());

12
ruoyi-admin/src/main/java/com/ruoyi/quality/service/impl/QualityOrderServiceImpl.java
View File

@ -114,6 +114,10 @@ public class QualityOrderServiceImpl implements IQualityOrderService
public List<QualityOrder> selectIqcQualityOrderList(QualityOrder qualityOrder)
{
List<QualityOrder> qualityOrders = qualityOrderMapper.selectIqcQualityOrderList(qualityOrder);
/*品质状态为空查询时，默认查询部分品质和待品质*/
if(qualityOrder.getQualityStatus().isEmpty()){
qualityOrders = qualityOrderMapper.selectIqcQualityOrderListUndo(qualityOrder);
}
return qualityOrders;
}
@ -122,6 +126,10 @@ public class QualityOrderServiceImpl implements IQualityOrderService
public List<QualityOrder> selectMakeQualityOrderList(QualityOrder qualityOrder)
{
List<QualityOrder> qualityOrders = qualityOrderMapper.selectMakeQualityOrderList(qualityOrder);
/*品质状态为空查询时，默认查询部分品质和待品质*/
if(qualityOrder.getQualityStatus().isEmpty()){
qualityOrders = qualityOrderMapper.selectMakeQualityOrderListUndo(qualityOrder);
}
return qualityOrders;
}
@ -130,6 +138,10 @@ public class QualityOrderServiceImpl implements IQualityOrderService
@Override
public List<QualityOrder> selectReturnQualityOrderList(QualityOrder qualityOrder){
List<QualityOrder> qualityOrders = qualityOrderMapper.selectReturnQualityOrderList(qualityOrder);
/*品质状态为空查询时，默认查询部分品质和待品质*/
if(qualityOrder.getQualityStatus().isEmpty()){
qualityOrders = qualityOrderMapper.selectReturnQualityOrderListUndo(qualityOrder);
}
return qualityOrders;
}

54
ruoyi-admin/src/main/resources/mapper/quality/QualityOrderMapper.xml
View File

@ -114,6 +114,60 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
order by create_time desc
</select>
<select id="selectMakeQualityOrderListUndo" parameterType="QualityOrder" resultMap="QualityOrderResult">
<include refid="selectQualityOrderVo"/>
<where>
<if test="qualityOrderCode != null and qualityOrderCode != ''"> and quality_order_code like concat('%', #{qualityOrderCode}, '%')</if>
<if test="inStorageCode != null and inStorageCode != ''"> and in_storage_code like concat('%', #{inStorageCode}, '%')</if>
<if test="materialNo != null and materialNo != ''"> and material_no like concat('%', #{materialNo}, '%')</if>
<if test="materialName != null and materialName != ''"> and material_name like concat('%', #{materialName}, '%')</if>
<if test="relatedOrderCode != null and relatedOrderCode != ''"> and related_order_code like concat('%', #{relatedOrderCode}, '%')</if>
<if test="qualityStatus != null and qualityStatus != ''"> and quality_status = #{qualityStatus}</if>
<if test="qualityStorageStatus != null and qualityStorageStatus != ''"> and quality_storage_status = #{qualityStorageStatus}</if>
<if test="qualityEmployee != null and qualityEmployee != ''"> and quality_employee = #{qualityEmployee}</if>
<if test="params.beginCreateTime != null and params.beginCreateTime != '' and params.endCreateTime != null and params.endCreateTime != ''"> and Date(create_time) between #{params.beginCreateTime} and #{params.endCreateTime}</if>
and quality_order_type = '1'
and (quality_status = '0' or quality_status = '1')
</where>
order by create_time desc
</select>
<select id="selectIqcQualityOrderListUndo" parameterType="QualityOrder" resultMap="QualityOrderResult">
<include refid="selectQualityOrderVo"/>
<where>
<if test="qualityOrderCode != null and qualityOrderCode != ''"> and quality_order_code like concat('%', #{qualityOrderCode}, '%')</if>
<if test="inStorageCode != null and inStorageCode != ''"> and in_storage_code like concat('%', #{inStorageCode}, '%')</if>
<if test="materialNo != null and materialNo != ''"> and material_no like concat('%', #{materialNo}, '%')</if>
<if test="materialName != null and materialName != ''"> and material_name like concat('%', #{materialName}, '%')</if>
<if test="relatedOrderCode != null and relatedOrderCode != ''"> and related_order_code like concat('%', #{relatedOrderCode}, '%')</if>
<if test="qualityStatus != null and qualityStatus != ''"> and quality_status = #{qualityStatus}</if>
<if test="qualityStorageStatus != null and qualityStorageStatus != ''"> and quality_storage_status = #{qualityStorageStatus}</if>
<if test="qualityEmployee != null and qualityEmployee != ''"> and quality_employee = #{qualityEmployee}</if>
<if test="params.beginCreateTime != null and params.beginCreateTime != '' and params.endCreateTime != null and params.endCreateTime != ''"> and Date(create_time) between #{params.beginCreateTime} and #{params.endCreateTime}</if>
and (quality_order_type = '0' or quality_order_type = '2')
and (quality_status = '0' or quality_status = '1')
</where>
order by create_time desc
</select>
<select id="selectReturnQualityOrderListUndo" parameterType="QualityOrder" resultMap="QualityOrderResult">
<include refid="selectQualityOrderVo"/>
<where>
<if test="qualityOrderCode != null and qualityOrderCode != ''"> and quality_order_code like concat('%', #{qualityOrderCode}, '%')</if>
<if test="inStorageCode != null and inStorageCode != ''"> and in_storage_code like concat('%', #{inStorageCode}, '%')</if>
<if test="materialNo != null and materialNo != ''"> and material_no like concat('%', #{materialNo}, '%')</if>
<if test="materialName != null and materialName != ''"> and material_name like concat('%', #{materialName}, '%')</if>
<if test="relatedOrderCode != null and relatedOrderCode != ''"> and related_order_code like concat('%', #{relatedOrderCode}, '%')</if>
<if test="qualityStatus != null and qualityStatus != ''"> and quality_status = #{qualityStatus}</if>
<if test="qualityStorageStatus != null and qualityStorageStatus != ''"> and quality_storage_status = #{qualityStorageStatus}</if>
<if test="qualityEmployee != null and qualityEmployee != ''"> and quality_employee = #{qualityEmployee}</if>
<if test="params.beginCreateTime != null and params.beginCreateTime != '' and params.endCreateTime != null and params.endCreateTime != ''"> and Date(create_time) between #{params.beginCreateTime} and #{params.endCreateTime}</if>
and (quality_order_type = '4'or quality_order_type = '5'or quality_order_type = '6' or quality_order_type = '7')
and (quality_status = '0' or quality_status = '1')
</where>
order by create_time desc
</select>
<select id="selectQualityOrderById" parameterType="Long" resultMap="QualityOrderResult">
<include refid="selectQualityOrderVo"/>
where quality_order_id = #{qualityOrderId}

Write Preview
Loading…
Cancel
Save