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

[fix] 售后管理 

修改售后单查询选择设备列表后端接口
修改售后单派单前端列表字段，修复派单前端客户要求出发日期时间类型不正确问题
修改售后单上传报告前端列表字段，修复上传报告前端客户要求出发日期时间类型不正确问题
修改售后单详情页面前端列表字段，修复详情页面前端客户要求出发日期时间类型不正确问题
dev
liuxiaoxu 7 months ago
parent
c0e25e2b5f
commit
3ea2b755af
6 changed files with 61 additions and 76 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. 6
      ruoyi-admin/src/main/java/com/ruoyi/aftersales/controller/AftersalesOrderController.java
  2. 4
      ruoyi-admin/src/main/java/com/ruoyi/aftersales/service/IAfterSalesShippingDeviceService.java
  3. 31
      ruoyi-admin/src/main/java/com/ruoyi/aftersales/service/impl/AfterSalesShippingDeviceServiceImpl.java
  4. 38
      ruoyi-admin/src/main/resources/templates/aftersales/aftersalesOrder/detail.html
  5. 30
      ruoyi-admin/src/main/resources/templates/aftersales/aftersalesOrder/sendOrders.html
  6. 28
      ruoyi-admin/src/main/resources/templates/aftersales/aftersalesOrder/uploadReport.html

6
ruoyi-admin/src/main/java/com/ruoyi/aftersales/controller/AftersalesOrderController.java
View File

@ -6,6 +6,7 @@ import com.ruoyi.aftersales.domain.vo.SelectDeviceVO;
import com.ruoyi.aftersales.service.IAfterSalesShippingDeviceService;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.process.general.service.IProcessService;
import com.ruoyi.sales.domain.SalesAftersalesNoticeDetail;
import com.ruoyi.system.service.ISysUserService;
import org.activiti.engine.RuntimeService;
import org.activiti.engine.TaskService;
@ -200,15 +201,14 @@ public class AftersalesOrderController extends BaseController
/**
* 查询选择设备列表
* 查询售后通知单详情选择设备列表
*/
@PostMapping("/optionDevices")
@ResponseBody
public TableDataInfo optionDevices(AftersalesOrder aftersalesOrder)
{
startPage();
List<SelectDeviceVO> list = afterSalesShippingDeviceService.selectOptionDevices(aftersalesOrder.getMakeNo());
List<SalesAftersalesNoticeDetail> list = afterSalesShippingDeviceService.selectOptionDevices(aftersalesOrder.getAftersalesOrderCode());
return getDataTable(list);
}

4
ruoyi-admin/src/main/java/com/ruoyi/aftersales/service/IAfterSalesShippingDeviceService.java
View File

@ -7,6 +7,8 @@ import com.ruoyi.aftersales.domain.dto.AfterSalesMakeOrderDto;
import com.ruoyi.aftersales.domain.dto.AfterSalesShippingDeviceEditDto;
import com.ruoyi.aftersales.domain.dto.WarehouseAndAfterSalesDto;
import com.ruoyi.aftersales.domain.vo.SelectDeviceVO;
import com.ruoyi.sales.domain.SalesAftersalesNotice;
import com.ruoyi.sales.domain.SalesAftersalesNoticeDetail;
import com.ruoyi.system.dto.SysEquipDetailDto;
/**
@ -93,7 +95,7 @@ public interface IAfterSalesShippingDeviceService
* @param makeNo 生产单号
* @return
*/
List<SelectDeviceVO> selectOptionDevices(String makeNo);
List<SalesAftersalesNoticeDetail> selectOptionDevices(String aftersalesOrderCode);
/*

31
ruoyi-admin/src/main/java/com/ruoyi/aftersales/service/impl/AfterSalesShippingDeviceServiceImpl.java
View File

@ -13,6 +13,9 @@ import com.ruoyi.aftersales.mapper.AftersalesComplaintNoticeMapper;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.ShiroUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.sales.domain.SalesAftersalesNotice;
import com.ruoyi.sales.domain.SalesAftersalesNoticeDetail;
import com.ruoyi.sales.mapper.SalesAftersalesNoticeDetailMapper;
import com.ruoyi.system.dto.SysEquipDetailDto;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -38,6 +41,9 @@ public class AfterSalesShippingDeviceServiceImpl implements IAfterSalesShippingD
@Autowired
private AftersalesComplaintNoticeMapper aftersalesComplaintNoticeMapper;
@Autowired
private SalesAftersalesNoticeDetailMapper aftersalesNoticeDetailMapper;
/**
* 查询出货设备
*
@ -197,28 +203,9 @@ public class AfterSalesShippingDeviceServiceImpl implements IAfterSalesShippingD
* 查询选择设备列表
* */
@Override
public List<SelectDeviceVO> selectOptionDevices(String makeNo) {
List<SelectDeviceVO> selectDeviceVos = new ArrayList<>();
SelectDeviceVO selectDeviceVo = new SelectDeviceVO();
AfterSalesShippingDevice afterSalesShippingDevice = afterSalesShippingDeviceMapper.selectShippingDeviceByMakeNo(makeNo);
if (StringUtils.isNotNull(afterSalesShippingDevice)){
selectDeviceVo.setMaterialNo(afterSalesShippingDevice.getMaterialNo());
selectDeviceVo.setMaterialPhotourl(afterSalesShippingDevice.getMaterialPhotourl());
selectDeviceVo.setMaterialName(afterSalesShippingDevice.getMaterialName());
selectDeviceVo.setMaterialType(afterSalesShippingDevice.getMaterialType());
selectDeviceVo.setMaterialUnit(afterSalesShippingDevice.getMaterialUnit());
selectDeviceVo.setMaterialBrand(afterSalesShippingDevice.getMaterialBrand());
selectDeviceVo.setMaterialDescribe(afterSalesShippingDevice.getMaterialDescribe());
selectDeviceVo.setSnCode(afterSalesShippingDevice.getSnCode());
}
AftersalesComplaintNotice aftersalesComplaintNotice = aftersalesComplaintNoticeMapper.selectComplaintNoticeByMakeNo(makeNo);
if (StringUtils.isNotNull(aftersalesComplaintNotice)){
selectDeviceVo.setComplaintProblem(aftersalesComplaintNotice.getRemark());
}
selectDeviceVos.add(selectDeviceVo);
return selectDeviceVos;
public List<SalesAftersalesNoticeDetail> selectOptionDevices(String aftersalesOrderCode) {
List<SalesAftersalesNoticeDetail> salesAftersalesNoticeDetails = aftersalesNoticeDetailMapper.selectSalesAftersalesNoticeDetailListByCode(aftersalesOrderCode);
return salesAftersalesNoticeDetails;
}
/*

38
ruoyi-admin/src/main/resources/templates/aftersales/aftersalesOrder/detail.html
View File

@ -54,10 +54,10 @@
</div>
</div>
<div class="form-group">
<label class="col-sm-4 control-label">客户要求出发日期：</label>
<label class="col-sm-3 control-label">客户要求出发日期：</label>
<div class="col-sm-8">
<div class="input-group date">
<input name="startDate" class="form-control" th:value="*{startDate}" placeholder="yyyy-mm-dd" type="text" readonly>
<input name="startDate" th:value="${#dates.format(detail.startDate, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text">
<span class="input-group-addon"><i class="fa fa-calendar"></i></span>
</div>
</div>
@ -257,11 +257,6 @@
columns: [{
checkbox: true
},
{
title: '出货设备编号',
field: 'shippingDeviceCode',
visible: false
},
{
title: '料号',
field: 'materialNo',
@ -291,20 +286,23 @@
field: 'materialDescribe',
},
{
title: '流水号',
field: 'deviceRunningNumber',
title: '已出库数量',
field: 'shippedGoodsSum',
},
{
title: '生产图片',
field: 'makePhotourl',
title: '设备SN',
field: 'snCode',
},
{
title: 'SN号',
field: 'snCode',
title: '售后问题',
field: 'aftersalesProblem',
},
{
title: '售后图片',
field: 'aftersalesPhotourl',
title: '紧急程度',
field: 'emergencyDegree',
formatter: function(value, row, index) {
return $.table.selectDictLabel(emergencyDegreeDatas, value);
}
},
]
};
@ -324,11 +322,11 @@
}
}
// $("input[name='startDate']").datetimepicker({
// format: "yyyy-mm-dd",
// minView: "month",
// autoclose: true
// });
$("input[name='startDate']").datetimepicker({
format: "yyyy-mm-dd",
minView: "month",
autoclose: true
});
$(function() {
var options = {
url: prefix + "/optionDevices",

30
ruoyi-admin/src/main/resources/templates/aftersales/aftersalesOrder/sendOrders.html
View File

@ -52,14 +52,15 @@
</div>
</div>
<div class="form-group">
<label class="col-sm-4 control-label">客户要求出发日期：</label>
<label class="col-sm-3 control-label">客户要求出发日期：</label>
<div class="col-sm-8">
<div class="input-group date">
<input name="startDate" class="form-control" th:value="*{startDate}" placeholder="yyyy-mm-dd" type="text">
<input name="startDate" th:value="${#dates.format(sendOrders.startDate, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text">
<span class="input-group-addon"><i class="fa fa-calendar"></i></span>
</div>
</div>
</div>
<div class="form-group">
<label class="col-sm-4 control-label">备注：</label>
<div class="col-sm-8">
@ -109,6 +110,7 @@
autoclose: true
});
$(function() {
$('.summernote').each(function(i) {
$('#' + this.id).summernote({
@ -160,11 +162,6 @@
columns: [{
checkbox: true
},
{
title: '出货设备编号',
field: 'shippingDeviceCode',
visible: false
},
{
title: '料号',
field: 'materialNo',
@ -194,20 +191,23 @@
field: 'materialDescribe',
},
{
title: '流水号',
field: 'deviceRunningNumber',
title: '已出库数量',
field: 'shippedGoodsSum',
},
{
title: '生产图片',
field: 'makePhotourl',
title: '设备SN',
field: 'snCode',
},
{
title: 'SN号',
field: 'snCode',
title: '售后问题',
field: 'aftersalesProblem',
},
{
title: '售后图片',
field: 'aftersalesPhotourl',
title: '紧急程度',
field: 'emergencyDegree',
formatter: function(value, row, index) {
return $.table.selectDictLabel(emergencyDegreeDatas, value);
}
},
]
};

28
ruoyi-admin/src/main/resources/templates/aftersales/aftersalesOrder/uploadReport.html
View File

@ -54,10 +54,10 @@
</div>
</div>
<div class="form-group">
<label class="col-sm-4 control-label">客户要求出发日期：</label>
<label class="col-sm-3 control-label">客户要求出发日期：</label>
<div class="col-sm-8">
<div class="input-group date">
<input name="startDate" class="form-control" th:value="*{startDate}" placeholder="yyyy-mm-dd" type="text">
<input name="startDate" th:value="${#dates.format(uploadReport.startDate, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text">
<span class="input-group-addon"><i class="fa fa-calendar"></i></span>
</div>
</div>
@ -202,11 +202,6 @@
columns: [{
checkbox: true
},
{
title: '出货设备编号',
field: 'shippingDeviceCode',
visible: false
},
{
title: '料号',
field: 'materialNo',
@ -236,20 +231,23 @@
field: 'materialDescribe',
},
{
title: '流水号',
field: 'deviceRunningNumber',
title: '已出库数量',
field: 'shippedGoodsSum',
},
{
title: '生产图片',
field: 'makePhotourl',
title: '设备SN',
field: 'snCode',
},
{
title: 'SN号',
field: 'snCode',
title: '售后问题',
field: 'aftersalesProblem',
},
{
title: '售后图片',
field: 'aftersalesPhotourl',
title: '紧急程度',
field: 'emergencyDegree',
formatter: function(value, row, index) {
return $.table.selectDictLabel(emergencyDegreeDatas, value);
}
},
]
};

Write Preview
Loading…
Cancel
Save