Browse Source

[feat]

新增确认发货前端页面
修改取消发货前端页面,修改id为code字段
售后维护设备出库新增 通过出库单号修改售后维护设备出库后端方法
新增确认发货后端打开页面接口
新增确认发货后端修改保存接口:实现同时更改仓库出库单,销售出货通知单、售后维护设备出库单的出库状态为售后维护设备2
dev
liuxiaoxu 3 months ago
parent
commit
1cbaddd92e
  1. 10
      ruoyi-admin/src/main/java/com/ruoyi/aftersales/mapper/AftersalesOutOrderMapper.java
  2. 38
      ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysSalesShippingInformServiceImpl.java
  3. 46
      ruoyi-admin/src/main/resources/mapper/aftersales/AftersalesOutOrderMapper.xml
  4. 2
      ruoyi-admin/src/main/resources/templates/system/salesShippingInform/cancelShipping.html

10
ruoyi-admin/src/main/java/com/ruoyi/aftersales/mapper/AftersalesOutOrderMapper.java

@ -43,6 +43,16 @@ public interface AftersalesOutOrderMapper
*/
public int updateAftersalesOutOrder(AftersalesOutOrder aftersalesOutOrder);
/**
* 通过出库单号修改售后维护设备出库
*
* @param aftersalesOutOrder 售后维护设备出库
* @return 结果
*/
public int updateAftersalesOutOrderByOutOrderCode(AftersalesOutOrder aftersalesOutOrder);
/**
* 删除售后维护设备出库
*

38
ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysSalesShippingInformServiceImpl.java

@ -14,7 +14,9 @@ import com.alibaba.excel.util.MapUtils;
import com.alibaba.excel.write.metadata.WriteSheet;
import com.alibaba.excel.write.metadata.fill.FillConfig;
import com.ruoyi.aftersales.domain.AfterSalesShippingDevice;
import com.ruoyi.aftersales.domain.AftersalesOutOrder;
import com.ruoyi.aftersales.mapper.AfterSalesShippingDeviceMapper;
import com.ruoyi.aftersales.mapper.AftersalesOutOrderMapper;
import com.ruoyi.common.core.redis.RedisCache;
import com.ruoyi.common.exception.BusinessException;
import com.ruoyi.common.utils.DateUtils;
@ -79,6 +81,9 @@ public class SysSalesShippingInformServiceImpl implements ISysSalesShippingInfor
private SalesShippingInformationMapper salesShippingInformationMapper;
@Autowired
private AftersalesOutOrderMapper aftersalesOutOrderMapper;
/**
* 查询销售出货通知
@ -325,18 +330,31 @@ public class SysSalesShippingInformServiceImpl implements ISysSalesShippingInfor
warehouseOutOrder.setUpdateBy(loginName);
warehouseOutOrder.setUpdateTime(new Date());
//更新售后维护设备出库单数据
AftersalesOutOrder aftersalesOutOrder = new AftersalesOutOrder();
aftersalesOutOrder.setOutOrderCode(outOrderCode);
//设置出库状态为 待设备维护2
aftersalesOutOrder.setWarehouseOutStatus("3");
aftersalesOutOrder.setUpdateBy(loginName);
aftersalesOutOrder.setUpdateTime(new Date());
int updateAftersalesOutOrderResult = aftersalesOutOrderMapper.updateAftersalesOutOrderByOutOrderCode(aftersalesOutOrder);
if (updateAftersalesOutOrderResult <= 0){
throw new BusinessException("更新售后出库单数据失败");
}
//更新销售订单的出货状态
// SysSalesShippingInform tempShippingInform = sysSalesShippingInformMapper.selectSysSalesShippingInformByCode(outOrderCode);
SysSalesOrder sysSalesOrder = new SysSalesOrder();
sysSalesOrder.setUpdateBy(loginName);
sysSalesOrder.setUpdateTime(new Date());
sysSalesOrder.setSalesOrderCode(warehouseOutOrder.getSalesOrderCode());
//暂收设置为全部出货
sysSalesOrder.setDeliveryStatus("6");
int updateSysSalesOrderResult = sysSalesOrderMapper.updateSysSalesOrderBySalesOrderCode(sysSalesOrder);
if (updateSysSalesOrderResult <= 0){
throw new BusinessException("更新销售订单数据失败");
}
// SysSalesOrder sysSalesOrder = new SysSalesOrder();
// sysSalesOrder.setUpdateBy(loginName);
// sysSalesOrder.setUpdateTime(new Date());
// sysSalesOrder.setSalesOrderCode(warehouseOutOrder.getSalesOrderCode());
// //暂收设置为全部出货
// sysSalesOrder.setDeliveryStatus("6");
// int updateSysSalesOrderResult = sysSalesOrderMapper.updateSysSalesOrderBySalesOrderCode(sysSalesOrder);
// if (updateSysSalesOrderResult <= 0){
// throw new BusinessException("更新销售订单数据失败");
// }
int updateWarehouseOutOrderResult = warehouseOutOrderMapper.updateWarehouseOutOrder(warehouseOutOrder);
if (updateWarehouseOutOrderResult <= 0){

46
ruoyi-admin/src/main/resources/mapper/aftersales/AftersalesOutOrderMapper.xml

@ -190,6 +190,52 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
where out_order_id = #{outOrderId}
</update>
<update id="updateAftersalesOutOrderByOutOrderCode" parameterType="AftersalesOutOrder">
update aftersales_out_order
<trim prefix="SET" suffixOverrides=",">
<if test="outOrderCode != null">out_order_code = #{outOrderCode},</if>
<if test="makeNo != null">make_no = #{makeNo},</if>
<if test="warehouseOutStatus != null">warehouse_out_status = #{warehouseOutStatus},</if>
<if test="relatedOrderCode != null">related_order_code = #{relatedOrderCode},</if>
<if test="salesOrderCode != null">sales_order_code = #{salesOrderCode},</if>
<if test="warehouseOrderType != null">warehouse_order_type = #{warehouseOrderType},</if>
<if test="outMakeCode != null">out_make_code = #{outMakeCode},</if>
<if test="requisitioningCode != null">requisitioning_code = #{requisitioningCode},</if>
<if test="warehouseOutType != null">warehouse_out_type = #{warehouseOutType},</if>
<if test="businessName != null">business_name = #{businessName},</if>
<if test="aftersalesName != null">aftersales_name = #{aftersalesName},</if>
<if test="warehouseName != null">warehouse_name = #{warehouseName},</if>
<if test="shippingDeviceId != null">shipping_device_id = #{shippingDeviceId},</if>
<if test="materialNo != null">material_no = #{materialNo},</if>
<if test="materialName != null">material_name = #{materialName},</if>
<if test="materialSum != null">material_sum = #{materialSum},</if>
<if test="enterpriseSum != null">enterprise_sum = #{enterpriseSum},</if>
<if test="outOrderSum != null">out_order_sum = #{outOrderSum},</if>
<if test="outOrderName != null">out_order_name = #{outOrderName},</if>
<if test="outOrderTime != null">out_order_time = #{outOrderTime},</if>
<if test="supplierCode != null">supplier_code = #{supplierCode},</if>
<if test="supplierName != null">supplier_name = #{supplierName},</if>
<if test="customerId != null">customer_id = #{customerId},</if>
<if test="customerName != null">customer_name = #{customerName},</if>
<if test="planDeliveryTime != null">plan_delivery_time = #{planDeliveryTime},</if>
<if test="deliveryDate != null">delivery_date = #{deliveryDate},</if>
<if test="deliveryCondition != null">delivery_condition = #{deliveryCondition},</if>
<if test="applyName != null">apply_name = #{applyName},</if>
<if test="deliveryAddress != null">delivery_address = #{deliveryAddress},</if>
<if test="deliveryName != null">delivery_name = #{deliveryName},</if>
<if test="deliveryNumber != null">delivery_number = #{deliveryNumber},</if>
<if test="remark != null">remark = #{remark},</if>
<if test="createBy != null">create_by = #{createBy},</if>
<if test="createTime != null">create_time = #{createTime},</if>
<if test="updateBy != null">update_by = #{updateBy},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>
</trim>
where out_order_code = #{outOrderCode}
</update>
<delete id="deleteAftersalesOutOrderById" parameterType="Long">
delete from aftersales_out_order where out_order_id = #{outOrderId}
</delete>

2
ruoyi-admin/src/main/resources/templates/system/salesShippingInform/cancelShipping.html

@ -7,7 +7,7 @@
<body class="white-bg">
<div class="wrapper wrapper-content animated fadeInRight ibox-content">
<form class="form-horizontal" id="form-cancelShipping-edit" th:object="${sysSalesShippingInform}">
<input name="shippingInformId" th:field="*{shippingInformId}" type="hidden">
<input name="outOrderCode" th:field="*{outOrderCode}" type="hidden">
<div class="form-group">
<label class="col-sm-3 control-label is-required">备注:</label>
<div class="col-sm-8">

Loading…
Cancel
Save