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

[fix] 

品质管理 退换货单
修改退换货单实体类，新增品质时间和是否退回供应商字段；
修改查询所有物料信息controller接口，修改调用方法；
修改退换货详情类，新增物料型号字段；
修改退换货详情mapper，新增字段；
新增根据单号查询品质管理退换货单mapper方法；
修改新增品质管理退换货单service方法、生成退换货入库单对象、详情列表service方法、修改确认供应商信息service方法；
dev
王晓迪 2 months ago
parent
35d1fb94f3
commit
0c61521492
9 changed files with 184 additions and 91 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/QualityRefundsExchangesController.java
  2. 32
      ruoyi-admin/src/main/java/com/ruoyi/quality/domain/QualityRefundsExchanges.java
  3. 12
      ruoyi-admin/src/main/java/com/ruoyi/quality/domain/QualityRefundsExchangesDetail.java
  4. 11
      ruoyi-admin/src/main/java/com/ruoyi/quality/domain/QualityRefundsExchangesOrder.java
  5. 6
      ruoyi-admin/src/main/java/com/ruoyi/quality/mapper/QualityRefundsExchangesMapper.java
  6. 166
      ruoyi-admin/src/main/java/com/ruoyi/quality/service/impl/QualityRefundsExchangesServiceImpl.java
  7. 14
      ruoyi-admin/src/main/resources/mapper/quality/QualityRefundsExchangesDetailMapper.xml
  8. 23
      ruoyi-admin/src/main/resources/mapper/quality/QualityRefundsExchangesMapper.xml
  9. 7
      ruoyi-admin/src/main/resources/mapper/quality/QualityRefundsExchangesOrderMapper.xml

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

@ -167,10 +167,10 @@ public class QualityRefundsExchangesController extends BaseController
* */
@PostMapping( "/getAllMaterial")
@ResponseBody
public TableDataInfo getAllMaterial()
public TableDataInfo getAllMaterial(ErpMaterialVo erpMaterialVo)
{
startPage();
List<ErpMaterialVo> erpMaterialVos = erpMaterialService.selectAllErpMaterialList();
List<ErpMaterialVo> erpMaterialVos = erpMaterialService.selectAllErpMaterialListByMaterialVo(erpMaterialVo);
return getDataTable(erpMaterialVos);
}

32
ruoyi-admin/src/main/java/com/ruoyi/quality/domain/QualityRefundsExchanges.java
View File

@ -26,19 +26,19 @@ public class QualityRefundsExchanges extends BaseEntity
@Excel(name = "退换货单号")
private String refundsExchangesCode;
/** 退换货状态 */
/** 退换货状态 (0待结案、1已结案)*/
@Excel(name = "退换货状态")
private String refundsExchangesStatus;
/** 仓库状态 */
/** 仓库状态(0待入库、1全部入库、2待出库、3部分出库、4全部出库) */
@Excel(name = "仓库状态")
private String qualityWarehouseStatus;
/** 采购状态 */
/** 采购状态(0待确认、1已确认、2供应商收货、3部分收货、4全部收货) */
@Excel(name = "采购状态")
private String qualityPurchaseStatus;
/** 收货状态 */
/** 收货状态(0 待收货 1 部分收货 2 全部收货) */
@Excel(name = "收货状态")
private String qualityDeliveryStatus;
@ -77,6 +77,14 @@ public class QualityRefundsExchanges extends BaseEntity
@Excel(name = "品质备注")
private String qualityRemark;
/** 品质时间 */
@Excel(name = "品质时间")
private Date qualityTime;
/** 是否退回供应商 */
@Excel(name = "是否退回供应商")
private String isReturnedToSupplier;
/*退换货详情列表*/
private List<QualityRefundsExchangesDetail> refundsExchangesDetails;
@ -223,6 +231,22 @@ public class QualityRefundsExchanges extends BaseEntity
this.outStorageCode = outStorageCode;
}
public Date getQualityTime() {
return qualityTime;
}
public void setQualityTime(Date qualityTime) {
this.qualityTime = qualityTime;
}
public String getIsReturnedToSupplier() {
return isReturnedToSupplier;
}
public void setIsReturnedToSupplier(String isReturnedToSupplier) {
this.isReturnedToSupplier = isReturnedToSupplier;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

12
ruoyi-admin/src/main/java/com/ruoyi/quality/domain/QualityRefundsExchangesDetail.java
View File

@ -112,6 +112,10 @@ public class QualityRefundsExchangesDetail extends BaseEntity
@Excel(name = "物料描述")
private String materialDescribe;
/** 物料型号 */
@Excel(name = "物料型号")
private String materialModel;
/** 物料加工方式 */
@Excel(name = "物料加工方式")
private String materialProcessMethod;
@ -406,6 +410,14 @@ public class QualityRefundsExchangesDetail extends BaseEntity
this.refundsExchangesUnqualifieds = refundsExchangesUnqualifieds;
}
public String getMaterialModel() {
return materialModel;
}
public void setMaterialModel(String materialModel) {
this.materialModel = materialModel;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

11
ruoyi-admin/src/main/java/com/ruoyi/quality/domain/QualityRefundsExchangesOrder.java
View File

@ -85,6 +85,9 @@ public class QualityRefundsExchangesOrder extends BaseEntity
@Excel(name = "不合格报告url")
private String unqualifiedReportUrl;
/** 是否退回供应商 */
private String isReturnedToSupplier;
public void setQualityRefundsExchangesOrderId(Long qualityRefundsExchangesOrderId)
{
this.qualityRefundsExchangesOrderId = qualityRefundsExchangesOrderId;
@ -239,6 +242,14 @@ public class QualityRefundsExchangesOrder extends BaseEntity
return unqualifiedReportUrl;
}
public String getIsReturnedToSupplier() {
return isReturnedToSupplier;
}
public void setIsReturnedToSupplier(String isReturnedToSupplier) {
this.isReturnedToSupplier = isReturnedToSupplier;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

6
ruoyi-admin/src/main/java/com/ruoyi/quality/mapper/QualityRefundsExchangesMapper.java
View File

@ -80,4 +80,10 @@ public interface QualityRefundsExchangesMapper
public String findMaxRoundCode(@Param("prefix") String prefix);
public List<QualityRefundsExchanges> selectQualityRefundsExchangesByCodes(String[] refundsExchangesCodes);
/**
* 查询品质管理退换货单
*/
public QualityRefundsExchanges selectQualityRefundsExchangesByCode(String refundsExchangesCode);
}

166
ruoyi-admin/src/main/java/com/ruoyi/quality/service/impl/QualityRefundsExchangesServiceImpl.java
View File

@ -9,8 +9,10 @@ import com.ruoyi.common.exception.BusinessException;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.ShiroUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.quality.domain.QualityOrderDetail;
import com.ruoyi.quality.domain.QualityRefundsExchangesDetail;
import com.ruoyi.quality.domain.QualityRefundsExchangesUnqualified;
import com.ruoyi.quality.domain.VO.QualityOrderReportVO;
import com.ruoyi.quality.domain.VO.QualityRefundsExchangesExportVO;
import com.ruoyi.quality.mapper.QualityRefundsExchangesDetailMapper;
import com.ruoyi.quality.mapper.QualityRefundsExchangesUnqualifiedMapper;
@ -140,36 +142,26 @@ public class QualityRefundsExchangesServiceImpl implements IQualityRefundsExchan
qualityRefundsExchanges.setCreateTime(DateUtils.getNowDate());
qualityRefundsExchanges.setQualityReturnNode("1");
qualityRefundsExchanges.setRefundsExchangesStatus("0");
qualityRefundsExchanges.setQualityPurchaseStatus("0");
// 生成入库单
WarehouseStorageOrder warehouseStorageOrder = generateWarehouseStorageOrder(qualityRefundsExchanges);
warehouseStorageOrder.setWarehouseStorageCode(redisCache.generateBillNo("RK"));
warehouseStorageOrderMapper.insertWarehouseStorageOrder(warehouseStorageOrder);
List<WarehouseStorageOrderDetail> warehouseStorageOrderDetails = createWarehouseStorageDetail(qualityRefundsExchanges,warehouseStorageOrder.getWarehouseStorageCode());
warehouseStorageOrderMapper.batchWarehouseStorageOrderDetail(warehouseStorageOrderDetails);
qualityRefundsExchanges.setQualityWarehouseStatus("1");
qualityRefundsExchanges.setInStorageCode(warehouseStorageOrder.getWarehouseStorageCode());
qualityRefundsExchangesMapper.insertQualityRefundsExchanges(qualityRefundsExchanges);
return 1;
qualityRefundsExchanges.setQualityWarehouseStatus("0");
return qualityRefundsExchangesMapper.insertQualityRefundsExchanges(qualityRefundsExchanges);
}
// 生成退换货入库单对象
public WarehouseStorageOrder generateWarehouseStorageOrder(QualityRefundsExchanges qualityRefundsExchanges){
WarehouseStorageOrder warehouseStorageOrder = new WarehouseStorageOrder();
warehouseStorageOrder.setRelatedOrderCode(qualityRefundsExchanges.getRefundsExchangesCode());
warehouseStorageOrder.setWarehouseStorageStatus("2");
warehouseStorageOrder.setWarehouseStorageType("3");
warehouseStorageOrder.setWarehouseOrderType("2");
warehouseStorageOrder.setWarehouseDeptType("0");
warehouseStorageOrder.setWarehouseQualityStatus("2");
warehouseStorageOrder.setWarehouseStorageStatus("2");//待入库
warehouseStorageOrder.setWarehouseStorageType("3");//公司退货
warehouseStorageOrder.setWarehouseOrderType("2");//退换货订单
warehouseStorageOrder.setWarehouseDeptType("0");//仓库
warehouseStorageOrder.setWarehouseQualityStatus("2");//全部品质
warehouseStorageOrder.setActualArrivedNum(qualityRefundsExchanges.getNumTotal());
warehouseStorageOrder.setNotifyArrivedNum(qualityRefundsExchanges.getNumTotal());
warehouseStorageOrder.setStorageNum(qualityRefundsExchanges.getNumTotal());
warehouseStorageOrder.setQualityQualifiedNum(0);
warehouseStorageOrder.setQualityUnqualifiedNum(qualityRefundsExchanges.getNumTotal());
warehouseStorageOrder.setDeliveryInspectionTime(qualityRefundsExchanges.getDeliveryInspectionTime());
warehouseStorageOrder.setQualityTime(qualityRefundsExchanges.getDeliveryInspectionTime());
warehouseStorageOrder.setQualityTime(qualityRefundsExchanges.getQualityTime());
warehouseStorageOrder.setCreateBy(ShiroUtils.getLoginName());
warehouseStorageOrder.setCreateTime(DateUtils.getNowDate());
return warehouseStorageOrder;
@ -179,30 +171,38 @@ public class QualityRefundsExchangesServiceImpl implements IQualityRefundsExchan
List<WarehouseStorageOrderDetail> detailList = new ArrayList<>();
List<QualityRefundsExchangesDetail> exchangesDetails = qualityRefundsExchanges.getRefundsExchangesDetails();
if(StringUtils.isEmpty(exchangesDetails)){
log.warn("退换货详情物料数据为空:{}",qualityRefundsExchanges.getRefundsExchangesCode());
}else {
for (QualityRefundsExchangesDetail exchangeDetail:exchangesDetails) {
WarehouseStorageOrderDetail warehouseStorageOrderDetail = new WarehouseStorageOrderDetail();
warehouseStorageOrderDetail.setWarehouseStorageCode(warehouseStorageCode);
warehouseStorageOrderDetail.setRelatedOrderCode(qualityRefundsExchanges.getRefundsExchangesCode());
warehouseStorageOrderDetail.setWarehouseStorageStatus("2");
warehouseStorageOrderDetail.setWarehouseStorageType("3");
warehouseStorageOrderDetail.setWarehouseOrderType("2");
warehouseStorageOrderDetail.setWarehouseDeptType("0");
warehouseStorageOrderDetail.setMaterialNo(exchangeDetail.getMaterialNo());
warehouseStorageOrderDetail.setMaterialName(exchangeDetail.getMaterialName());
warehouseStorageOrderDetail.setMaterialType(exchangeDetail.getMaterialType());
warehouseStorageOrderDetail.setMaterialPhotourl(exchangeDetail.getMaterialPhotourl());
warehouseStorageOrderDetail.setMaterialBrand(exchangeDetail.getMaterialBrand());
warehouseStorageOrderDetail.setMaterialUnit(exchangeDetail.getMaterialUnit());
warehouseStorageOrderDetail.setMaterialDescribe(exchangeDetail.getMaterialDescribe());
warehouseStorageOrderDetail.setMaterialProcessMethod(exchangeDetail.getMaterialProcessMethod());
warehouseStorageOrderDetail.setMaterialDeptType("0");
warehouseStorageOrderDetail.setRefundsExchangesNum(exchangeDetail.getRefundsExchangesNum());
warehouseStorageOrderDetail.setCreateBy(ShiroUtils.getLoginName());
warehouseStorageOrderDetail.setCreateTime(DateUtils.getNowDate());
detailList.add(warehouseStorageOrderDetail);
}
throw new BusinessException("退换货详情物料数据为空");
}
for (QualityRefundsExchangesDetail exchangeDetail:exchangesDetails) {
WarehouseStorageOrderDetail storageOrderDetail = new WarehouseStorageOrderDetail();
storageOrderDetail.setWarehouseStorageCode(warehouseStorageCode);
storageOrderDetail.setRelatedOrderCode(qualityRefundsExchanges.getRefundsExchangesCode());
storageOrderDetail.setWarehouseStorageStatus("2");//待入库
storageOrderDetail.setWarehouseStorageType("3");//公司退货
storageOrderDetail.setWarehouseOrderType("2");//退换货订单
storageOrderDetail.setWarehouseDeptType("0");//仓库
storageOrderDetail.setMaterialNo(exchangeDetail.getMaterialNo());
storageOrderDetail.setMaterialName(exchangeDetail.getMaterialName());
storageOrderDetail.setMaterialType(exchangeDetail.getMaterialType());
storageOrderDetail.setMaterialPhotourl(exchangeDetail.getMaterialPhotourl());
storageOrderDetail.setMaterialBrand(exchangeDetail.getMaterialBrand());
storageOrderDetail.setMaterialUnit(exchangeDetail.getMaterialUnit());
storageOrderDetail.setMaterialModel(exchangeDetail.getMaterialModel());
storageOrderDetail.setMaterialDescribe(exchangeDetail.getMaterialDescribe());
storageOrderDetail.setMaterialProcessMethod(exchangeDetail.getMaterialProcessMethod());
storageOrderDetail.setMaterialDeptType("0");
storageOrderDetail.setNotifyArriveNum(exchangeDetail.getQualityUnqualifiedNum());
storageOrderDetail.setNotifyHasArrivedNum(exchangeDetail.getQualityUnqualifiedNum());
storageOrderDetail.setHasStorageNum(0);
storageOrderDetail.setSupplierCode(exchangeDetail.getSupplierCode());
storageOrderDetail.setSupplierName(exchangeDetail.getSupplierName());
storageOrderDetail.setSupplierAddress(exchangeDetail.getSupplierAddress());
storageOrderDetail.setContactNumber(exchangeDetail.getContactNumber());
storageOrderDetail.setCustomerContact(exchangeDetail.getCustomerContact());
storageOrderDetail.setRefundsExchangesNum(exchangeDetail.getQualityUnqualifiedNum());
storageOrderDetail.setCreateBy(ShiroUtils.getLoginName());
storageOrderDetail.setCreateTime(DateUtils.getNowDate());
detailList.add(storageOrderDetail);
}
return detailList;
}
@ -299,19 +299,32 @@ public class QualityRefundsExchangesServiceImpl implements IQualityRefundsExchan
if(CollectionUtils.isEmpty(details)){
throw new BusinessException("退换货详情为空！");
}
QualityRefundsExchangesDetail exchangeDetail = details.get(0);
refundsExchanges.setRefundsExchangesDetails(details);
WarehouseOutOrder warehouseOutOrder = generateWarehouseOutOrder(refundsExchanges);
int insertOutResult = warehouseOutOrderMapper.insertWarehouseOutOrder(warehouseOutOrder);
if(insertOutResult<=0){
throw new BusinessException("新增退换货出库单失败！");
//生成入库单
WarehouseStorageOrder warehouseStorageOrder = generateWarehouseStorageOrder(refundsExchanges);
warehouseStorageOrder.setWarehouseStorageCode(redisCache.generateBillNo("RK"));
warehouseStorageOrder.setSupplierCode(exchangeDetail.getSupplierCode());
warehouseStorageOrder.setSupplierName(exchangeDetail.getSupplierName());
warehouseStorageOrder.setCustomerContact(exchangeDetail.getCustomerContact());
warehouseStorageOrder.setContactNumber(exchangeDetail.getContactNumber());
warehouseStorageOrder.setSupplierAddress(exchangeDetail.getSupplierAddress());
warehouseStorageOrder.setIsReturnedToSupplier(qualityRefundsExchanges.getIsReturnedToSupplier());
int storageResult = warehouseStorageOrderMapper.insertWarehouseStorageOrder(warehouseStorageOrder);
if(storageResult<=0){
throw new BusinessException("新增退换货入库单失败！");
}
qualityRefundsExchanges.setQualityWarehouseStatus("2");
String loginName = ShiroUtils.getLoginName();
qualityRefundsExchanges.setUpdateBy(loginName);
qualityRefundsExchanges.setUpdateTime(DateUtils.getNowDate());
List<WarehouseStorageOrderDetail> warehouseStorageOrderDetails = createWarehouseStorageDetail(refundsExchanges,warehouseStorageOrder.getWarehouseStorageCode());
int storageDetailResult = warehouseStorageOrderMapper.batchWarehouseStorageOrderDetail(warehouseStorageOrderDetails);
if(storageDetailResult<=0){
throw new BusinessException("新增退换货入库单详情失败！");
}
refundsExchanges.setQualityWarehouseStatus("0");//待入库
refundsExchanges.setQualityPurchaseStatus("1");//已确认
refundsExchanges.setIsReturnedToSupplier(qualityRefundsExchanges.getIsReturnedToSupplier());
refundsExchanges.setUpdateBy(ShiroUtils.getLoginName());
refundsExchanges.setUpdateTime(DateUtils.getNowDate());
int updateResult = qualityRefundsExchangesMapper.updateQualityRefundsExchanges(qualityRefundsExchanges);
return updateResult;
}
@ -324,46 +337,33 @@ public class QualityRefundsExchangesServiceImpl implements IQualityRefundsExchan
String loginName = ShiroUtils.getLoginName();
List<QualityRefundsExchangesDetail> refundsExchangesDetails = qualityRefundsExchanges.getRefundsExchangesDetails();
if (StringUtils.isEmpty(refundsExchangesDetails)){
log.warn("退款换货单[{}]无关联的物料详情信息", qualityRefundsExchanges.getRefundsExchangesCode());
}
List<WarehouseStorageOrderDetail> warehouseStorageOrderDetailList = warehouseStorageOrderDetailMapper.selectStorageOrderDetailListByCode(qualityRefundsExchanges.getInStorageCode());
if (StringUtils.isEmpty(warehouseStorageOrderDetailList)){
log.warn("退款换货单[{}]无关联的入库单详情信息", qualityRefundsExchanges.getRefundsExchangesCode());
throw new BusinessException("退换货物料详情为空");
}
int updateRows = 0;
for (QualityRefundsExchangesDetail refundsExchangesDetail : refundsExchangesDetails) {
refundsExchangesDetail.setUpdateBy(loginName);
refundsExchangesDetail.setUpdateTime(DateUtils.getNowDate());
for (WarehouseStorageOrderDetail storageOrderDetail:warehouseStorageOrderDetailList) {
if(storageOrderDetail.getMaterialNo().equals(refundsExchangesDetail.getMaterialNo())){
storageOrderDetail.setSupplierCode(refundsExchangesDetail.getSupplierCode());
storageOrderDetail.setSupplierName(refundsExchangesDetail.getSupplierName());
storageOrderDetail.setSupplierAddress(refundsExchangesDetail.getSupplierAddress());
storageOrderDetail.setCustomerContact(refundsExchangesDetail.getCustomerContact());
storageOrderDetail.setContactNumber(refundsExchangesDetail.getContactNumber());
storageOrderDetail.setUpdateBy(loginName);
storageOrderDetail.setUpdateTime(DateUtils.getNowDate());
warehouseStorageOrderDetailMapper.updateWarehouseStorageOrderDetail(storageOrderDetail);
}
}
//更新数据库记录
updateRows += refundsExchangesDetailMapper.updateQualityRefundsExchangesDetail(refundsExchangesDetail);
}
WarehouseOutOrder warehouseOutOrder = generateWarehouseOutOrder(qualityRefundsExchanges);
int insertOutResult = warehouseOutOrderMapper.insertWarehouseOutOrder(warehouseOutOrder);
if(insertOutResult<=0){
throw new BusinessException("新增退换货出库单失败！");
QualityRefundsExchanges oldRefundsExchange = qualityRefundsExchangesMapper.selectQualityRefundsExchangesByCode(qualityRefundsExchanges.getRefundsExchangesCode());
//生成入库单
WarehouseStorageOrder warehouseStorageOrder = generateWarehouseStorageOrder(oldRefundsExchange);
warehouseStorageOrder.setWarehouseStorageCode(redisCache.generateBillNo("RK"));
warehouseStorageOrder.setIsReturnedToSupplier(qualityRefundsExchanges.getIsReturnedToSupplier());
int storageResult = warehouseStorageOrderMapper.insertWarehouseStorageOrder(warehouseStorageOrder);
if(storageResult<=0){
throw new BusinessException("新增退换货入库单失败！");
}
List<WarehouseStorageOrderDetail> warehouseStorageOrderDetails = createWarehouseStorageDetail(qualityRefundsExchanges,warehouseStorageOrder.getWarehouseStorageCode());
int storageDetailResult = warehouseStorageOrderMapper.batchWarehouseStorageOrderDetail(warehouseStorageOrderDetails);
if(storageDetailResult<=0){
throw new BusinessException("新增退换货入库单详情失败！");
}
qualityRefundsExchanges.setQualityPurchaseStatus("1");
qualityRefundsExchanges.setUpdateBy(loginName);
qualityRefundsExchanges.setUpdateTime(DateUtils.getNowDate());
qualityRefundsExchanges.setOutStorageCode(warehouseOutOrder.getOutOrderCode());
int updateResult = qualityRefundsExchangesMapper.updateQualityRefundsExchanges(qualityRefundsExchanges);
if(updateResult<=0){
throw new BusinessException("更新退换货订单失败！");
@ -378,6 +378,7 @@ public class QualityRefundsExchangesServiceImpl implements IQualityRefundsExchan
warehouseOutOrder.setWarehouseOutStatus("4");//出库状态：待出库
warehouseOutOrder.setWarehouseOrderType("4");//出库订单类型：退换货订单
warehouseOutOrder.setWarehouseOutType("4");//出库类型：公司退货
warehouseOutOrder.setOutOrderSum(0);
warehouseOutOrder.setRelatedOrderCode(refundsExchanges.getRefundsExchangesCode());
warehouseOutOrder.setBusinessName(ShiroUtils.getLoginName());
warehouseOutOrder.setMaterialSum(refundsExchanges.getMaterialTotal());
@ -389,7 +390,7 @@ public class QualityRefundsExchangesServiceImpl implements IQualityRefundsExchan
int insertResult = 0;
List<QualityRefundsExchangesDetail> refundsExchangesDetails = refundsExchanges.getRefundsExchangesDetails();
if(CollectionUtils.isEmpty(refundsExchangesDetails)){
throw new BusinessException("新增出库单详情失败！退换货详情数据为空！");
throw new BusinessException("退换货详情数据为空！");
}
for (QualityRefundsExchangesDetail detail:refundsExchangesDetails) {
insertResult += generateWarehouseOutOrderDetail(detail,outOrderCode);
@ -415,6 +416,7 @@ public class QualityRefundsExchangesServiceImpl implements IQualityRefundsExchan
outOrderDetail.setMaterialBrand(exchangeDetail.getMaterialBrand());
outOrderDetail.setMaterialUnit(exchangeDetail.getMaterialUnit());
outOrderDetail.setMaterialDescribe(exchangeDetail.getMaterialDescribe());
outOrderDetail.setMaterialModel(exchangeDetail.getMaterialModel());
outOrderDetail.setMaterialProcessMethod(exchangeDetail.getMaterialProcessMethod());
outOrderDetail.setMaterialSum(exchangeDetail.getMaterialTotal());
outOrderDetail.setEnterpriseSum(exchangeDetail.getNumTotal());

14
ruoyi-admin/src/main/resources/mapper/quality/QualityRefundsExchangesDetailMapper.xml
View File

@ -29,6 +29,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="materialUnit" column="material_unit" />
<result property="materialDescribe" column="material_describe" />
<result property="materialProcessMethod" column="material_process_method" />
<result property="materialModel" column="material_model" />
<result property="refundsExchangesNum" column="refunds_exchanges_num" />
<result property="qualityUnqualifiedNum" column="quality_unqualified_num" />
<result property="deliveryInspectionTime" column="delivery_inspection_time" />
@ -42,7 +43,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
<sql id="selectQualityRefundsExchangesDetailVo">
select refunds_exchanges_detail_id, refunds_exchanges_code, refunds_exchanges_status, quality_warehouse_status, quality_purchase_status, quality_delivery_status , related_order_code, in_storage_code, quality_return_node, material_total, num_total, supplier_code, supplier_name, customer_contact, contact_number, supplier_address, material_no, material_name, material_type, material_photoUrl, material_brand, material_unit, material_describe, material_process_method, refunds_exchanges_num, quality_unqualified_num ,delivery_inspection_time, inspection_time ,quality_remark, remark, create_by, create_time, update_by, update_time from quality_refunds_exchanges_detail
select refunds_exchanges_detail_id, refunds_exchanges_code, refunds_exchanges_status,
quality_warehouse_status, quality_purchase_status, quality_delivery_status ,
related_order_code, in_storage_code, quality_return_node, material_total,
num_total, supplier_code, supplier_name, customer_contact, contact_number,
supplier_address, material_no, material_name, material_type, material_photoUrl,
material_brand, material_unit, material_describe, material_process_method, material_model,
refunds_exchanges_num, quality_unqualified_num ,delivery_inspection_time, inspection_time,
quality_remark, remark, create_by, create_time, update_by, update_time
from quality_refunds_exchanges_detail
</sql>
<select id="selectQualityRefundsExchangesDetailList" parameterType="QualityRefundsExchangesDetail" resultMap="QualityRefundsExchangesDetailResult">
@ -95,6 +104,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="materialUnit != null">material_unit,</if>
<if test="materialDescribe != null">material_describe,</if>
<if test="materialProcessMethod != null">material_process_method,</if>
<if test="materialModel != null">material_model,</if>
<if test="refundsExchangesNum != null">refunds_exchanges_num,</if>
<if test="qualityUnqualifiedNum != null">quality_unqualified_num,</if>
<if test="deliveryInspectionTime != null">delivery_inspection_time,</if>
@ -130,6 +140,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="materialUnit != null">#{materialUnit},</if>
<if test="materialDescribe != null">#{materialDescribe},</if>
<if test="materialProcessMethod != null">#{materialProcessMethod},</if>
<if test="materialModel != null">#{materialModel},</if>
<if test="refundsExchangesNum != null">#{refundsExchangesNum},</if>
<if test="qualityUnqualifiedNum != null">#{qualityUnqualifiedNum},</if>
<if test="deliveryInspectionTime != null">#{deliveryInspectionTime},</if>
@ -169,6 +180,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="materialUnit != null">material_unit = #{materialUnit},</if>
<if test="materialDescribe != null">material_describe = #{materialDescribe},</if>
<if test="materialProcessMethod != null">material_process_method = #{materialProcessMethod},</if>
<if test="materialModel != null">material_model = #{materialModel},</if>
<if test="refundsExchangesNum != null">refunds_exchanges_num = #{refundsExchangesNum},</if>
<if test="qualityUnqualifiedNum != null">quality_unqualified_num = #{qualityUnqualifiedNum},</if>
<if test="deliveryInspectionTime != null">delivery_inspection_time = #{deliveryInspectionTime},</if>

23
ruoyi-admin/src/main/resources/mapper/quality/QualityRefundsExchangesMapper.xml
View File

@ -20,6 +20,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="numTotal" column="num_total" />
<result property="deliveryInspectionTime" column="delivery_inspection_time" />
<result property="qualityRemark" column="quality_remark" />
<result property="qualityTime" column="quality_time" />
<result property="isReturnedToSupplier" column="is_returned_to_supplier" />
<result property="remark" column="remark" />
<result property="createBy" column="create_by" />
<result property="createTime" column="create_time" />
@ -28,7 +30,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
<sql id="selectQualityRefundsExchangesVo">
select refunds_exchanges_id, refunds_exchanges_code, refunds_exchanges_status, quality_warehouse_status, quality_purchase_status, quality_delivery_status ,related_order_code, in_storage_code, out_storage_code, warehouse_storage_type ,quality_return_node, material_total, num_total, delivery_inspection_time, quality_remark, remark, create_by, create_time, update_by, update_time from quality_refunds_exchanges
select refunds_exchanges_id, refunds_exchanges_code, refunds_exchanges_status,
quality_warehouse_status, quality_purchase_status, quality_delivery_status,
related_order_code, in_storage_code, out_storage_code, warehouse_storage_type ,
quality_return_node, material_total, num_total, delivery_inspection_time,
quality_remark, remark, create_by, create_time, update_by, update_time,
quality_time, is_returned_to_supplier
from quality_refunds_exchanges
</sql>
<select id="selectQualityRefundsExchangesList" parameterType="QualityRefundsExchanges" resultMap="QualityRefundsExchangesResult">
@ -44,6 +52,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="createTime != null "> and create_time = #{createTime}</if>
<if test="params.beginCreateTime != null and params.beginCreateTime != '' and params.endCreateTime != null and params.endCreateTime != ''"> and create_time between #{params.beginCreateTime} and #{params.endCreateTime}</if>
</where>
order by create_time desc
</select>
<select id="selectQualityRefundsExchangesById" parameterType="Long" resultMap="QualityRefundsExchangesResult">
@ -68,6 +77,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="numTotal != null">num_total,</if>
<if test="deliveryInspectionTime != null">delivery_inspection_time,</if>
<if test="qualityRemark != null">quality_remark,</if>
<if test="qualityTime != null">quality_time,</if>
<if test="isReturnedToSupplier != null">is_returned_to_supplier,</if>
<if test="remark != null">remark,</if>
<if test="createBy != null">create_by,</if>
<if test="createTime != null">create_time,</if>
@ -89,6 +100,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="numTotal != null">#{numTotal},</if>
<if test="deliveryInspectionTime != null">#{deliveryInspectionTime},</if>
<if test="qualityRemark != null">#{qualityRemark},</if>
<if test="qualityTime != null">#{qualityTime},</if>
<if test="isReturnedToSupplier != null">#{isReturnedToSupplier},</if>
<if test="remark != null">#{remark},</if>
<if test="createBy != null">#{createBy},</if>
<if test="createTime != null">#{createTime},</if>
@ -114,6 +127,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="numTotal != null">num_total = #{numTotal},</if>
<if test="deliveryInspectionTime != null">delivery_inspection_time = #{deliveryInspectionTime},</if>
<if test="qualityRemark != null">quality_remark = #{qualityRemark},</if>
<if test="qualityTime != null">quality_time = #{qualityTime},</if>
<if test="isReturnedToSupplier != null">is_returned_to_supplier = #{isReturnedToSupplier},</if>
<if test="remark != null">remark = #{remark},</if>
<if test="createBy != null">create_by = #{createBy},</if>
<if test="createTime != null">create_time = #{createTime},</if>
@ -154,4 +169,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{refundsExchangesCode}
</foreach>
</select>
<select id="selectQualityRefundsExchangesByCode" parameterType="String" resultMap="QualityRefundsExchangesResult">
<include refid="selectQualityRefundsExchangesVo"/>
where refunds_exchanges_code = #{refundsExchangesCode}
</select>
</mapper>

7
ruoyi-admin/src/main/resources/mapper/quality/QualityRefundsExchangesOrderMapper.xml
View File

@ -30,7 +30,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
<sql id="selectQualityRefundsExchangesOrderVo">
select quality_refunds_exchanges_order_id, refunds_exchanges_code, supplier_code, supplier_name, material_no, material_name, make_total, quality_hasqualified_num, ok_accepted_num, ok_report_url, special_concessions_num, special_report_url, checkout_completion_time, process_bad_classification, process_bad_grade, process_bad_num, unqualified_report_url, remark, create_by, create_time, update_by, update_time from quality_refunds_exchanges_order
select quality_refunds_exchanges_order_id, refunds_exchanges_code, supplier_code,
supplier_name, material_no, material_name, make_total, quality_hasqualified_num,
ok_accepted_num, ok_report_url, special_concessions_num, special_report_url,
checkout_completion_time, process_bad_classification, process_bad_grade,
process_bad_num, unqualified_report_url, remark, create_by, create_time, update_by,
update_time from quality_refunds_exchanges_order
</sql>
<select id="selectQualityRefundsExchangesOrderList" parameterType="QualityRefundsExchangesOrder" resultMap="QualityRefundsExchangesOrderResult">

Write Preview
Loading…
Cancel
Save