diff --git a/ruoyi-admin/src/main/java/com/ruoyi/aftersales/controller/AftersalesOutOrderController.java b/ruoyi-admin/src/main/java/com/ruoyi/aftersales/controller/AftersalesOutOrderController.java index 0b9553de..517c7818 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/aftersales/controller/AftersalesOutOrderController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/aftersales/controller/AftersalesOutOrderController.java @@ -467,6 +467,43 @@ public String addShippingDevicesOne(@RequestParam("outOrderDetailId") Long outOr return getDataTable(list); } + /** + * 售后维护设备出库详情 + */ + @GetMapping("/detail/{outOrderId}") + public String detail(@PathVariable("outOrderId") Long outOrderId, ModelMap mmap) + { + AftersalesOutOrder aftersalesOutOrder = aftersalesOutOrderService.selectAftersalesOutOrderById(outOrderId); + String outOrderCode = aftersalesOutOrder.getOutOrderCode(); + + SysSalesShippingInform sysSalesShippingInform = shippingInformService.selectSysSalesShippingInformByCode(outOrderCode); + + List
sysSalesOrders = new ArrayList<>(); + String salesOrderCode = sysSalesShippingInform.getSalesOrderCode(); + + List
salesOrderCodes = new ArrayList<>(); + + if (StringUtils.isNotEmpty(salesOrderCode)){ + String[] splitSalesOrderCode = salesOrderCode.split(","); + salesOrderCodes = Arrays.asList(splitSalesOrderCode); + } + + sysSalesOrders = sysSalesOrderService.selectSysSalesOrderListByCodeList(salesOrderCodes); + mmap.put("sysSalesOrders", sysSalesOrders); + mmap.put("sysSalesShippingInform", sysSalesShippingInform); + return prefix + "/detail"; + } + + /** + * 修改保存售后维护设备出库详情 + */ + @Log(title = "售后维护设备出库", businessType = BusinessType.UPDATE) + @PostMapping("/detail") + @ResponseBody + public AjaxResult detailSave(AftersalesOutOrder aftersalesOutOrder) + { + return toAjax(aftersalesOutOrderService.updateDetailAftersalesOutOrder(aftersalesOutOrder)); + } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/aftersales/service/IAftersalesOutOrderService.java b/ruoyi-admin/src/main/java/com/ruoyi/aftersales/service/IAftersalesOutOrderService.java index 6d96f5f9..516f8f30 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/aftersales/service/IAftersalesOutOrderService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/aftersales/service/IAftersalesOutOrderService.java @@ -151,4 +151,11 @@ public interface IAftersalesOutOrderService * @return */ List
aftersalesConfirmCheckDetailList(SysSalesShippingInform sysSalesShippingInform); + + /** + * 售后维护设备出库详情保存 + * @param aftersalesOutOrder + * @return + */ + int updateDetailAftersalesOutOrder(AftersalesOutOrder aftersalesOutOrder); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/aftersales/service/impl/AftersalesOutOrderServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/aftersales/service/impl/AftersalesOutOrderServiceImpl.java index ab49349c..6eaee598 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/aftersales/service/impl/AftersalesOutOrderServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/aftersales/service/impl/AftersalesOutOrderServiceImpl.java @@ -1057,4 +1057,13 @@ public class AftersalesOutOrderServiceImpl implements IAftersalesOutOrderService return confirmCheckDetailVos; } + + + /** + * 售后维护设备出库详情保存 + * */ + @Override + public int updateDetailAftersalesOutOrder(AftersalesOutOrder aftersalesOutOrder) { + return 1; + } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/erp/service/impl/ErpMaterialServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/erp/service/impl/ErpMaterialServiceImpl.java index 80a75fd7..bdab86fe 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/erp/service/impl/ErpMaterialServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/erp/service/impl/ErpMaterialServiceImpl.java @@ -569,6 +569,10 @@ public class ErpMaterialServiceImpl implements IErpMaterialService if(processIsFinish){ // 审核状态-审核通过 erpMaterial.setAuditStatus("1"); + ErpMaterialVo erpMaterialVo = new ErpMaterialVo(); + BeanUtils.copyProperties(erpMaterial,erpMaterialVo); + //审核通过添加物料库存查询记录 + addInventoryInquiry(erpMaterialVo); // 使用状态-是 erpMaterial.setUseStatus("1"); } @@ -596,6 +600,7 @@ public class ErpMaterialServiceImpl implements IErpMaterialService if(processIsFinish){ // 审核状态-审核通过 erpMaterial.setAuditStatus("1"); + // 使用状态-已作废 erpMaterial.setUseStatus("2"); } diff --git a/ruoyi-admin/src/main/resources/templates/aftersales/aftersalesOrder/aftersalesOrder.html b/ruoyi-admin/src/main/resources/templates/aftersales/aftersalesOrder/aftersalesOrder.html index 434283c2..933599a8 100644 --- a/ruoyi-admin/src/main/resources/templates/aftersales/aftersalesOrder/aftersalesOrder.html +++ b/ruoyi-admin/src/main/resources/templates/aftersales/aftersalesOrder/aftersalesOrder.html @@ -180,15 +180,16 @@ // 编辑 // actions.push('
编辑
'); if (row.aftersalesStatus == 0){ - actions.push('
派单
'); + actions.push('
派单
'); } if (row.aftersalesStatus == 1) { - actions.push('
上传报告
'); + actions.push('
上传报告
'); } // 详情 - actions.push('
详情
'); - return actions.join(''); + actions.push('
详情
'); + var actionLinks = actions.join(''); + return $.table.dropdownToggle(actionLinks); } } diff --git a/ruoyi-admin/src/main/resources/templates/aftersales/aftersalesOutOrder/aftersalesOutOrder.html b/ruoyi-admin/src/main/resources/templates/aftersales/aftersalesOutOrder/aftersalesOutOrder.html index 155d7706..e9fb4e76 100644 --- a/ruoyi-admin/src/main/resources/templates/aftersales/aftersalesOutOrder/aftersalesOutOrder.html +++ b/ruoyi-admin/src/main/resources/templates/aftersales/aftersalesOutOrder/aftersalesOutOrder.html @@ -201,6 +201,7 @@ if (row.warehouseOutStatus=="10" || row.warehouseOutStatus=="11"){ actions.push('
确认验收
'); } + actions.push('
详情
'); var actionLinks = actions.join(''); return $.table.dropdownToggle(actionLinks); @@ -232,6 +233,11 @@ $.modal.open("售后确认验收",url); } + //详情 + function detail(outOrderId) { + var url = ctx + 'aftersales/aftersalesOutOrder/detail/'+outOrderId; + $.modal.open("售后出库单详情",url); + }