zhangsiqi
6 months ago
12 changed files with 2276 additions and 0 deletions
@ -0,0 +1,188 @@ |
|||||
|
package com.ruoyi.quality.controller; |
||||
|
|
||||
|
import com.ruoyi.aftersales.domain.AftersalesComplaintNotice; |
||||
|
import com.ruoyi.aftersales.domain.AftersalesComplaintNoticeDetail; |
||||
|
import com.ruoyi.aftersales.domain.vo.AftersalesMaterialVO; |
||||
|
import com.ruoyi.aftersales.service.IAftersalesComplaintNoticeDetailService; |
||||
|
import com.ruoyi.aftersales.service.IAftersalesComplaintNoticeService; |
||||
|
import com.ruoyi.common.annotation.Log; |
||||
|
import com.ruoyi.common.core.controller.BaseController; |
||||
|
import com.ruoyi.common.core.domain.AjaxResult; |
||||
|
import com.ruoyi.common.core.page.TableDataInfo; |
||||
|
import com.ruoyi.common.enums.BusinessType; |
||||
|
import com.ruoyi.common.utils.poi.ExcelUtil; |
||||
|
import com.ruoyi.system.domain.SysMakeOrder; |
||||
|
import org.apache.shiro.authz.annotation.RequiresPermissions; |
||||
|
import org.springframework.beans.factory.annotation.Autowired; |
||||
|
import org.springframework.stereotype.Controller; |
||||
|
import org.springframework.ui.ModelMap; |
||||
|
import org.springframework.web.bind.annotation.*; |
||||
|
|
||||
|
import java.util.List; |
||||
|
|
||||
|
|
||||
|
/** |
||||
|
* 售后客诉通知单Controller |
||||
|
* |
||||
|
* @author 刘晓旭 |
||||
|
* @date 2024-05-22 |
||||
|
*/ |
||||
|
@Controller |
||||
|
@RequestMapping("/quality/complaintNotice") |
||||
|
public class QualityComplaintNoticeController extends BaseController { |
||||
|
|
||||
|
|
||||
|
private String prefix = "quality/complaintNotice"; |
||||
|
|
||||
|
@Autowired |
||||
|
private IAftersalesComplaintNoticeService aftersalesComplaintNoticeService; |
||||
|
|
||||
|
@Autowired |
||||
|
private IAftersalesComplaintNoticeDetailService complaintNoticeDetailService; |
||||
|
|
||||
|
@RequiresPermissions("quality:complaintNotice:view") |
||||
|
@GetMapping() |
||||
|
public String complaintNotice() |
||||
|
{ |
||||
|
return prefix + "/complaintNotice"; |
||||
|
} |
||||
|
|
||||
|
/** |
||||
|
* 查询售后客诉通知单列表 |
||||
|
*/ |
||||
|
@RequiresPermissions("quality:complaintNotice:list") |
||||
|
@PostMapping("/list") |
||||
|
@ResponseBody |
||||
|
public TableDataInfo list(AftersalesComplaintNotice complaintNotice) |
||||
|
{ |
||||
|
startPage(); |
||||
|
List<AftersalesComplaintNotice> list = aftersalesComplaintNoticeService.selectAftersalesComplaintNoticeList(complaintNotice); |
||||
|
return getDataTable(list); |
||||
|
} |
||||
|
|
||||
|
/** |
||||
|
* 导出售后客诉通知单列表 |
||||
|
*/ |
||||
|
@RequiresPermissions("quality:complaintNotice:export") |
||||
|
@Log(title = "售后客诉通知单", businessType = BusinessType.EXPORT) |
||||
|
@PostMapping("/export") |
||||
|
@ResponseBody |
||||
|
public AjaxResult export(AftersalesComplaintNoticeDetail aftersalesComplaintNoticeDetail) |
||||
|
{ |
||||
|
List<AftersalesComplaintNoticeDetail> complaintNoticeDetails = complaintNoticeDetailService.selectAftersalesComplaintNoticeDetailList(aftersalesComplaintNoticeDetail); |
||||
|
ExcelUtil<AftersalesComplaintNoticeDetail> util = new ExcelUtil<AftersalesComplaintNoticeDetail>(AftersalesComplaintNoticeDetail.class); |
||||
|
return util.exportExcel(complaintNoticeDetails, "售后客诉通知单数据"); |
||||
|
} |
||||
|
|
||||
|
/** |
||||
|
* 新增售后客诉通知单 |
||||
|
*/ |
||||
|
@GetMapping("/add") |
||||
|
public String add() |
||||
|
{ |
||||
|
return prefix + "/add"; |
||||
|
} |
||||
|
|
||||
|
/** |
||||
|
* 新增保存售后客诉通知单 |
||||
|
*/ |
||||
|
@RequiresPermissions("quality:complaintNotice:add") |
||||
|
@Log(title = "售后客诉通知单", businessType = BusinessType.INSERT) |
||||
|
@PostMapping("/add") |
||||
|
@ResponseBody |
||||
|
public AjaxResult addSave(@RequestBody AftersalesComplaintNoticeDetail complaintNoticeDetail) |
||||
|
{ |
||||
|
return toAjax(complaintNoticeDetailService.insertAftersalesComplaintNoticeDetail(complaintNoticeDetail)); |
||||
|
} |
||||
|
|
||||
|
/** |
||||
|
* 修改售后客诉通知单 |
||||
|
*/ |
||||
|
@GetMapping("/returnInspectionProcessing/{complaintNoticeId}") |
||||
|
public String edit(@PathVariable("complaintNoticeId") Long complaintNoticeId, ModelMap mmap) |
||||
|
{ |
||||
|
AftersalesComplaintNotice aftersalesComplaintNotice = aftersalesComplaintNoticeService.selectAftersalesComplaintNoticeById(complaintNoticeId); |
||||
|
mmap.put("aftersalesComplaintNotice", aftersalesComplaintNotice); |
||||
|
return prefix + "/returnInspectionProcessing"; |
||||
|
} |
||||
|
|
||||
|
/** |
||||
|
* 修改保存售后客诉通知单 |
||||
|
*/ |
||||
|
@RequiresPermissions("quality:complaintNotice:returnInspectionProcessing") |
||||
|
@Log(title = "售后客诉通知单", businessType = BusinessType.UPDATE) |
||||
|
@PostMapping("/edit") |
||||
|
@ResponseBody |
||||
|
public AjaxResult editSave(@RequestBody AftersalesComplaintNoticeDetail aftersalesComplaintNoticeDetail) |
||||
|
{ |
||||
|
return toAjax(complaintNoticeDetailService.updateAftersalesComplaintNoticeDetail(aftersalesComplaintNoticeDetail)); |
||||
|
} |
||||
|
|
||||
|
/** |
||||
|
* 售后客诉通知单详情 |
||||
|
*/ |
||||
|
@GetMapping("/detail/{complaintNoticeId}") |
||||
|
public String detail(@PathVariable("complaintNoticeId") Long complaintNoticeId, ModelMap mmap) |
||||
|
{ |
||||
|
AftersalesComplaintNotice aftersalesComplaintNotice = aftersalesComplaintNoticeService.selectAftersalesComplaintNoticeById(complaintNoticeId); |
||||
|
mmap.put("aftersalesComplaintNotice", aftersalesComplaintNotice); |
||||
|
return prefix + "/detail"; |
||||
|
} |
||||
|
|
||||
|
|
||||
|
/** |
||||
|
* 删除售后客诉通知单 |
||||
|
*/ |
||||
|
@RequiresPermissions("quality:complaintNotice:remove") |
||||
|
@Log(title = "售后客诉通知单", businessType = BusinessType.DELETE) |
||||
|
@PostMapping( "/remove") |
||||
|
@ResponseBody |
||||
|
public AjaxResult remove(String ids) |
||||
|
{ |
||||
|
return toAjax(aftersalesComplaintNoticeService.deleteAftersalesComplaintNoticeByIds(ids)); |
||||
|
} |
||||
|
|
||||
|
/** |
||||
|
* 查找与客户id关联的生产单号 |
||||
|
* */ |
||||
|
@ResponseBody |
||||
|
@GetMapping("/getMakeNosByCustomerId/{customerId}") |
||||
|
public List<SysMakeOrder> getCustomers(@PathVariable String customerId) { |
||||
|
List<SysMakeOrder> list = aftersalesComplaintNoticeService.selectMakeOrdersByCustomerId(customerId); |
||||
|
return list; |
||||
|
} |
||||
|
|
||||
|
|
||||
|
/** |
||||
|
* 查找与客户生产单号有关的物料信息 |
||||
|
*/ |
||||
|
@GetMapping("/materialSelect") |
||||
|
public String materialSelect(@RequestParam String makeNo,ModelMap modelMap) |
||||
|
{ |
||||
|
modelMap.put("makeNo",makeNo); |
||||
|
return prefix + "/materialSelect"; |
||||
|
} |
||||
|
|
||||
|
/** |
||||
|
* 查找与客户生产单号有关的物料信息 |
||||
|
* */ |
||||
|
@ResponseBody |
||||
|
@PostMapping("/getMaterialInfoByMakeNo") |
||||
|
public TableDataInfo getMaterialInfoByMakeNo(@RequestParam String makeNo){ |
||||
|
startPage(); |
||||
|
List<AftersalesMaterialVO> list = aftersalesComplaintNoticeService.selectMaterialInfoByMakeNo(makeNo); |
||||
|
return getDataTable(list); |
||||
|
} |
||||
|
|
||||
|
/** |
||||
|
* 编辑操作的时候查询数据库中已有的物料信息 |
||||
|
* */ |
||||
|
@ResponseBody |
||||
|
@PostMapping("/getMaterialListByNoticeCode") |
||||
|
public TableDataInfo getMaterialListByNoticeCode(AftersalesComplaintNoticeDetail complaintNoticeDetail){ |
||||
|
startPage(); |
||||
|
List<AftersalesMaterialVO> list = complaintNoticeDetailService.selectMaterialListByNoticeCode(complaintNoticeDetail.getComplaintNoticeCode()); |
||||
|
return getDataTable(list); |
||||
|
} |
||||
|
|
||||
|
} |
||||
@ -0,0 +1,151 @@ |
|||||
|
package com.ruoyi.warehouse.controller; |
||||
|
|
||||
|
import java.util.List; |
||||
|
import org.apache.shiro.authz.annotation.RequiresPermissions; |
||||
|
import org.springframework.beans.factory.annotation.Autowired; |
||||
|
import org.springframework.stereotype.Controller; |
||||
|
import org.springframework.ui.ModelMap; |
||||
|
import org.springframework.web.bind.annotation.GetMapping; |
||||
|
import org.springframework.web.bind.annotation.PathVariable; |
||||
|
import org.springframework.web.bind.annotation.PostMapping; |
||||
|
import org.springframework.web.bind.annotation.RequestMapping; |
||||
|
import org.springframework.web.bind.annotation.ResponseBody; |
||||
|
import com.ruoyi.common.annotation.Log; |
||||
|
import com.ruoyi.common.enums.BusinessType; |
||||
|
import com.ruoyi.warehouse.domain.WarehouseStorageOrder; |
||||
|
import com.ruoyi.warehouse.service.IWarehouseStorageOrderService; |
||||
|
import com.ruoyi.common.core.controller.BaseController; |
||||
|
import com.ruoyi.common.core.domain.AjaxResult; |
||||
|
import com.ruoyi.common.utils.poi.ExcelUtil; |
||||
|
import com.ruoyi.common.core.page.TableDataInfo; |
||||
|
|
||||
|
/** |
||||
|
* 仓库入库单Controller |
||||
|
* |
||||
|
* @author 刘晓旭 |
||||
|
* @date 2024-05-22 |
||||
|
*/ |
||||
|
@Controller |
||||
|
@RequestMapping("/warehouse/storageOrder") |
||||
|
public class WarehouseStorageOrderController extends BaseController |
||||
|
{ |
||||
|
private String prefix = "warehouse/storageOrder"; |
||||
|
|
||||
|
@Autowired |
||||
|
private IWarehouseStorageOrderService warehouseStorageOrderService; |
||||
|
|
||||
|
@RequiresPermissions("warehouse:storageOrder:view") |
||||
|
@GetMapping() |
||||
|
public String storageOrder() |
||||
|
{ |
||||
|
return prefix + "/storageOrder"; |
||||
|
} |
||||
|
|
||||
|
/** |
||||
|
* 查询仓库入库单列表 |
||||
|
*/ |
||||
|
@RequiresPermissions("warehouse:storageOrder:list") |
||||
|
@PostMapping("/list") |
||||
|
@ResponseBody |
||||
|
public TableDataInfo list(WarehouseStorageOrder warehouseStorageOrder) |
||||
|
{ |
||||
|
startPage(); |
||||
|
List<WarehouseStorageOrder> list = warehouseStorageOrderService.selectWarehouseStorageOrderList(warehouseStorageOrder); |
||||
|
return getDataTable(list); |
||||
|
} |
||||
|
|
||||
|
/** |
||||
|
* 导出仓库入库单列表 |
||||
|
*/ |
||||
|
@RequiresPermissions("warehouse:storageOrder:export") |
||||
|
@Log(title = "仓库入库单", businessType = BusinessType.EXPORT) |
||||
|
@PostMapping("/export") |
||||
|
@ResponseBody |
||||
|
public AjaxResult export(WarehouseStorageOrder warehouseStorageOrder) |
||||
|
{ |
||||
|
List<WarehouseStorageOrder> list = warehouseStorageOrderService.selectWarehouseStorageOrderList(warehouseStorageOrder); |
||||
|
ExcelUtil<WarehouseStorageOrder> util = new ExcelUtil<WarehouseStorageOrder>(WarehouseStorageOrder.class); |
||||
|
return util.exportExcel(list, "仓库入库单数据"); |
||||
|
} |
||||
|
|
||||
|
/** |
||||
|
* 新增仓库入库单 |
||||
|
*/ |
||||
|
@GetMapping("/add") |
||||
|
public String add() |
||||
|
{ |
||||
|
return prefix + "/add"; |
||||
|
} |
||||
|
|
||||
|
/** |
||||
|
* 新增保存仓库入库单 |
||||
|
*/ |
||||
|
@RequiresPermissions("warehouse:storageOrder:add") |
||||
|
@Log(title = "仓库入库单", businessType = BusinessType.INSERT) |
||||
|
@PostMapping("/add") |
||||
|
@ResponseBody |
||||
|
public AjaxResult addSave(WarehouseStorageOrder warehouseStorageOrder) |
||||
|
{ |
||||
|
return toAjax(warehouseStorageOrderService.insertWarehouseStorageOrder(warehouseStorageOrder)); |
||||
|
} |
||||
|
|
||||
|
/** |
||||
|
* 修改仓库入库单 |
||||
|
*/ |
||||
|
@GetMapping("/edit/{warehouseStorageId}") |
||||
|
public String edit(@PathVariable("warehouseStorageId") Long warehouseStorageId, ModelMap mmap) |
||||
|
{ |
||||
|
WarehouseStorageOrder warehouseStorageOrder = warehouseStorageOrderService.selectWarehouseStorageOrderById(warehouseStorageId); |
||||
|
mmap.put("warehouseStorageOrder", warehouseStorageOrder); |
||||
|
return prefix + "/edit"; |
||||
|
} |
||||
|
|
||||
|
/** |
||||
|
* 修改保存仓库入库单 |
||||
|
*/ |
||||
|
@RequiresPermissions("warehouse:storageOrder:edit") |
||||
|
@Log(title = "仓库入库单", businessType = BusinessType.UPDATE) |
||||
|
@PostMapping("/edit") |
||||
|
@ResponseBody |
||||
|
public AjaxResult editSave(WarehouseStorageOrder warehouseStorageOrder) |
||||
|
{ |
||||
|
return toAjax(warehouseStorageOrderService.updateWarehouseStorageOrder(warehouseStorageOrder)); |
||||
|
} |
||||
|
|
||||
|
/** |
||||
|
* 删除仓库入库单 |
||||
|
*/ |
||||
|
@RequiresPermissions("warehouse:storageOrder:remove") |
||||
|
@Log(title = "仓库入库单", businessType = BusinessType.DELETE) |
||||
|
@PostMapping( "/remove") |
||||
|
@ResponseBody |
||||
|
public AjaxResult remove(String ids) |
||||
|
{ |
||||
|
return toAjax(warehouseStorageOrderService.deleteWarehouseStorageOrderByIds(ids)); |
||||
|
} |
||||
|
|
||||
|
/** |
||||
|
* 作废仓库入库单 |
||||
|
*/ |
||||
|
@RequiresPermissions("warehouse:storageOrder:cancel") |
||||
|
@Log(title = "仓库入库单", businessType = BusinessType.CANCEL) |
||||
|
@GetMapping( "/cancel/{id}") |
||||
|
@ResponseBody |
||||
|
public AjaxResult cancel(@PathVariable("id") Long id){ |
||||
|
return toAjax(warehouseStorageOrderService.cancelWarehouseStorageOrderById(id)); |
||||
|
} |
||||
|
|
||||
|
/** |
||||
|
* 恢复仓库入库单 |
||||
|
*/ |
||||
|
@RequiresPermissions("warehouse:storageOrder:restore") |
||||
|
@Log(title = "仓库入库单", businessType = BusinessType.RESTORE) |
||||
|
@GetMapping( "/restore/{id}") |
||||
|
@ResponseBody |
||||
|
public AjaxResult restore(@PathVariable("id")Long id) |
||||
|
{ |
||||
|
return toAjax(warehouseStorageOrderService.restoreWarehouseStorageOrderById(id)); |
||||
|
} |
||||
|
|
||||
|
|
||||
|
} |
||||
@ -0,0 +1,358 @@ |
|||||
|
package com.ruoyi.warehouse.domain; |
||||
|
|
||||
|
import java.util.Date; |
||||
|
import com.fasterxml.jackson.annotation.JsonFormat; |
||||
|
import org.apache.commons.lang3.builder.ToStringBuilder; |
||||
|
import org.apache.commons.lang3.builder.ToStringStyle; |
||||
|
import com.ruoyi.common.annotation.Excel; |
||||
|
import com.ruoyi.common.core.domain.BaseEntity; |
||||
|
|
||||
|
/** |
||||
|
* 仓库入库单对象 warehouse_storage_order |
||||
|
* |
||||
|
* @author 刘晓旭 |
||||
|
* @date 2024-05-22 |
||||
|
*/ |
||||
|
public class WarehouseStorageOrder extends BaseEntity |
||||
|
{ |
||||
|
private static final long serialVersionUID = 1L; |
||||
|
|
||||
|
/** 入库单id */ |
||||
|
private Long warehouseStorageId; |
||||
|
|
||||
|
/** 入库单号 */ |
||||
|
@Excel(name = "入库单号") |
||||
|
private String warehouseStorageCode; |
||||
|
|
||||
|
/** 关联订单号（多种订单类型） */ |
||||
|
@Excel(name = "关联订单号", readConverterExp = "多=种订单类型") |
||||
|
private String relatedOrderCode; |
||||
|
|
||||
|
/** 仓库入库状态 */ |
||||
|
@Excel(name = "仓库入库状态") |
||||
|
private String warehouseStorageStatus; |
||||
|
|
||||
|
/** 仓库品质状态 */ |
||||
|
@Excel(name = "仓库品质状态") |
||||
|
private String warehouseQualityStatus; |
||||
|
|
||||
|
/** 仓库入库类型 */ |
||||
|
@Excel(name = "仓库入库类型") |
||||
|
private String warehouseStorageType; |
||||
|
|
||||
|
/** 仓库订单类型 */ |
||||
|
@Excel(name = "仓库订单类型") |
||||
|
private String warehouseOrderType; |
||||
|
|
||||
|
/** 仓库入库部门类型 */ |
||||
|
@Excel(name = "仓库入库部门类型") |
||||
|
private String warehouseDeptType; |
||||
|
|
||||
|
/** 通知已到货数量 */ |
||||
|
@Excel(name = "通知已到货数量") |
||||
|
private Integer notifyArrivedNum; |
||||
|
|
||||
|
/** 实际已到货数量 */ |
||||
|
@Excel(name = "实际已到货数量") |
||||
|
private Integer actualArrivedNum; |
||||
|
|
||||
|
/** 暂收合格数量 */ |
||||
|
@Excel(name = "暂收合格数量") |
||||
|
private Integer temporaryQualifiedNum; |
||||
|
|
||||
|
/** 暂收不合格数量 */ |
||||
|
@Excel(name = "暂收不合格数量") |
||||
|
private Integer temporaryUnqualifiedNum; |
||||
|
|
||||
|
/** 品质合格数量 */ |
||||
|
@Excel(name = "品质合格数量") |
||||
|
private Integer qualityQualifiedNum; |
||||
|
|
||||
|
|
||||
|
/** 品质不合格数量 */ |
||||
|
@Excel(name = "品质不合格数量") |
||||
|
private Integer qualityUnqualifiedNum; |
||||
|
|
||||
|
|
||||
|
/** 入库数量 */ |
||||
|
@Excel(name = "入库数量") |
||||
|
private Integer storageNum; |
||||
|
|
||||
|
/** 到货时间 */ |
||||
|
@JsonFormat(pattern = "yyyy-MM-dd") |
||||
|
@Excel(name = "到货时间", width = 30, dateFormat = "yyyy-MM-dd") |
||||
|
private Date arrivedTime; |
||||
|
|
||||
|
/** 暂收时间 */ |
||||
|
@JsonFormat(pattern = "yyyy-MM-dd") |
||||
|
@Excel(name = "暂收时间", width = 30, dateFormat = "yyyy-MM-dd") |
||||
|
private Date temporaryTime; |
||||
|
|
||||
|
/** 交付质检时间 */ |
||||
|
@JsonFormat(pattern = "yyyy-MM-dd") |
||||
|
@Excel(name = "交付质检时间", width = 30, dateFormat = "yyyy-MM-dd") |
||||
|
private Date deliveryInspectionTime; |
||||
|
|
||||
|
/** 品质时间 */ |
||||
|
@JsonFormat(pattern = "yyyy-MM-dd") |
||||
|
@Excel(name = "品质时间", width = 30, dateFormat = "yyyy-MM-dd") |
||||
|
private Date qualityTime; |
||||
|
|
||||
|
/** 入库时间 */ |
||||
|
@JsonFormat(pattern = "yyyy-MM-dd") |
||||
|
@Excel(name = "入库时间", width = 30, dateFormat = "yyyy-MM-dd") |
||||
|
private Date storageTime; |
||||
|
|
||||
|
/** 仓库员工 */ |
||||
|
@Excel(name = "仓库员工") |
||||
|
private String warehouseEmployee; |
||||
|
|
||||
|
/** 仓库ID */ |
||||
|
@Excel(name = "仓库ID") |
||||
|
private String warehouseCode; |
||||
|
|
||||
|
/** 仓库名称 */ |
||||
|
@Excel(name = "仓库名称") |
||||
|
private String warehouseName; |
||||
|
|
||||
|
public void setWarehouseStorageId(Long warehouseStorageId) |
||||
|
{ |
||||
|
this.warehouseStorageId = warehouseStorageId; |
||||
|
} |
||||
|
|
||||
|
public Long getWarehouseStorageId() |
||||
|
{ |
||||
|
return warehouseStorageId; |
||||
|
} |
||||
|
public void setWarehouseStorageCode(String warehouseStorageCode) |
||||
|
{ |
||||
|
this.warehouseStorageCode = warehouseStorageCode; |
||||
|
} |
||||
|
|
||||
|
public String getWarehouseStorageCode() |
||||
|
{ |
||||
|
return warehouseStorageCode; |
||||
|
} |
||||
|
public void setRelatedOrderCode(String relatedOrderCode) |
||||
|
{ |
||||
|
this.relatedOrderCode = relatedOrderCode; |
||||
|
} |
||||
|
|
||||
|
public String getRelatedOrderCode() |
||||
|
{ |
||||
|
return relatedOrderCode; |
||||
|
} |
||||
|
public void setWarehouseStorageStatus(String warehouseStorageStatus) |
||||
|
{ |
||||
|
this.warehouseStorageStatus = warehouseStorageStatus; |
||||
|
} |
||||
|
|
||||
|
public String getWarehouseStorageStatus() |
||||
|
{ |
||||
|
return warehouseStorageStatus; |
||||
|
} |
||||
|
public void setWarehouseQualityStatus(String warehouseQualityStatus) |
||||
|
{ |
||||
|
this.warehouseQualityStatus = warehouseQualityStatus; |
||||
|
} |
||||
|
|
||||
|
public String getWarehouseQualityStatus() |
||||
|
{ |
||||
|
return warehouseQualityStatus; |
||||
|
} |
||||
|
public void setWarehouseStorageType(String warehouseStorageType) |
||||
|
{ |
||||
|
this.warehouseStorageType = warehouseStorageType; |
||||
|
} |
||||
|
|
||||
|
public String getWarehouseStorageType() |
||||
|
{ |
||||
|
return warehouseStorageType; |
||||
|
} |
||||
|
public void setWarehouseOrderType(String warehouseOrderType) |
||||
|
{ |
||||
|
this.warehouseOrderType = warehouseOrderType; |
||||
|
} |
||||
|
|
||||
|
public String getWarehouseOrderType() |
||||
|
{ |
||||
|
return warehouseOrderType; |
||||
|
} |
||||
|
public void setWarehouseDeptType(String warehouseDeptType) |
||||
|
{ |
||||
|
this.warehouseDeptType = warehouseDeptType; |
||||
|
} |
||||
|
|
||||
|
public String getWarehouseDeptType() |
||||
|
{ |
||||
|
return warehouseDeptType; |
||||
|
} |
||||
|
public void setNotifyArrivedNum(Integer notifyArrivedNum) |
||||
|
{ |
||||
|
this.notifyArrivedNum = notifyArrivedNum; |
||||
|
} |
||||
|
|
||||
|
public Integer getNotifyArrivedNum() |
||||
|
{ |
||||
|
return notifyArrivedNum; |
||||
|
} |
||||
|
public void setActualArrivedNum(Integer actualArrivedNum) |
||||
|
{ |
||||
|
this.actualArrivedNum = actualArrivedNum; |
||||
|
} |
||||
|
|
||||
|
public Integer getActualArrivedNum() |
||||
|
{ |
||||
|
return actualArrivedNum; |
||||
|
} |
||||
|
public void setTemporaryQualifiedNum(Integer temporaryQualifiedNum) |
||||
|
{ |
||||
|
this.temporaryQualifiedNum = temporaryQualifiedNum; |
||||
|
} |
||||
|
|
||||
|
public Integer getTemporaryQualifiedNum() |
||||
|
{ |
||||
|
return temporaryQualifiedNum; |
||||
|
} |
||||
|
public void setTemporaryUnqualifiedNum(Integer temporaryUnqualifiedNum) |
||||
|
{ |
||||
|
this.temporaryUnqualifiedNum = temporaryUnqualifiedNum; |
||||
|
} |
||||
|
|
||||
|
public Integer getTemporaryUnqualifiedNum() |
||||
|
{ |
||||
|
return temporaryUnqualifiedNum; |
||||
|
} |
||||
|
public void setQualityQualifiedNum(Integer qualityQualifiedNum) |
||||
|
{ |
||||
|
this.qualityQualifiedNum = qualityQualifiedNum; |
||||
|
} |
||||
|
|
||||
|
public Integer getQualityQualifiedNum() |
||||
|
{ |
||||
|
return qualityQualifiedNum; |
||||
|
} |
||||
|
|
||||
|
public Integer getQualityUnqualifiedNum() { |
||||
|
return qualityUnqualifiedNum; |
||||
|
} |
||||
|
|
||||
|
public void setQualityUnqualifiedNum(Integer qualityUnqualifiedNum) { |
||||
|
this.qualityUnqualifiedNum = qualityUnqualifiedNum; |
||||
|
} |
||||
|
|
||||
|
public void setStorageNum(Integer storageNum) |
||||
|
{ |
||||
|
this.storageNum = storageNum; |
||||
|
} |
||||
|
|
||||
|
public Integer getStorageNum() |
||||
|
{ |
||||
|
return storageNum; |
||||
|
} |
||||
|
public void setArrivedTime(Date arrivedTime) |
||||
|
{ |
||||
|
this.arrivedTime = arrivedTime; |
||||
|
} |
||||
|
|
||||
|
public Date getArrivedTime() |
||||
|
{ |
||||
|
return arrivedTime; |
||||
|
} |
||||
|
public void setTemporaryTime(Date temporaryTime) |
||||
|
{ |
||||
|
this.temporaryTime = temporaryTime; |
||||
|
} |
||||
|
|
||||
|
public Date getTemporaryTime() |
||||
|
{ |
||||
|
return temporaryTime; |
||||
|
} |
||||
|
public void setDeliveryInspectionTime(Date deliveryInspectionTime) |
||||
|
{ |
||||
|
this.deliveryInspectionTime = deliveryInspectionTime; |
||||
|
} |
||||
|
|
||||
|
public Date getDeliveryInspectionTime() |
||||
|
{ |
||||
|
return deliveryInspectionTime; |
||||
|
} |
||||
|
public void setQualityTime(Date qualityTime) |
||||
|
{ |
||||
|
this.qualityTime = qualityTime; |
||||
|
} |
||||
|
|
||||
|
public Date getQualityTime() |
||||
|
{ |
||||
|
return qualityTime; |
||||
|
} |
||||
|
public void setStorageTime(Date storageTime) |
||||
|
{ |
||||
|
this.storageTime = storageTime; |
||||
|
} |
||||
|
|
||||
|
public Date getStorageTime() |
||||
|
{ |
||||
|
return storageTime; |
||||
|
} |
||||
|
public void setWarehouseEmployee(String warehouseEmployee) |
||||
|
{ |
||||
|
this.warehouseEmployee = warehouseEmployee; |
||||
|
} |
||||
|
|
||||
|
public String getWarehouseEmployee() |
||||
|
{ |
||||
|
return warehouseEmployee; |
||||
|
} |
||||
|
public void setWarehouseCode(String warehouseCode) |
||||
|
{ |
||||
|
this.warehouseCode = warehouseCode; |
||||
|
} |
||||
|
|
||||
|
public String getWarehouseCode() |
||||
|
{ |
||||
|
return warehouseCode; |
||||
|
} |
||||
|
public void setWarehouseName(String warehouseName) |
||||
|
{ |
||||
|
this.warehouseName = warehouseName; |
||||
|
} |
||||
|
|
||||
|
public String getWarehouseName() |
||||
|
{ |
||||
|
return warehouseName; |
||||
|
} |
||||
|
|
||||
|
@Override |
||||
|
public String toString() { |
||||
|
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) |
||||
|
.append("warehouseStorageId", getWarehouseStorageId()) |
||||
|
.append("warehouseStorageCode", getWarehouseStorageCode()) |
||||
|
.append("relatedOrderCode", getRelatedOrderCode()) |
||||
|
.append("warehouseStorageStatus", getWarehouseStorageStatus()) |
||||
|
.append("warehouseQualityStatus", getWarehouseQualityStatus()) |
||||
|
.append("warehouseStorageType", getWarehouseStorageType()) |
||||
|
.append("warehouseOrderType", getWarehouseOrderType()) |
||||
|
.append("warehouseDeptType", getWarehouseDeptType()) |
||||
|
.append("notifyArrivedNum", getNotifyArrivedNum()) |
||||
|
.append("actualArrivedNum", getActualArrivedNum()) |
||||
|
.append("temporaryQualifiedNum", getTemporaryQualifiedNum()) |
||||
|
.append("temporaryUnqualifiedNum", getTemporaryUnqualifiedNum()) |
||||
|
.append("qualityQualifiedNum", getQualityQualifiedNum()) |
||||
|
.append("qualityUnqualifiedNum", getQualityUnqualifiedNum()) |
||||
|
.append("storageNum", getStorageNum()) |
||||
|
.append("arrivedTime", getArrivedTime()) |
||||
|
.append("temporaryTime", getTemporaryTime()) |
||||
|
.append("deliveryInspectionTime", getDeliveryInspectionTime()) |
||||
|
.append("qualityTime", getQualityTime()) |
||||
|
.append("storageTime", getStorageTime()) |
||||
|
.append("warehouseEmployee", getWarehouseEmployee()) |
||||
|
.append("warehouseCode", getWarehouseCode()) |
||||
|
.append("warehouseName", getWarehouseName()) |
||||
|
.append("createTime", getCreateTime()) |
||||
|
.append("createBy", getCreateBy()) |
||||
|
.append("updateBy", getUpdateBy()) |
||||
|
.append("updateTime", getUpdateTime()) |
||||
|
.toString(); |
||||
|
} |
||||
|
} |
||||
@ -0,0 +1,77 @@ |
|||||
|
package com.ruoyi.warehouse.mapper; |
||||
|
|
||||
|
import java.util.List; |
||||
|
import com.ruoyi.warehouse.domain.WarehouseStorageOrder; |
||||
|
|
||||
|
/** |
||||
|
* 仓库入库单Mapper接口 |
||||
|
* |
||||
|
* @author 刘晓旭 |
||||
|
* @date 2024-05-22 |
||||
|
*/ |
||||
|
public interface WarehouseStorageOrderMapper |
||||
|
{ |
||||
|
/** |
||||
|
* 查询仓库入库单 |
||||
|
* |
||||
|
* @param warehouseStorageId 仓库入库单ID |
||||
|
* @return 仓库入库单 |
||||
|
*/ |
||||
|
public WarehouseStorageOrder selectWarehouseStorageOrderById(Long warehouseStorageId); |
||||
|
|
||||
|
/** |
||||
|
* 查询仓库入库单列表 |
||||
|
* |
||||
|
* @param warehouseStorageOrder 仓库入库单 |
||||
|
* @return 仓库入库单集合 |
||||
|
*/ |
||||
|
public List<WarehouseStorageOrder> selectWarehouseStorageOrderList(WarehouseStorageOrder warehouseStorageOrder); |
||||
|
|
||||
|
/** |
||||
|
* 新增仓库入库单 |
||||
|
* |
||||
|
* @param warehouseStorageOrder 仓库入库单 |
||||
|
* @return 结果 |
||||
|
*/ |
||||
|
public int insertWarehouseStorageOrder(WarehouseStorageOrder warehouseStorageOrder); |
||||
|
|
||||
|
/** |
||||
|
* 修改仓库入库单 |
||||
|
* |
||||
|
* @param warehouseStorageOrder 仓库入库单 |
||||
|
* @return 结果 |
||||
|
*/ |
||||
|
public int updateWarehouseStorageOrder(WarehouseStorageOrder warehouseStorageOrder); |
||||
|
|
||||
|
/** |
||||
|
* 删除仓库入库单 |
||||
|
* |
||||
|
* @param warehouseStorageId 仓库入库单ID |
||||
|
* @return 结果 |
||||
|
*/ |
||||
|
public int deleteWarehouseStorageOrderById(Long warehouseStorageId); |
||||
|
|
||||
|
/** |
||||
|
* 批量删除仓库入库单 |
||||
|
* |
||||
|
* @param warehouseStorageIds 需要删除的数据ID |
||||
|
* @return 结果 |
||||
|
*/ |
||||
|
public int deleteWarehouseStorageOrderByIds(String[] warehouseStorageIds); |
||||
|
|
||||
|
/** |
||||
|
* 作废仓库入库单 |
||||
|
* |
||||
|
* @param warehouseStorageId 仓库入库单ID |
||||
|
* @return 结果 |
||||
|
*/ |
||||
|
public int cancelWarehouseStorageOrderById(Long warehouseStorageId); |
||||
|
|
||||
|
/** |
||||
|
* 恢复仓库入库单 |
||||
|
* |
||||
|
* @param warehouseStorageId 仓库入库单ID |
||||
|
* @return 结果 |
||||
|
*/ |
||||
|
public int restoreWarehouseStorageOrderById(Long warehouseStorageId); |
||||
|
} |
||||
@ -0,0 +1,75 @@ |
|||||
|
package com.ruoyi.warehouse.service; |
||||
|
|
||||
|
import java.util.List; |
||||
|
import com.ruoyi.warehouse.domain.WarehouseStorageOrder; |
||||
|
|
||||
|
/** |
||||
|
* 仓库入库单Service接口 |
||||
|
* |
||||
|
* @author 刘晓旭 |
||||
|
* @date 2024-05-22 |
||||
|
*/ |
||||
|
public interface IWarehouseStorageOrderService |
||||
|
{ |
||||
|
/** |
||||
|
* 查询仓库入库单 |
||||
|
* |
||||
|
* @param warehouseStorageId 仓库入库单ID |
||||
|
* @return 仓库入库单 |
||||
|
*/ |
||||
|
public WarehouseStorageOrder selectWarehouseStorageOrderById(Long warehouseStorageId); |
||||
|
|
||||
|
/** |
||||
|
* 查询仓库入库单列表 |
||||
|
* |
||||
|
* @param warehouseStorageOrder 仓库入库单 |
||||
|
* @return 仓库入库单集合 |
||||
|
*/ |
||||
|
public List<WarehouseStorageOrder> selectWarehouseStorageOrderList(WarehouseStorageOrder warehouseStorageOrder); |
||||
|
|
||||
|
/** |
||||
|
* 新增仓库入库单 |
||||
|
* |
||||
|
* @param warehouseStorageOrder 仓库入库单 |
||||
|
* @return 结果 |
||||
|
*/ |
||||
|
public int insertWarehouseStorageOrder(WarehouseStorageOrder warehouseStorageOrder); |
||||
|
|
||||
|
/** |
||||
|
* 修改仓库入库单 |
||||
|
* |
||||
|
* @param warehouseStorageOrder 仓库入库单 |
||||
|
* @return 结果 |
||||
|
*/ |
||||
|
public int updateWarehouseStorageOrder(WarehouseStorageOrder warehouseStorageOrder); |
||||
|
|
||||
|
/** |
||||
|
* 批量删除仓库入库单 |
||||
|
* |
||||
|
* @param ids 需要删除的数据ID |
||||
|
* @return 结果 |
||||
|
*/ |
||||
|
public int deleteWarehouseStorageOrderByIds(String ids); |
||||
|
|
||||
|
/** |
||||
|
* 删除仓库入库单信息 |
||||
|
* |
||||
|
* @param warehouseStorageId 仓库入库单ID |
||||
|
* @return 结果 |
||||
|
*/ |
||||
|
public int deleteWarehouseStorageOrderById(Long warehouseStorageId); |
||||
|
|
||||
|
/** |
||||
|
* 作废仓库入库单 |
||||
|
* @param warehouseStorageId 仓库入库单ID |
||||
|
* @return |
||||
|
*/ |
||||
|
int cancelWarehouseStorageOrderById(Long warehouseStorageId); |
||||
|
|
||||
|
/** |
||||
|
* 恢复仓库入库单 |
||||
|
* @param warehouseStorageId 仓库入库单ID |
||||
|
* @return |
||||
|
*/ |
||||
|
int restoreWarehouseStorageOrderById(Long warehouseStorageId); |
||||
|
} |
||||
@ -0,0 +1,126 @@ |
|||||
|
package com.ruoyi.warehouse.service.impl; |
||||
|
|
||||
|
import java.util.List; |
||||
|
import com.ruoyi.common.utils.DateUtils; |
||||
|
import com.ruoyi.common.utils.ShiroUtils; |
||||
|
import org.springframework.beans.factory.annotation.Autowired; |
||||
|
import org.springframework.stereotype.Service; |
||||
|
import com.ruoyi.warehouse.mapper.WarehouseStorageOrderMapper; |
||||
|
import com.ruoyi.warehouse.domain.WarehouseStorageOrder; |
||||
|
import com.ruoyi.warehouse.service.IWarehouseStorageOrderService; |
||||
|
import com.ruoyi.common.core.text.Convert; |
||||
|
|
||||
|
/** |
||||
|
* 仓库入库单Service业务层处理 |
||||
|
* |
||||
|
* @author 刘晓旭 |
||||
|
* @date 2024-05-22 |
||||
|
*/ |
||||
|
@Service |
||||
|
public class WarehouseStorageOrderServiceImpl implements IWarehouseStorageOrderService |
||||
|
{ |
||||
|
@Autowired |
||||
|
private WarehouseStorageOrderMapper warehouseStorageOrderMapper; |
||||
|
|
||||
|
/** |
||||
|
* 查询仓库入库单 |
||||
|
* |
||||
|
* @param warehouseStorageId 仓库入库单ID |
||||
|
* @return 仓库入库单 |
||||
|
*/ |
||||
|
@Override |
||||
|
public WarehouseStorageOrder selectWarehouseStorageOrderById(Long warehouseStorageId) |
||||
|
{ |
||||
|
return warehouseStorageOrderMapper.selectWarehouseStorageOrderById(warehouseStorageId); |
||||
|
} |
||||
|
|
||||
|
/** |
||||
|
* 查询仓库入库单列表 |
||||
|
* |
||||
|
* @param warehouseStorageOrder 仓库入库单 |
||||
|
* @return 仓库入库单 |
||||
|
*/ |
||||
|
@Override |
||||
|
public List<WarehouseStorageOrder> selectWarehouseStorageOrderList(WarehouseStorageOrder warehouseStorageOrder) |
||||
|
{ |
||||
|
return warehouseStorageOrderMapper.selectWarehouseStorageOrderList(warehouseStorageOrder); |
||||
|
} |
||||
|
|
||||
|
/** |
||||
|
* 新增仓库入库单 |
||||
|
* |
||||
|
* @param warehouseStorageOrder 仓库入库单 |
||||
|
* @return 结果 |
||||
|
*/ |
||||
|
@Override |
||||
|
public int insertWarehouseStorageOrder(WarehouseStorageOrder warehouseStorageOrder) |
||||
|
{ |
||||
|
warehouseStorageOrder.setCreateTime(DateUtils.getNowDate()); |
||||
|
String loginName = ShiroUtils.getLoginName(); |
||||
|
warehouseStorageOrder.setCreateBy(loginName); |
||||
|
return warehouseStorageOrderMapper.insertWarehouseStorageOrder(warehouseStorageOrder); |
||||
|
} |
||||
|
|
||||
|
/** |
||||
|
* 修改仓库入库单 |
||||
|
* |
||||
|
* @param warehouseStorageOrder 仓库入库单 |
||||
|
* @return 结果 |
||||
|
*/ |
||||
|
@Override |
||||
|
public int updateWarehouseStorageOrder(WarehouseStorageOrder warehouseStorageOrder) |
||||
|
{ |
||||
|
String loginName = ShiroUtils.getLoginName(); |
||||
|
warehouseStorageOrder.setUpdateBy(loginName); |
||||
|
warehouseStorageOrder.setUpdateTime(DateUtils.getNowDate()); |
||||
|
return warehouseStorageOrderMapper.updateWarehouseStorageOrder(warehouseStorageOrder); |
||||
|
} |
||||
|
|
||||
|
/** |
||||
|
* 删除仓库入库单对象 |
||||
|
* |
||||
|
* @param ids 需要删除的数据ID |
||||
|
* @return 结果 |
||||
|
*/ |
||||
|
@Override |
||||
|
public int deleteWarehouseStorageOrderByIds(String ids) |
||||
|
{ |
||||
|
return warehouseStorageOrderMapper.deleteWarehouseStorageOrderByIds(Convert.toStrArray(ids)); |
||||
|
} |
||||
|
|
||||
|
/** |
||||
|
* 删除仓库入库单信息 |
||||
|
* |
||||
|
* @param warehouseStorageId 仓库入库单ID |
||||
|
* @return 结果 |
||||
|
*/ |
||||
|
@Override |
||||
|
public int deleteWarehouseStorageOrderById(Long warehouseStorageId) |
||||
|
{ |
||||
|
return warehouseStorageOrderMapper.deleteWarehouseStorageOrderById(warehouseStorageId); |
||||
|
} |
||||
|
|
||||
|
/** |
||||
|
* 作废仓库入库单 |
||||
|
* |
||||
|
* @param warehouseStorageId 仓库入库单ID |
||||
|
* @return 结果 |
||||
|
*/ |
||||
|
@Override |
||||
|
public int cancelWarehouseStorageOrderById(Long warehouseStorageId) |
||||
|
{ |
||||
|
return warehouseStorageOrderMapper.cancelWarehouseStorageOrderById(warehouseStorageId); |
||||
|
} |
||||
|
|
||||
|
/** |
||||
|
* 恢复仓库入库单信息 |
||||
|
* |
||||
|
* @param warehouseStorageId 仓库入库单ID |
||||
|
* @return 结果 |
||||
|
*/ |
||||
|
@Override |
||||
|
public int restoreWarehouseStorageOrderById(Long warehouseStorageId) |
||||
|
{ |
||||
|
return warehouseStorageOrderMapper.restoreWarehouseStorageOrderById(warehouseStorageId); |
||||
|
} |
||||
|
} |
||||
@ -0,0 +1,171 @@ |
|||||
|
<?xml version="1.0" encoding="UTF-8" ?> |
||||
|
<!DOCTYPE mapper |
||||
|
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" |
||||
|
"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> |
||||
|
<mapper namespace="com.ruoyi.warehouse.mapper.WarehouseStorageOrderMapper"> |
||||
|
|
||||
|
<resultMap type="WarehouseStorageOrder" id="WarehouseStorageOrderResult"> |
||||
|
<result property="warehouseStorageId" column="warehouse_storage_id" /> |
||||
|
<result property="warehouseStorageCode" column="warehouse_storage_code" /> |
||||
|
<result property="relatedOrderCode" column="related_order_code" /> |
||||
|
<result property="warehouseStorageStatus" column="warehouse_storage_status" /> |
||||
|
<result property="warehouseQualityStatus" column="warehouse_quality_status" /> |
||||
|
<result property="warehouseStorageType" column="warehouse_storage_type" /> |
||||
|
<result property="warehouseOrderType" column="warehouse_order_type" /> |
||||
|
<result property="warehouseDeptType" column="warehouse_dept_type" /> |
||||
|
<result property="notifyArrivedNum" column="notify_arrived_num" /> |
||||
|
<result property="actualArrivedNum" column="actual_arrived_num" /> |
||||
|
<result property="temporaryQualifiedNum" column="temporary_qualified_num" /> |
||||
|
<result property="temporaryUnqualifiedNum" column="temporary_unqualified_num" /> |
||||
|
<result property="qualityQualifiedNum" column="quality_qualified_num" /> |
||||
|
<result property="qualityUnqualifiedNum" column="quality_unqualified_num" /> |
||||
|
<result property="storageNum" column="storage_num" /> |
||||
|
<result property="arrivedTime" column="arrived_time" /> |
||||
|
<result property="temporaryTime" column="temporary_time" /> |
||||
|
<result property="deliveryInspectionTime" column="delivery_inspection_time" /> |
||||
|
<result property="qualityTime" column="quality_time" /> |
||||
|
<result property="storageTime" column="storage_time" /> |
||||
|
<result property="warehouseEmployee" column="warehouse_employee" /> |
||||
|
<result property="warehouseCode" column="warehouse_code" /> |
||||
|
<result property="warehouseName" column="warehouse_name" /> |
||||
|
<result property="createTime" column="create_time" /> |
||||
|
<result property="createBy" column="create_by" /> |
||||
|
<result property="updateBy" column="update_by" /> |
||||
|
<result property="updateTime" column="update_time" /> |
||||
|
</resultMap> |
||||
|
|
||||
|
<sql id="selectWarehouseStorageOrderVo"> |
||||
|
select warehouse_storage_id, warehouse_storage_code, related_order_code, warehouse_storage_status, warehouse_quality_status, warehouse_storage_type, warehouse_order_type, warehouse_dept_type, notify_arrived_num, actual_arrived_num, temporary_qualified_num, temporary_unqualified_num, quality_qualified_num, quality_unqualified_num ,storage_num, arrived_time, temporary_time, delivery_inspection_time, quality_time, storage_time, warehouse_employee, warehouse_code, warehouse_name, create_time, create_by, update_by, update_time from warehouse_storage_order |
||||
|
</sql> |
||||
|
|
||||
|
<select id="selectWarehouseStorageOrderList" parameterType="WarehouseStorageOrder" resultMap="WarehouseStorageOrderResult"> |
||||
|
<include refid="selectWarehouseStorageOrderVo"/> |
||||
|
<where> |
||||
|
<if test="warehouseStorageCode != null and warehouseStorageCode != ''"> and warehouse_storage_code = #{warehouseStorageCode}</if> |
||||
|
<if test="relatedOrderCode != null and relatedOrderCode != ''"> and related_order_code = #{relatedOrderCode}</if> |
||||
|
<if test="warehouseStorageStatus != null and warehouseStorageStatus != ''"> and warehouse_storage_status = #{warehouseStorageStatus}</if> |
||||
|
<if test="warehouseQualityStatus != null and warehouseQualityStatus != ''"> and warehouse_quality_status = #{warehouseQualityStatus}</if> |
||||
|
<if test="warehouseDeptType != null and warehouseDeptType != ''"> and warehouse_dept_type = #{warehouseDeptType}</if> |
||||
|
<if test="warehouseEmployee != null and warehouseEmployee != ''"> and warehouse_employee = #{warehouseEmployee}</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> |
||||
|
</select> |
||||
|
|
||||
|
<select id="selectWarehouseStorageOrderById" parameterType="Long" resultMap="WarehouseStorageOrderResult"> |
||||
|
<include refid="selectWarehouseStorageOrderVo"/> |
||||
|
where warehouse_storage_id = #{warehouseStorageId} |
||||
|
</select> |
||||
|
|
||||
|
<insert id="insertWarehouseStorageOrder" parameterType="WarehouseStorageOrder" useGeneratedKeys="true" keyProperty="warehouseStorageId"> |
||||
|
insert into warehouse_storage_order |
||||
|
<trim prefix="(" suffix=")" suffixOverrides=","> |
||||
|
<if test="warehouseStorageCode != null">warehouse_storage_code,</if> |
||||
|
<if test="relatedOrderCode != null">related_order_code,</if> |
||||
|
<if test="warehouseStorageStatus != null">warehouse_storage_status,</if> |
||||
|
<if test="warehouseQualityStatus != null">warehouse_quality_status,</if> |
||||
|
<if test="warehouseStorageType != null">warehouse_storage_type,</if> |
||||
|
<if test="warehouseOrderType != null">warehouse_order_type,</if> |
||||
|
<if test="warehouseDeptType != null">warehouse_dept_type,</if> |
||||
|
<if test="notifyArrivedNum != null">notify_arrived_num,</if> |
||||
|
<if test="actualArrivedNum != null">actual_arrived_num,</if> |
||||
|
<if test="temporaryQualifiedNum != null">temporary_qualified_num,</if> |
||||
|
<if test="temporaryUnqualifiedNum != null">temporary_unqualified_num,</if> |
||||
|
<if test="qualityQualifiedNum != null">quality_qualified_num,</if> |
||||
|
<if test="qualityUnqualifiedNum != null">quality_unqualified_num,</if> |
||||
|
<if test="storageNum != null">storage_num,</if> |
||||
|
<if test="arrivedTime != null">arrived_time,</if> |
||||
|
<if test="temporaryTime != null">temporary_time,</if> |
||||
|
<if test="deliveryInspectionTime != null">delivery_inspection_time,</if> |
||||
|
<if test="qualityTime != null">quality_time,</if> |
||||
|
<if test="storageTime != null">storage_time,</if> |
||||
|
<if test="warehouseEmployee != null">warehouse_employee,</if> |
||||
|
<if test="warehouseCode != null">warehouse_code,</if> |
||||
|
<if test="warehouseName != null">warehouse_name,</if> |
||||
|
<if test="createTime != null">create_time,</if> |
||||
|
<if test="createBy != null">create_by,</if> |
||||
|
<if test="updateBy != null">update_by,</if> |
||||
|
<if test="updateTime != null">update_time,</if> |
||||
|
</trim> |
||||
|
<trim prefix="values (" suffix=")" suffixOverrides=","> |
||||
|
<if test="warehouseStorageCode != null">#{warehouseStorageCode},</if> |
||||
|
<if test="relatedOrderCode != null">#{relatedOrderCode},</if> |
||||
|
<if test="warehouseStorageStatus != null">#{warehouseStorageStatus},</if> |
||||
|
<if test="warehouseQualityStatus != null">#{warehouseQualityStatus},</if> |
||||
|
<if test="warehouseStorageType != null">#{warehouseStorageType},</if> |
||||
|
<if test="warehouseOrderType != null">#{warehouseOrderType},</if> |
||||
|
<if test="warehouseDeptType != null">#{warehouseDeptType},</if> |
||||
|
<if test="notifyArrivedNum != null">#{notifyArrivedNum},</if> |
||||
|
<if test="actualArrivedNum != null">#{actualArrivedNum},</if> |
||||
|
<if test="temporaryQualifiedNum != null">#{temporaryQualifiedNum},</if> |
||||
|
<if test="temporaryUnqualifiedNum != null">#{temporaryUnqualifiedNum},</if> |
||||
|
<if test="qualityQualifiedNum != null">#{qualityQualifiedNum},</if> |
||||
|
<if test="qualityUnqualifiedNum != null">#{qualityUnqualifiedNum},</if> |
||||
|
<if test="storageNum != null">#{storageNum},</if> |
||||
|
<if test="arrivedTime != null">#{arrivedTime},</if> |
||||
|
<if test="temporaryTime != null">#{temporaryTime},</if> |
||||
|
<if test="deliveryInspectionTime != null">#{deliveryInspectionTime},</if> |
||||
|
<if test="qualityTime != null">#{qualityTime},</if> |
||||
|
<if test="storageTime != null">#{storageTime},</if> |
||||
|
<if test="warehouseEmployee != null">#{warehouseEmployee},</if> |
||||
|
<if test="warehouseCode != null">#{warehouseCode},</if> |
||||
|
<if test="warehouseName != null">#{warehouseName},</if> |
||||
|
<if test="createTime != null">#{createTime},</if> |
||||
|
<if test="createBy != null">#{createBy},</if> |
||||
|
<if test="updateBy != null">#{updateBy},</if> |
||||
|
<if test="updateTime != null">#{updateTime},</if> |
||||
|
</trim> |
||||
|
</insert> |
||||
|
|
||||
|
<update id="updateWarehouseStorageOrder" parameterType="WarehouseStorageOrder"> |
||||
|
update warehouse_storage_order |
||||
|
<trim prefix="SET" suffixOverrides=","> |
||||
|
<if test="warehouseStorageCode != null">warehouse_storage_code = #{warehouseStorageCode},</if> |
||||
|
<if test="relatedOrderCode != null">related_order_code = #{relatedOrderCode},</if> |
||||
|
<if test="warehouseStorageStatus != null">warehouse_storage_status = #{warehouseStorageStatus},</if> |
||||
|
<if test="warehouseQualityStatus != null">warehouse_quality_status = #{warehouseQualityStatus},</if> |
||||
|
<if test="warehouseStorageType != null">warehouse_storage_type = #{warehouseStorageType},</if> |
||||
|
<if test="warehouseOrderType != null">warehouse_order_type = #{warehouseOrderType},</if> |
||||
|
<if test="warehouseDeptType != null">warehouse_dept_type = #{warehouseDeptType},</if> |
||||
|
<if test="notifyArrivedNum != null">notify_arrived_num = #{notifyArrivedNum},</if> |
||||
|
<if test="actualArrivedNum != null">actual_arrived_num = #{actualArrivedNum},</if> |
||||
|
<if test="temporaryQualifiedNum != null">temporary_qualified_num = #{temporaryQualifiedNum},</if> |
||||
|
<if test="temporaryUnqualifiedNum != null">temporary_unqualified_num = #{temporaryUnqualifiedNum},</if> |
||||
|
<if test="qualityQualifiedNum != null">quality_qualified_num = #{qualityQualifiedNum},</if> |
||||
|
<if test="qualityUnqualifiedNum != null">quality_unqualified_num = #{qualityUnqualifiedNum},</if> |
||||
|
<if test="storageNum != null">storage_num = #{storageNum},</if> |
||||
|
<if test="arrivedTime != null">arrived_time = #{arrivedTime},</if> |
||||
|
<if test="temporaryTime != null">temporary_time = #{temporaryTime},</if> |
||||
|
<if test="deliveryInspectionTime != null">delivery_inspection_time = #{deliveryInspectionTime},</if> |
||||
|
<if test="qualityTime != null">quality_time = #{qualityTime},</if> |
||||
|
<if test="storageTime != null">storage_time = #{storageTime},</if> |
||||
|
<if test="warehouseEmployee != null">warehouse_employee = #{warehouseEmployee},</if> |
||||
|
<if test="warehouseCode != null">warehouse_code = #{warehouseCode},</if> |
||||
|
<if test="warehouseName != null">warehouse_name = #{warehouseName},</if> |
||||
|
<if test="createTime != null">create_time = #{createTime},</if> |
||||
|
<if test="createBy != null">create_by = #{createBy},</if> |
||||
|
<if test="updateBy != null">update_by = #{updateBy},</if> |
||||
|
<if test="updateTime != null">update_time = #{updateTime},</if> |
||||
|
</trim> |
||||
|
where warehouse_storage_id = #{warehouseStorageId} |
||||
|
</update> |
||||
|
|
||||
|
<delete id="deleteWarehouseStorageOrderById" parameterType="Long"> |
||||
|
delete from warehouse_storage_order where warehouse_storage_id = #{warehouseStorageId} |
||||
|
</delete> |
||||
|
|
||||
|
<delete id="deleteWarehouseStorageOrderByIds" parameterType="String"> |
||||
|
delete from warehouse_storage_order where warehouse_storage_id in |
||||
|
<foreach item="warehouseStorageId" collection="array" open="(" separator="," close=")"> |
||||
|
#{warehouseStorageId} |
||||
|
</foreach> |
||||
|
</delete> |
||||
|
|
||||
|
<update id="cancelWarehouseStorageOrderById" parameterType="Long"> |
||||
|
update warehouse_storage_order set del_flag = '1' where warehouse_storage_id = #{warehouseStorageId} |
||||
|
</update> |
||||
|
|
||||
|
<update id="restoreWarehouseStorageOrderById" parameterType="Long"> |
||||
|
update warehouse_storage_order set del_flag = '0' where warehouse_storage_id = #{warehouseStorageId} |
||||
|
</update> |
||||
|
|
||||
|
</mapper> |
||||
@ -0,0 +1,174 @@ |
|||||
|
<!DOCTYPE html> |
||||
|
<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro"> |
||||
|
<head> |
||||
|
<th:block th:include="include :: header('售后客诉通知单列表')" /> |
||||
|
</head> |
||||
|
<body class="gray-bg"> |
||||
|
<div class="container-div"> |
||||
|
<div class="row"> |
||||
|
<div class="col-sm-12 search-collapse"> |
||||
|
<form id="formId"> |
||||
|
<div class="select-list"> |
||||
|
<ul> |
||||
|
<li> |
||||
|
<label>客诉单号：</label> |
||||
|
<input type="text" name="complaintNoticeCode"/> |
||||
|
</li> |
||||
|
<li> |
||||
|
<label>是否结案：</label> |
||||
|
<select name="closingProcedures" th:with="type=${@dict.getType('aftersales_closing_procedures')}"> |
||||
|
<option value="">所有</option> |
||||
|
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option> |
||||
|
</select> |
||||
|
</li> |
||||
|
<li> |
||||
|
<label>紧急程度：</label> |
||||
|
<select name="emergencyDegree" th:with="type=${@dict.getType('aftersales_emergency_degree')}"> |
||||
|
<option value="">所有</option> |
||||
|
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option> |
||||
|
</select> |
||||
|
</li> |
||||
|
<li> |
||||
|
<label>生产单号：</label> |
||||
|
<input type="text" name="makeNo"/> |
||||
|
</li> |
||||
|
<li> |
||||
|
<label>料号：</label> |
||||
|
<input type="text" name="materialNo"/> |
||||
|
</li> |
||||
|
<li> |
||||
|
<label>物料名称：</label> |
||||
|
<input type="text" name="materialName"/> |
||||
|
</li> |
||||
|
<li class="select-time"> |
||||
|
<label>录入时间：</label> |
||||
|
<input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginCreateTime]"/> |
||||
|
<span>-</span> |
||||
|
<input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endCreateTime]"/> |
||||
|
</li> |
||||
|
<li> |
||||
|
<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i> 搜索</a> |
||||
|
<a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i> 重置</a> |
||||
|
</li> |
||||
|
</ul> |
||||
|
</div> |
||||
|
</form> |
||||
|
</div> |
||||
|
|
||||
|
<div class="btn-group-sm" id="toolbar" role="group"> |
||||
|
<a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="aftersales:complaintNotice:export"> |
||||
|
<i class="fa fa-download"></i> 导出 |
||||
|
</a> |
||||
|
</div> |
||||
|
<div class="col-sm-12 select-table table-striped"> |
||||
|
<table id="bootstrap-table"></table> |
||||
|
</div> |
||||
|
</div> |
||||
|
</div> |
||||
|
<th:block th:include="include :: footer" /> |
||||
|
<script th:inline="javascript"> |
||||
|
var returnInspectionFlag = [[${@permission.hasPermi('quality:complaintNotice:returnInspectionProcessing')}]]; |
||||
|
var detailFlag = [[${@permission.hasPermi('quality:complaintNotice:detail')}]]; |
||||
|
var removeFlag = [[${@permission.hasPermi('quality:complaintNotice:remove')}]]; |
||||
|
var emergencyDegreeDatas = [[${@dict.getType('aftersales_emergency_degree')}]]; |
||||
|
var closingProceduresDatas = [[${@dict.getType('aftersales_closing_procedures')}]]; |
||||
|
var prefix = ctx + "quality/complaintNotice"; |
||||
|
|
||||
|
$(function() { |
||||
|
var options = { |
||||
|
url: prefix + "/list", |
||||
|
createUrl: prefix + "/add", |
||||
|
updateUrl: prefix + "/edit/{id}", |
||||
|
removeUrl: prefix + "/remove", |
||||
|
exportUrl: prefix + "/export", |
||||
|
modalName: "售后客诉通知单", |
||||
|
columns: [{ |
||||
|
checkbox: true |
||||
|
}, |
||||
|
{ |
||||
|
title: '客诉通知详情ID', |
||||
|
field: 'complaintNoticeId', |
||||
|
visible: false |
||||
|
}, |
||||
|
{ |
||||
|
title: '客诉单号', |
||||
|
field: 'complaintNoticeCode', |
||||
|
}, |
||||
|
{ |
||||
|
title: '是否结案', |
||||
|
field: 'closingProcedures', |
||||
|
formatter: function(value, row, index) { |
||||
|
return $.table.selectDictLabel(closingProceduresDatas, value); |
||||
|
} |
||||
|
}, |
||||
|
|
||||
|
{ |
||||
|
title: '关联生产单号', |
||||
|
field: 'makeNo', |
||||
|
}, |
||||
|
{ |
||||
|
title: '紧急程度', |
||||
|
field: 'emergencyDegree', |
||||
|
formatter: function(value, row, index) { |
||||
|
return $.table.selectDictLabel(emergencyDegreeDatas, value); |
||||
|
} |
||||
|
}, |
||||
|
|
||||
|
{ |
||||
|
title: '物料合计', |
||||
|
field: 'materialSum', |
||||
|
}, |
||||
|
{ |
||||
|
title: '数量合计', |
||||
|
field: 'enterpriseSum', |
||||
|
}, |
||||
|
{ |
||||
|
title: '录入人', |
||||
|
field: 'createBy', |
||||
|
}, |
||||
|
{ |
||||
|
title: '录入时间', |
||||
|
field: 'createTime', |
||||
|
}, |
||||
|
{ |
||||
|
title: '更新人', |
||||
|
field: 'updateBy', |
||||
|
}, |
||||
|
{ |
||||
|
title: '上次更新时间', |
||||
|
field: 'updateTime', |
||||
|
}, |
||||
|
{ |
||||
|
title: '操作', |
||||
|
align: 'center', |
||||
|
formatter: function(value, row, index) { |
||||
|
var actions = []; |
||||
|
if (row.closingProcedures !== '0') { |
||||
|
actions.push('<a class="btn btn-success btn-xs ' + returnInspectionFlag + '" href="javascript:void(0)" onclick="returnInspectionProcessing(\'' + row.complaintNoticeId + '\')"><i class="fa fa-edit"></i>退检处理</a> '); |
||||
|
} |
||||
|
actions.push('<a class="btn btn-success btn-xs ' + detailFlag + '" href="javascript:void(0)" onclick="detail(\'' + row.complaintNoticeId + '\')"><i class="fa fa-edit"></i>详情</a> '); |
||||
|
return actions.join(''); |
||||
|
} |
||||
|
}] |
||||
|
}; |
||||
|
$.table.init(options); |
||||
|
}); |
||||
|
|
||||
|
/*详情*/ |
||||
|
function detail(complaintNoticeId) { |
||||
|
// 在这里编写派单操作的逻辑，使用传入的aftersalesOrderId参数 |
||||
|
// 示例逻辑： |
||||
|
var url = ctx + 'quality/complaintNotice/detail/'+complaintNoticeId; |
||||
|
console.log(url); |
||||
|
$.modal.open("客诉通知单详情",url); |
||||
|
} |
||||
|
|
||||
|
/*退检处理*/ |
||||
|
function returnInspectionProcessing(complaintNoticeId){ |
||||
|
var url = ctx + 'quality/complaintNotice/returnInspectionProcessing/'+complaintNoticeId; |
||||
|
console.log(url); |
||||
|
$.modal.open("退检处理",url); |
||||
|
} |
||||
|
</script> |
||||
|
</body> |
||||
|
</html> |
||||
@ -0,0 +1,336 @@ |
|||||
|
<!DOCTYPE html> |
||||
|
<html lang="zh" xmlns:th="http://www.thymeleaf.org" > |
||||
|
<head> |
||||
|
<th:block th:include="include :: header('修改售后客诉通知单')" /> |
||||
|
</head> |
||||
|
<body class="white-bg"> |
||||
|
<div class="wrapper wrapper-content animated fadeInRight ibox-content"> |
||||
|
<form class="form-horizontal m" id="form-complaintNotice-edit" th:object="${aftersalesComplaintNotice}"> |
||||
|
<input name="complaintNoticeCode" th:field="*{complaintNoticeCode}" type="hidden"> |
||||
|
<div class="form-group"> |
||||
|
<label class="col-sm-4 control-label">客户编号：</label> |
||||
|
<div class="col-sm-8"> |
||||
|
<select class="form-control" id="customerId" name="customerId" th:field="*{customerId}" onchange="loadMakeNos()" readonly> |
||||
|
<!-- 这里动态生成客户编号选项 --> |
||||
|
</select> |
||||
|
</div> |
||||
|
</div> |
||||
|
<div class="form-group"> |
||||
|
<label class="col-sm-4 control-label">客户名称：</label> |
||||
|
<div class="col-sm-8"> |
||||
|
<input name="customerName" th:field="*{customerName}" class="form-control" type="text" readonly> |
||||
|
</div> |
||||
|
</div> |
||||
|
<div class="form-group"> |
||||
|
<label class="col-sm-4 control-label">生产单号：</label> |
||||
|
<div class="col-sm-8"> |
||||
|
<select class="form-control" id="makeNo" name="makeNo" th:field="*{makeNo}" readonly> |
||||
|
<!-- 这里动态生成生产单号选项 --> |
||||
|
</select> |
||||
|
</div> |
||||
|
</div> |
||||
|
<div class="form-group"> |
||||
|
<label class="col-sm-4 control-label">紧急程度：</label> |
||||
|
<div class="col-sm-8"> |
||||
|
<select name="emergencyDegree" class="form-control m-b" th:with="type=${@dict.getType('aftersales_emergency_degree')}" readonly> |
||||
|
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{emergencyDegree}"></option> |
||||
|
</select> |
||||
|
</div> |
||||
|
</div> |
||||
|
<div class="form-group"> |
||||
|
<label class="col-sm-4 control-label">备注信息：</label> |
||||
|
<div class="col-sm-8"> |
||||
|
<input name="remark" th:field="*{remark}" class="form-control" type="text" readonly> |
||||
|
</div> |
||||
|
</div> |
||||
|
</form> |
||||
|
<div class="container"> |
||||
|
<div class="row"> |
||||
|
<div class="col-sm-12 select-table table-striped"> |
||||
|
<table id="bootstrap-table"></table> |
||||
|
</div> |
||||
|
</div> |
||||
|
</div> |
||||
|
</div> |
||||
|
<th:block th:include="include :: footer" /> |
||||
|
<!--用于可以修改列表字段的插件--> |
||||
|
<th:block th:include="include :: bootstrap-table-editable-js" /> |
||||
|
<script th:inline="javascript"> |
||||
|
var removeFlag = [[${@permission.hasPermi('aftersales:complaintNotice:remove')}]]; |
||||
|
var aftersalesComplaintNotice = [[${aftersalesComplaintNotice}]]; |
||||
|
var prefix = ctx + "aftersales/complaintNotice" |
||||
|
var customerId = [[${aftersalesComplaintNotice.customerId}]] |
||||
|
var makeNo = [[${aftersalesComplaintNotice.makeNo}]] |
||||
|
$("#form-complaintNotice-edit").validate({ |
||||
|
focusCleanup: true |
||||
|
}); |
||||
|
|
||||
|
// 新增提交 |
||||
|
function submitHandler() { |
||||
|
// 获取表单数据 |
||||
|
// const complaintNoticeData = $("#form-complaintNotice-edit").serializeArray(); |
||||
|
// 获取表单数据 |
||||
|
const complaintNoticeData = $("#form-complaintNotice-edit").serializeArray().reduce((obj, item) => { |
||||
|
obj[item.name] = item.value; |
||||
|
return obj; |
||||
|
}, {}); |
||||
|
// 获取bootstrap-table的数据，这里假设你使用bootstrap-table的API获取所有数据 |
||||
|
var table = $('#bootstrap-table').bootstrapTable('getData'); |
||||
|
|
||||
|
// 将表数据转换成与complaintNoticeData格式一致的数组 |
||||
|
var materialDataList = table.map(function(item) { |
||||
|
// 根据实际字段名调整 |
||||
|
return { |
||||
|
"materialNo": item.materialNo, // 假设id对应materialId |
||||
|
"materialPhotourl": item.materialPhotourl, // 假设quantity是物料数量字段 |
||||
|
"materialName": item.materialName, |
||||
|
"materialType": item.materialType, |
||||
|
"materialUnit": item.materialUnit, |
||||
|
"materialBrand": item.materialBrand, |
||||
|
"materialDescribe": item.materialDescribe, |
||||
|
"snCode": item.snCode, |
||||
|
"complaintProblem": item.complaintProblem, |
||||
|
// "emergencyDegree": item.emergencyDegree, |
||||
|
"adverseReportUrl": item.adverseReportUrl, |
||||
|
// ...其他字段 |
||||
|
}; |
||||
|
}); |
||||
|
|
||||
|
// 合并表单数据和表格数据 |
||||
|
//const combinedData = Object.assign({}, ...complaintNoticeData.map(item => ({ [item.name]: item.value })), ...materialData); |
||||
|
const combinedData = Object.assign({}, complaintNoticeData, { aftersalesMaterialVOs: materialDataList }); |
||||
|
|
||||
|
console.log(combinedData) |
||||
|
// 使用 JSON.stringify() 序列化数据 |
||||
|
const jsonData = JSON.stringify(combinedData); |
||||
|
// 发送 AJAX 请求到后端接口 |
||||
|
$.operate.saveJson(prefix + "/edit", jsonData); |
||||
|
} |
||||
|
|
||||
|
|
||||
|
//获取客户信息 |
||||
|
$(document).ready(function() { |
||||
|
// 初始化时默认加载客户编号列表 |
||||
|
loadCustomerIds(); |
||||
|
|
||||
|
// 监听客户编号下拉框的变化 |
||||
|
$('#customerId').on('change', function() { |
||||
|
var selectedCustomerId = $(this).val(); // 获取选中的客户ID |
||||
|
if (selectedCustomerId) { |
||||
|
// 发起Ajax请求获取客户名称 |
||||
|
$.ajax({ |
||||
|
type: 'GET', |
||||
|
url: ctx +'system/customer/getCustomerNameByEnterpriseCode/' + selectedCustomerId, // 替换为你的实际API路径 |
||||
|
dataType: 'json', // 假设返回的数据格式是JSON |
||||
|
success: function(data) { |
||||
|
console.log(data); |
||||
|
// 将获取到的客户名称填充到输入框 |
||||
|
if(data.data == null){ |
||||
|
// 如果返回的数据有问题，可以给出提示或处理 |
||||
|
alert('未能获取到客户名称！'); |
||||
|
} |
||||
|
$('input[name="customerName"]').val(data.data.customerName); |
||||
|
}, |
||||
|
error: function(jqXHR, textStatus, errorThrown) { |
||||
|
console.error('Error:', textStatus, errorThrown); |
||||
|
alert('查询客户名称时发生错误！'); |
||||
|
} |
||||
|
}); |
||||
|
} else { |
||||
|
// 如果没有选择客户ID，清空客户名称输入框 |
||||
|
$('input[name="customerName"]').val(''); |
||||
|
} |
||||
|
}); |
||||
|
}); |
||||
|
|
||||
|
|
||||
|
//获取已经选择客户Id相关的生产单号 |
||||
|
function loadMakeNos() { |
||||
|
var selectedCustomerId = $('#customerId').val(); // 获取选中的客户ID |
||||
|
if (!selectedCustomerId) { |
||||
|
// 如果没有选中客户，则清空生产单号下拉框并可添加提示信息 |
||||
|
$('#makeNo').empty().append('<option value="">请选择客户编号后加载生产单号</option>'); |
||||
|
return; // 直接返回，不发起请求 |
||||
|
} |
||||
|
|
||||
|
var makeNoUrl = ctx + 'aftersales/complaintNotice/getMakeNosByCustomerId/' + selectedCustomerId; // 假定的后端接口URL，根据实际调整 |
||||
|
$.ajax({ |
||||
|
type: 'GET', |
||||
|
url: makeNoUrl, |
||||
|
dataType: 'json', |
||||
|
success: function(data) { |
||||
|
console.log(data); |
||||
|
if (data && Array.isArray(data)) { |
||||
|
var selectElement = $('#makeNo'); // 获取生产单号下拉框元素 |
||||
|
selectElement.empty(); // 清空现有选项 |
||||
|
|
||||
|
// 添加默认选项（如果需要） |
||||
|
// selectElement.append('<option value="">请选择生产单号</option>'); |
||||
|
|
||||
|
// 遍历返回的数据，添加为下拉框的选项 |
||||
|
$.each(data, function(index, item) { |
||||
|
// 假设item有makeNo属性，代表生产单号 |
||||
|
selectElement.append('<option value="' + item.makeNo + '">' + item.makeNo + '</option>'); |
||||
|
}); |
||||
|
$("#makeNo").val(makeNo); |
||||
|
} else { |
||||
|
console.error('数据为空.'); |
||||
|
// 可能还需要处理UI显示，比如提示无相关生产单号 |
||||
|
} |
||||
|
}, |
||||
|
error: function(jqXHR, textStatus, errorThrown) { |
||||
|
console.error('Failed to fetch make numbers: ' + textStatus + ', ' + errorThrown); |
||||
|
// 同样考虑UI反馈，如提示加载失败 |
||||
|
} |
||||
|
}); |
||||
|
} |
||||
|
// 假设的加载客户编号列表函数 |
||||
|
function loadCustomerIds() { |
||||
|
var url = ctx + 'system/customer/getCustomers'; |
||||
|
$.ajax({ |
||||
|
type: 'GET', // 请求类型 |
||||
|
url: url, // 后端接口URL |
||||
|
dataType: 'json', // 预期服务器返回的数据类型 |
||||
|
success: function(data) { |
||||
|
if (data && Array.isArray(data)) { |
||||
|
var selectElement = $('#customerId'); // 获取客户编号下拉框元素 |
||||
|
// 清空下拉框现有选项 |
||||
|
selectElement.empty(); |
||||
|
|
||||
|
// // 添加默认选项（如果需要）编辑时不需要添加默认选项 |
||||
|
// selectElement.append('<option value="">请选择客户编号</option>'); |
||||
|
|
||||
|
// 遍历返回的数据，添加为下拉框的选项 |
||||
|
$.each(data, function(index, item) { |
||||
|
// 假设item有id和name两个属性，分别代表客户ID和客户编号 |
||||
|
selectElement.append('<option value="' + item.customerId + '">' + item.customerId + '</option>'); |
||||
|
}); |
||||
|
$('#customerId').val(customerId); |
||||
|
loadMakeNos(); |
||||
|
} else { |
||||
|
$.modal.errMsg("数据为空"); |
||||
|
} |
||||
|
}, |
||||
|
// error: function(jqXHR, textStatus, errorThrown) { |
||||
|
// console.error('Failed to fetch customer IDs: ' + textStatus + ', ' + errorThrown); |
||||
|
// } |
||||
|
}); |
||||
|
} |
||||
|
|
||||
|
// 点击选择物料按钮 |
||||
|
function insertRow() { |
||||
|
var selectedMakeNo = $("#makeNo").val(); |
||||
|
if (!selectedMakeNo) { |
||||
|
alert("请先选择生产单号。"); |
||||
|
return; |
||||
|
} |
||||
|
var encodedMakeNo = encodeURIComponent(selectedMakeNo); |
||||
|
var url = ctx + 'aftersales/complaintNotice/materialSelect?makeNo=' + encodedMakeNo; |
||||
|
var options = { |
||||
|
title: '选择物料', |
||||
|
url: url, |
||||
|
callBack: doSubmit |
||||
|
}; |
||||
|
$.modal.openOptions(options); |
||||
|
} |
||||
|
|
||||
|
//物料信息展示列表 |
||||
|
$(function() { |
||||
|
var options = { |
||||
|
url: ctx + "aftersales/complaintNotice/getMaterialListByNoticeCode", |
||||
|
queryParams: queryParams, |
||||
|
modalName: "选择物料", |
||||
|
columns: [{ |
||||
|
checkbox: true |
||||
|
}, |
||||
|
{ |
||||
|
title: '料号', |
||||
|
field: 'materialNo', |
||||
|
}, |
||||
|
{ |
||||
|
title: '图片', |
||||
|
field: 'materialPhotourl', |
||||
|
}, |
||||
|
{ |
||||
|
title: '物料名称', |
||||
|
field: 'materialName', |
||||
|
}, |
||||
|
{ |
||||
|
title: '物料类型', |
||||
|
field: 'materialType', |
||||
|
}, |
||||
|
{ |
||||
|
title: '单位', |
||||
|
field: 'materialUnit', |
||||
|
}, |
||||
|
{ |
||||
|
title: '品牌', |
||||
|
field: 'materialBrand', |
||||
|
}, |
||||
|
{ |
||||
|
title: '描述', |
||||
|
field: 'materialDescribe', |
||||
|
}, |
||||
|
{ |
||||
|
title: 'SN号', |
||||
|
field: 'snCode' |
||||
|
}, |
||||
|
|
||||
|
{ |
||||
|
title: '客诉问题', |
||||
|
field: 'complaintProblem' |
||||
|
}, |
||||
|
{ |
||||
|
title: '售后问题', |
||||
|
field: 'adverseReportUrl' |
||||
|
}, |
||||
|
] |
||||
|
}; |
||||
|
$.table.init(options); |
||||
|
}) |
||||
|
|
||||
|
function queryParams(params) { |
||||
|
var curParams = { |
||||
|
// 传递参数查询参数 |
||||
|
complaintNoticeCode: aftersalesComplaintNotice.complaintNoticeCode |
||||
|
}; |
||||
|
console.log(curParams); |
||||
|
return curParams; |
||||
|
} |
||||
|
|
||||
|
function doSubmit(index, layero,uniqueId){ |
||||
|
console.log(uniqueId); |
||||
|
var iframeWin = window[layero.find('iframe')[0]['name']]; |
||||
|
var rowData = iframeWin.$('#bootstrap-materialSelect-table').bootstrapTable('getSelections')[0]; |
||||
|
console.log("rowData: "+rowData); |
||||
|
$("#bootstrap-table").bootstrapTable('insertRow', { |
||||
|
index:1, |
||||
|
row: { |
||||
|
materialNo:rowData.materialNo, |
||||
|
materialPhotourl:rowData.materialPhotourl, |
||||
|
materialName: rowData.materialName, |
||||
|
materialType: rowData.materialType, |
||||
|
materialDescribe: rowData.materialDescribe, |
||||
|
materialBrand: rowData.materialBrand, |
||||
|
materialUnit: rowData.materialUnit, |
||||
|
materialProcessMethod: rowData.materialProcessMethod, |
||||
|
shippedGoodsSum: rowData.shippedGoodsSum, |
||||
|
snCode:"", |
||||
|
complaintProblem:"", |
||||
|
adverseReportUrl:"", |
||||
|
} |
||||
|
}) |
||||
|
layer.close(index); |
||||
|
} |
||||
|
|
||||
|
// 逻辑删除前端的一行数据 |
||||
|
function removeRow(materialNo){ |
||||
|
$("#bootstrap-table").bootstrapTable('remove', { |
||||
|
field: 'materialNo', |
||||
|
values: materialNo |
||||
|
}) |
||||
|
} |
||||
|
|
||||
|
</script> |
||||
|
</body> |
||||
|
</html> |
||||
@ -0,0 +1,382 @@ |
|||||
|
<!DOCTYPE html> |
||||
|
<html lang="zh" xmlns:th="http://www.thymeleaf.org" > |
||||
|
<head> |
||||
|
<th:block th:include="include :: header('修改售后客诉通知单')" /> |
||||
|
</head> |
||||
|
<body class="white-bg"> |
||||
|
<div class="wrapper wrapper-content animated fadeInRight ibox-content"> |
||||
|
<form class="form-horizontal m" id="form-complaintNotice-edit" th:object="${aftersalesComplaintNotice}"> |
||||
|
<input name="complaintNoticeCode" th:field="*{complaintNoticeCode}" type="hidden"> |
||||
|
<div class="form-group"> |
||||
|
<label class="col-sm-4 control-label is-required">客户编号：</label> |
||||
|
<div class="col-sm-8"> |
||||
|
<select class="form-control" id="customerId" name="customerId" th:field="*{customerId}" onchange="loadMakeNos()" required disabled> |
||||
|
<!-- 这里动态生成客户编号选项 --> |
||||
|
</select> |
||||
|
</div> |
||||
|
</div> |
||||
|
<div class="form-group"> |
||||
|
<label class="col-sm-4 control-label">客户名称：</label> |
||||
|
<div class="col-sm-8"> |
||||
|
<input name="customerName" th:field="*{customerName}" class="form-control" type="text" readonly> |
||||
|
</div> |
||||
|
</div> |
||||
|
<div class="form-group"> |
||||
|
<label class="col-sm-4 control-label is-required">生产单号：</label> |
||||
|
<div class="col-sm-8"> |
||||
|
<select class="form-control" id="makeNo" name="makeNo" th:field="*{makeNo}" required disabled> |
||||
|
<!-- 这里动态生成生产单号选项 --> |
||||
|
</select> |
||||
|
</div> |
||||
|
</div> |
||||
|
<div class="form-group"> |
||||
|
<label class="col-sm-4 control-label">紧急程度：</label> |
||||
|
<div class="col-sm-8"> |
||||
|
<select name="emergencyDegree" class="form-control m-b" th:with="type=${@dict.getType('aftersales_emergency_degree')}" disabled> |
||||
|
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{emergencyDegree}"></option> |
||||
|
</select> |
||||
|
</div> |
||||
|
</div> |
||||
|
<div class="form-group"> |
||||
|
<label class="col-sm-4 control-label">备注信息：</label> |
||||
|
<div class="col-sm-8"> |
||||
|
<input name="remark" th:field="*{remark}" class="form-control" type="text"> |
||||
|
</div> |
||||
|
</div> |
||||
|
|
||||
|
<div class="form-group"> |
||||
|
<label class="col-sm-4 control-label">是否结案：</label> |
||||
|
<div class="col-sm-8"> |
||||
|
<div class="radio-box" th:each="dict : ${@dict.getType('aftersales_closing_procedures')}"> |
||||
|
<input type="radio" th:id="${'closingProcedures_' + dict.dictCode}" name="closingProcedures" th:value="${dict.dictValue}" th:field="*{closingProcedures}"> |
||||
|
<label th:for="${'closingProcedures_' + dict.dictCode}" th:text="${dict.dictLabel}"></label> |
||||
|
</div> |
||||
|
</div> |
||||
|
</div> |
||||
|
</form> |
||||
|
<div class="container"> |
||||
|
<div class="row"> |
||||
|
<div class="col-sm-12 select-table table-striped"> |
||||
|
<table id="bootstrap-table"></table> |
||||
|
</div> |
||||
|
</div> |
||||
|
</div> |
||||
|
</div> |
||||
|
<th:block th:include="include :: footer" /> |
||||
|
<!--用于可以修改列表字段的插件--> |
||||
|
<th:block th:include="include :: bootstrap-table-editable-js" /> |
||||
|
<script th:inline="javascript"> |
||||
|
var removeFlag = [[${@permission.hasPermi('aftersales:complaintNotice:remove')}]]; |
||||
|
var aftersalesComplaintNotice = [[${aftersalesComplaintNotice}]]; |
||||
|
var prefix = ctx + "aftersales/complaintNotice" |
||||
|
var customerId = [[${aftersalesComplaintNotice.customerId}]] |
||||
|
var makeNo = [[${aftersalesComplaintNotice.makeNo}]] |
||||
|
$("#form-complaintNotice-edit").validate({ |
||||
|
focusCleanup: true |
||||
|
}); |
||||
|
|
||||
|
// 新增提交 |
||||
|
function submitHandler() { |
||||
|
// 获取表单数据 |
||||
|
// const complaintNoticeData = $("#form-complaintNotice-edit").serializeArray(); |
||||
|
// 获取表单数据 |
||||
|
const complaintNoticeData = $("#form-complaintNotice-edit").serializeArray().reduce((obj, item) => { |
||||
|
obj[item.name] = item.value; |
||||
|
return obj; |
||||
|
}, {}); |
||||
|
// 获取bootstrap-table的数据，这里假设你使用bootstrap-table的API获取所有数据 |
||||
|
var table = $('#bootstrap-table').bootstrapTable('getData'); |
||||
|
// 检查表格数据是否为空 |
||||
|
if (table.length===0){ |
||||
|
$.modal.alertWarning("请至少保留一条物料数据后再保存!"); |
||||
|
return; |
||||
|
} |
||||
|
// 将表数据转换成与complaintNoticeData格式一致的数组 |
||||
|
var materialDataList = table.map(function(item) { |
||||
|
// 根据实际字段名调整 |
||||
|
return { |
||||
|
"materialNo": item.materialNo, // 假设id对应materialId |
||||
|
"materialPhotourl": item.materialPhotourl, // 假设quantity是物料数量字段 |
||||
|
"materialName": item.materialName, |
||||
|
"materialType": item.materialType, |
||||
|
"materialUnit": item.materialUnit, |
||||
|
"materialBrand": item.materialBrand, |
||||
|
"materialDescribe": item.materialDescribe, |
||||
|
"snCode": item.snCode, |
||||
|
"complaintProblem": item.complaintProblem, |
||||
|
// "emergencyDegree": item.emergencyDegree, |
||||
|
"adverseReportUrl": item.adverseReportUrl, |
||||
|
// ...其他字段 |
||||
|
}; |
||||
|
}); |
||||
|
|
||||
|
// 合并表单数据和表格数据 |
||||
|
//const combinedData = Object.assign({}, ...complaintNoticeData.map(item => ({ [item.name]: item.value })), ...materialData); |
||||
|
const combinedData = Object.assign({}, complaintNoticeData, { aftersalesMaterialVOs: materialDataList }); |
||||
|
|
||||
|
console.log(combinedData) |
||||
|
// 使用 JSON.stringify() 序列化数据 |
||||
|
const jsonData = JSON.stringify(combinedData); |
||||
|
// 发送 AJAX 请求到后端接口 |
||||
|
$.operate.saveJson(prefix + "/edit", jsonData); |
||||
|
} |
||||
|
|
||||
|
|
||||
|
//获取客户信息 |
||||
|
$(document).ready(function() { |
||||
|
// 初始化时默认加载客户编号列表 |
||||
|
loadCustomerIds(); |
||||
|
|
||||
|
// 监听客户编号下拉框的变化 |
||||
|
$('#customerId').on('change', function() { |
||||
|
var selectedCustomerId = $(this).val(); // 获取选中的客户ID |
||||
|
if (selectedCustomerId) { |
||||
|
// 发起Ajax请求获取客户名称 |
||||
|
$.ajax({ |
||||
|
type: 'GET', |
||||
|
url: ctx +'system/customer/getCustomerNameByEnterpriseCode/' + selectedCustomerId, // 替换为你的实际API路径 |
||||
|
dataType: 'json', // 假设返回的数据格式是JSON |
||||
|
success: function(data) { |
||||
|
console.log(data); |
||||
|
// 将获取到的客户名称填充到输入框 |
||||
|
if(data.data == null){ |
||||
|
// 如果返回的数据有问题，可以给出提示或处理 |
||||
|
$.modal.alertWarning('未能获取到客户名称！'); |
||||
|
} |
||||
|
$('input[name="customerName"]').val(data.data.customerName); |
||||
|
}, |
||||
|
error: function(jqXHR, textStatus, errorThrown) { |
||||
|
console.error('Error:', textStatus, errorThrown); |
||||
|
$.modal.alertWarning('查询客户名称时发生错误！'); |
||||
|
} |
||||
|
}); |
||||
|
} else { |
||||
|
// 如果没有选择客户ID，清空客户名称输入框 |
||||
|
$('input[name="customerName"]').val(''); |
||||
|
} |
||||
|
}); |
||||
|
}); |
||||
|
|
||||
|
|
||||
|
//获取已经选择客户Id相关的生产单号 |
||||
|
function loadMakeNos() { |
||||
|
var selectedCustomerId = $('#customerId').val(); // 获取选中的客户ID |
||||
|
if (!selectedCustomerId) { |
||||
|
// 如果没有选中客户，则清空生产单号下拉框并可添加提示信息 |
||||
|
$('#makeNo').empty().append('<option value="">请选择客户编号后加载生产单号</option>'); |
||||
|
return; // 直接返回，不发起请求 |
||||
|
} |
||||
|
|
||||
|
var makeNoUrl = ctx + 'aftersales/complaintNotice/getMakeNosByCustomerId/' + selectedCustomerId; // 假定的后端接口URL，根据实际调整 |
||||
|
$.ajax({ |
||||
|
type: 'GET', |
||||
|
url: makeNoUrl, |
||||
|
dataType: 'json', |
||||
|
success: function(data) { |
||||
|
console.log(data); |
||||
|
if (data && Array.isArray(data)) { |
||||
|
var selectElement = $('#makeNo'); // 获取生产单号下拉框元素 |
||||
|
selectElement.empty(); // 清空现有选项 |
||||
|
|
||||
|
// 添加默认选项（如果需要） |
||||
|
// selectElement.append('<option value="">请选择生产单号</option>'); |
||||
|
|
||||
|
// 遍历返回的数据，添加为下拉框的选项 |
||||
|
$.each(data, function(index, item) { |
||||
|
// 假设item有makeNo属性，代表生产单号 |
||||
|
selectElement.append('<option value="' + item.makeNo + '">' + item.makeNo + '</option>'); |
||||
|
}); |
||||
|
$("#makeNo").val(makeNo); |
||||
|
} else { |
||||
|
$.modal.errMsg("数据为空"); |
||||
|
// 可能还需要处理UI显示，比如提示无相关生产单号 |
||||
|
} |
||||
|
}, |
||||
|
error: function(jqXHR, textStatus, errorThrown) { |
||||
|
console.error('Failed to fetch make numbers: ' + textStatus + ', ' + errorThrown); |
||||
|
// 同样，如提示加载失败 |
||||
|
} |
||||
|
}); |
||||
|
} |
||||
|
// 假设的加载客户编号列表函数 |
||||
|
function loadCustomerIds() { |
||||
|
var url = ctx + 'system/customer/getCustomers'; |
||||
|
$.ajax({ |
||||
|
type: 'GET', // 请求类型 |
||||
|
url: url, // 后端接口URL |
||||
|
dataType: 'json', // 预期服务器返回的数据类型 |
||||
|
success: function(data) { |
||||
|
if (data && Array.isArray(data)) { |
||||
|
var selectElement = $('#customerId'); // 获取客户编号下拉框元素 |
||||
|
// 清空下拉框现有选项 |
||||
|
selectElement.empty(); |
||||
|
|
||||
|
// // 添加默认选项（如果需要）编辑时不需要添加默认选项 |
||||
|
// selectElement.append('<option value="">请选择客户编号</option>'); |
||||
|
|
||||
|
// 遍历返回的数据，添加为下拉框的选项 |
||||
|
$.each(data, function(index, item) { |
||||
|
// 假设item有id和name两个属性，分别代表客户ID和客户编号 |
||||
|
selectElement.append('<option value="' + item.customerId + '">' + item.customerId + '</option>'); |
||||
|
}); |
||||
|
$('#customerId').val(customerId); |
||||
|
loadMakeNos(); |
||||
|
} else { |
||||
|
$.modal.errMsg("数据为空"); |
||||
|
} |
||||
|
}, |
||||
|
error: function(jqXHR, textStatus, errorThrown) { |
||||
|
console.error('Failed to fetch customer IDs: ' + textStatus + ', ' + errorThrown); |
||||
|
} |
||||
|
}); |
||||
|
} |
||||
|
|
||||
|
// 点击选择物料按钮 |
||||
|
function insertRow() { |
||||
|
var selectedMakeNo = $("#makeNo").val(); |
||||
|
if (!selectedMakeNo) { |
||||
|
alert("请先选择生产单号。"); |
||||
|
return; |
||||
|
} |
||||
|
var encodedMakeNo = encodeURIComponent(selectedMakeNo); |
||||
|
var url = ctx + 'aftersales/complaintNotice/materialSelect?makeNo=' + encodedMakeNo; |
||||
|
var options = { |
||||
|
title: '选择物料', |
||||
|
url: url, |
||||
|
callBack: doSubmit |
||||
|
}; |
||||
|
$.modal.openOptions(options); |
||||
|
} |
||||
|
|
||||
|
//物料信息展示列表 |
||||
|
$(function() { |
||||
|
var options = { |
||||
|
url: ctx + "aftersales/complaintNotice/getMaterialListByNoticeCode", |
||||
|
showSearch: false, |
||||
|
showRefresh: false, |
||||
|
showToggle: false, |
||||
|
showColumns: false, |
||||
|
pagination: false, // 设置不分页 |
||||
|
queryParams: queryParams, |
||||
|
modalName: "选择物料", |
||||
|
columns: [{ |
||||
|
checkbox: true |
||||
|
}, |
||||
|
{ |
||||
|
title: '料号', |
||||
|
field: 'materialNo', |
||||
|
}, |
||||
|
{ |
||||
|
title: '图片', |
||||
|
field: 'materialPhotourl', |
||||
|
}, |
||||
|
{ |
||||
|
title: '物料名称', |
||||
|
field: 'materialName', |
||||
|
}, |
||||
|
{ |
||||
|
title: '物料类型', |
||||
|
field: 'materialType', |
||||
|
}, |
||||
|
{ |
||||
|
title: '单位', |
||||
|
field: 'materialUnit', |
||||
|
}, |
||||
|
{ |
||||
|
title: '品牌', |
||||
|
field: 'materialBrand', |
||||
|
}, |
||||
|
{ |
||||
|
title: '描述', |
||||
|
field: 'materialDescribe', |
||||
|
}, |
||||
|
{ |
||||
|
title: '加工方式', |
||||
|
field: 'materialProcessMethod', |
||||
|
}, |
||||
|
{ |
||||
|
title: '出库数量', |
||||
|
field: 'shippedGoodsSum', |
||||
|
}, |
||||
|
{ |
||||
|
title: 'SN号', |
||||
|
field: 'snCode', |
||||
|
editable: { |
||||
|
type: 'text', // 表示该列可以被编辑为文本 |
||||
|
}, |
||||
|
}, |
||||
|
|
||||
|
{ |
||||
|
title: '客诉问题', |
||||
|
field: 'complaintProblem', |
||||
|
editable: { |
||||
|
type: 'text', // 表示该列可以被编辑为文本 |
||||
|
}, |
||||
|
}, |
||||
|
{ |
||||
|
title: '售后问题', |
||||
|
field: 'adverseReportUrl', |
||||
|
editable: { |
||||
|
type: 'text', // 表示该列可以被编辑为文本 |
||||
|
// 可以在这里定义更多编辑行为，比如验证、提交等 |
||||
|
}, |
||||
|
}, |
||||
|
{ |
||||
|
title: '操作', |
||||
|
align: 'center', |
||||
|
formatter: function(value, row, index) { |
||||
|
var actions = []; |
||||
|
actions.push('<a class="btn btn-danger btn-xs" href="javascript:void(0)" onclick="removeRow(\'' + row.materialNo + '\')"><i class="fa fa-remove"></i>删除</a> '); |
||||
|
return actions.join(''); |
||||
|
} |
||||
|
} |
||||
|
] |
||||
|
}; |
||||
|
$.table.init(options); |
||||
|
}) |
||||
|
|
||||
|
function queryParams(params) { |
||||
|
var curParams = { |
||||
|
// 传递参数查询参数 |
||||
|
complaintNoticeCode: aftersalesComplaintNotice.complaintNoticeCode |
||||
|
}; |
||||
|
console.log(curParams); |
||||
|
return curParams; |
||||
|
} |
||||
|
|
||||
|
function doSubmit(index, layero,uniqueId){ |
||||
|
console.log(uniqueId); |
||||
|
var iframeWin = window[layero.find('iframe')[0]['name']]; |
||||
|
var rowData = iframeWin.$('#bootstrap-materialSelect-table').bootstrapTable('getSelections')[0]; |
||||
|
console.log("rowData: "+rowData); |
||||
|
$("#bootstrap-table").bootstrapTable('insertRow', { |
||||
|
index:1, |
||||
|
row: { |
||||
|
materialNo:rowData.materialNo, |
||||
|
materialPhotourl:rowData.materialPhotourl, |
||||
|
materialName: rowData.materialName, |
||||
|
materialType: rowData.materialType, |
||||
|
materialDescribe: rowData.materialDescribe, |
||||
|
materialBrand: rowData.materialBrand, |
||||
|
materialUnit: rowData.materialUnit, |
||||
|
materialProcessMethod: rowData.materialProcessMethod, |
||||
|
shippedGoodsSum: rowData.shippedGoodsSum, |
||||
|
snCode:"", |
||||
|
complaintProblem:"", |
||||
|
adverseReportUrl:"", |
||||
|
} |
||||
|
}) |
||||
|
layer.close(index); |
||||
|
} |
||||
|
|
||||
|
// 逻辑删除前端的一行数据 |
||||
|
function removeRow(materialNo){ |
||||
|
$("#bootstrap-table").bootstrapTable('remove', { |
||||
|
field: 'materialNo', |
||||
|
values: materialNo |
||||
|
}) |
||||
|
} |
||||
|
|
||||
|
</script> |
||||
|
</body> |
||||
|
</html> |
||||
@ -0,0 +1,237 @@ |
|||||
|
<!DOCTYPE html> |
||||
|
<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro"> |
||||
|
<head> |
||||
|
<th:block th:include="include :: header('仓库入库单列表')" /> |
||||
|
</head> |
||||
|
<body class="gray-bg"> |
||||
|
<div class="container-div"> |
||||
|
<div class="row"> |
||||
|
<div class="col-sm-12 search-collapse"> |
||||
|
<form id="formId"> |
||||
|
<div class="select-list"> |
||||
|
<ul> |
||||
|
<li> |
||||
|
<label>入库单号：</label> |
||||
|
<input type="text" name="warehouseStorageCode"/> |
||||
|
</li> |
||||
|
<li> |
||||
|
<label>入库状态：</label> |
||||
|
<select name="warehouseStorageStatus" th:with="type=${@dict.getType('warehouse_storage_status')}"> |
||||
|
<option value="">所有</option> |
||||
|
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option> |
||||
|
</select> |
||||
|
</li> |
||||
|
<li> |
||||
|
<label>品质状态：</label> |
||||
|
<select name="warehouseQualityStatus" th:with="type=${@dict.getType('warehouse_quality_status')}"> |
||||
|
<option value="">所有</option> |
||||
|
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option> |
||||
|
</select> |
||||
|
</li> |
||||
|
<li> |
||||
|
<label>关联订单号：</label> |
||||
|
<input type="text" name="relatedOrderCode"/> |
||||
|
</li> |
||||
|
|
||||
|
<li> |
||||
|
<label>仓库员：</label> |
||||
|
<input type="text" name="warehouseEmployee"/> |
||||
|
</li> |
||||
|
<li> |
||||
|
<label>入库部门：</label> |
||||
|
<select name="warehouseDeptType" th:with="type=${@dict.getType('warehouse_dept_type')}"> |
||||
|
<option value="">所有</option> |
||||
|
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option> |
||||
|
</select> |
||||
|
</li> |
||||
|
<li class="select-time"> |
||||
|
<label>录入时间：</label> |
||||
|
<input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginCreateTime]"/> |
||||
|
<span>-</span> |
||||
|
<input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endCreateTime]"/> |
||||
|
</li> |
||||
|
<li> |
||||
|
<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i> 搜索</a> |
||||
|
<a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i> 重置</a> |
||||
|
</li> |
||||
|
</ul> |
||||
|
</div> |
||||
|
</form> |
||||
|
</div> |
||||
|
|
||||
|
<div class="btn-group-sm" id="toolbar" role="group"> |
||||
|
<a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="warehouse:storageOrder:add"> |
||||
|
<i class="fa fa-plus"></i> 添加 |
||||
|
</a> |
||||
|
<a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="warehouse:storageOrder:export"> |
||||
|
<i class="fa fa-download"></i> 导出 |
||||
|
</a> |
||||
|
</div> |
||||
|
<div class="col-sm-12 select-table table-striped"> |
||||
|
<table id="bootstrap-table"></table> |
||||
|
</div> |
||||
|
</div> |
||||
|
</div> |
||||
|
<th:block th:include="include :: footer" /> |
||||
|
<script th:inline="javascript"> |
||||
|
var editFlag = [[${@permission.hasPermi('warehouse:storageOrder:edit')}]]; |
||||
|
var removeFlag = [[${@permission.hasPermi('warehouse:storageOrder:remove')}]]; |
||||
|
var cancelFlag = [[${@permission.hasPermi('warehouse:storageOrder:cancel')}]]; |
||||
|
var restoreFlag = [[${@permission.hasPermi('warehouse:storageOrder:restore')}]]; |
||||
|
var warehouseStorageStatusDatas = [[${@dict.getType('warehouse_storage_status')}]]; |
||||
|
var warehouseQualityStatusDatas = [[${@dict.getType('warehouse_quality_status')}]]; |
||||
|
var warehouseStorageTypeDatas = [[${@dict.getType('warehouse_storage_type')}]]; |
||||
|
var warehouseOrderTypeDatas = [[${@dict.getType('storage_order_type')}]]; |
||||
|
var warehouseDeptTypeDatas = [[${@dict.getType('warehouse_dept_type')}]]; |
||||
|
var prefix = ctx + "warehouse/storageOrder"; |
||||
|
|
||||
|
$(function() { |
||||
|
var options = { |
||||
|
url: prefix + "/list", |
||||
|
createUrl: prefix + "/add", |
||||
|
updateUrl: prefix + "/edit/{id}", |
||||
|
exportUrl: prefix + "/export", |
||||
|
modalName: "仓库入库单", |
||||
|
columns: [{ |
||||
|
checkbox: true |
||||
|
}, |
||||
|
{ |
||||
|
title: '入库单id', |
||||
|
field: 'warehouseStorageId', |
||||
|
visible: false |
||||
|
}, |
||||
|
{ |
||||
|
title: '入库单号', |
||||
|
field: 'warehouseStorageCode', |
||||
|
}, |
||||
|
|
||||
|
{ |
||||
|
title: '仓库入库状态', |
||||
|
field: 'warehouseStorageStatus', |
||||
|
formatter: function(value, row, index) { |
||||
|
return $.table.selectDictLabel(warehouseStorageStatusDatas, value); |
||||
|
} |
||||
|
}, |
||||
|
{ |
||||
|
title: '仓库品质状态', |
||||
|
field: 'warehouseQualityStatus', |
||||
|
formatter: function(value, row, index) { |
||||
|
return $.table.selectDictLabel(warehouseQualityStatusDatas, value); |
||||
|
} |
||||
|
}, |
||||
|
{ |
||||
|
title: '关联订单号', |
||||
|
field: 'relatedOrderCode', |
||||
|
}, |
||||
|
{ |
||||
|
title: '仓库订单类型', |
||||
|
field: 'warehouseOrderType', |
||||
|
formatter: function(value, row, index) { |
||||
|
return $.table.selectDictLabel(warehouseOrderTypeDatas, value); |
||||
|
} |
||||
|
}, |
||||
|
{ |
||||
|
title: '仓库入库类型', |
||||
|
field: 'warehouseStorageType', |
||||
|
formatter: function(value, row, index) { |
||||
|
return $.table.selectDictLabel(warehouseStorageTypeDatas, value); |
||||
|
} |
||||
|
}, |
||||
|
{ |
||||
|
title: '入库部门', |
||||
|
field: 'warehouseDeptType', |
||||
|
formatter: function(value, row, index) { |
||||
|
return $.table.selectDictLabel(warehouseDeptTypeDatas, value); |
||||
|
} |
||||
|
}, |
||||
|
{ |
||||
|
title: '通知已到货数量', |
||||
|
field: 'notifyArrivedNum', |
||||
|
}, |
||||
|
{ |
||||
|
title: '实际到货数', |
||||
|
field: 'actualArrivedNum', |
||||
|
}, |
||||
|
{ |
||||
|
title: '暂收合格数', |
||||
|
field: 'temporaryQualifiedNum', |
||||
|
}, |
||||
|
{ |
||||
|
title: '暂收不合格数', |
||||
|
field: 'temporaryUnqualifiedNum', |
||||
|
}, |
||||
|
{ |
||||
|
title: '品质合格数', |
||||
|
field: 'qualityQualifiedNum', |
||||
|
}, |
||||
|
{ |
||||
|
title: '品质不合格数', |
||||
|
field: 'qualityUnqualifiedNum', |
||||
|
}, |
||||
|
{ |
||||
|
title: '入库数', |
||||
|
field: 'storageNum', |
||||
|
}, |
||||
|
{ |
||||
|
title: '到货时间', |
||||
|
field: 'arrivedTime', |
||||
|
}, |
||||
|
{ |
||||
|
title: '暂收时间', |
||||
|
field: 'temporaryTime', |
||||
|
}, |
||||
|
{ |
||||
|
title: '交检时间', |
||||
|
field: 'deliveryInspectionTime', |
||||
|
}, |
||||
|
{ |
||||
|
title: '品质时间', |
||||
|
field: 'qualityTime', |
||||
|
}, |
||||
|
{ |
||||
|
title: '入库时间', |
||||
|
field: 'storageTime', |
||||
|
}, |
||||
|
{ |
||||
|
title: '仓库员', |
||||
|
field: 'warehouseEmployee', |
||||
|
}, |
||||
|
{ |
||||
|
title: '仓库ID', |
||||
|
field: 'warehouseCode', |
||||
|
}, |
||||
|
{ |
||||
|
title: '仓库名称', |
||||
|
field: 'warehouseName', |
||||
|
}, |
||||
|
{ |
||||
|
title: '录入人', |
||||
|
field: 'createBy', |
||||
|
}, |
||||
|
{ |
||||
|
title: '录入时间', |
||||
|
field: 'createTime', |
||||
|
}, |
||||
|
{ |
||||
|
title: '更新人', |
||||
|
field: 'updateBy', |
||||
|
}, |
||||
|
{ |
||||
|
title: '上次更新时间', |
||||
|
field: 'updateTime', |
||||
|
}, |
||||
|
{ |
||||
|
title: '操作', |
||||
|
align: 'center', |
||||
|
formatter: function(value, row, index) { |
||||
|
var actions = []; |
||||
|
actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.warehouseStorageId + '\')"><i class="fa fa-edit"></i>编辑</a> '); |
||||
|
return actions.join(''); |
||||
|
} |
||||
|
}] |
||||
|
}; |
||||
|
$.table.init(options); |
||||
|
}); |
||||
|
</script> |
||||
|
</body> |
||||
|
</html> |
||||
Loading…
Reference in new issue