From e4d80d0c06038da4073572fe855e78aeef1b2320 Mon Sep 17 00:00:00 2001 From: z Date: Wed, 3 Sep 2025 20:16:51 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9B=9E=E6=AC=BE=E6=98=8E=E7=BB=86=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/orderys/OrderYsController.java | 22 ++ .../admin/orderys/vo/OrderYsDOVo.java | 26 ++ .../admin/orderys/vo/OrderYsPageReqVO.java | 5 +- .../heli/dal/mysql/orderys/OrderYsMapper.java | 6 + .../deliverorder/DeliverOrderServiceImpl.java | 7 +- .../heli/service/orderys/OrderYsService.java | 2 + .../service/orderys/OrderYsServiceImpl.java | 9 + .../processbom/ProcessBomServiceImpl.java | 24 +- .../taskdispatch/TaskDispatchServiceImpl.java | 2 +- .../mapper/OrderYsMapper/OrderYsMapper.xml | 57 +++++ .../src/api/heli/orderys/index.ts | 8 +- mes-ui/mes-ui-admin-vue3/src/utils/dict.ts | 4 +- .../src/views/heli/deliverorder/detail.vue | 34 +-- .../src/views/heli/deliverorder/index.vue | 1 - .../views/heli/inspectionreport/detail.vue | 1 + .../src/views/heli/materialplan/part.vue | 3 +- .../src/views/heli/orderys/OrderYsForm.vue | 153 ++++++------ .../src/views/heli/orderys/details.vue | 226 ++++++++++++++++++ .../src/views/heli/orderys/index.vue | 32 ++- .../src/views/heli/orderys/invoivce.vue | 3 +- .../src/views/heli/plan/edit.vue | 2 +- .../src/views/heli/plan/productionPrint.vue | 94 ++++---- .../src/views/heli/plantask/edit.vue | 17 +- .../src/views/heli/processdesign/bom.vue | 5 +- .../src/views/heli/taskdispatch/detail.vue | 2 +- .../views/heli/taskdispatch/detailDialog.vue | 23 +- 26 files changed, 576 insertions(+), 192 deletions(-) create mode 100644 mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/orderys/vo/OrderYsDOVo.java create mode 100644 mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/OrderYsMapper/OrderYsMapper.xml create mode 100644 mes-ui/mes-ui-admin-vue3/src/views/heli/orderys/details.vue diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/orderys/OrderYsController.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/orderys/OrderYsController.java index 478dd6f3..fb4767df 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/orderys/OrderYsController.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/orderys/OrderYsController.java @@ -1,6 +1,10 @@ package com.chanko.yunxi.mes.module.heli.controller.admin.orderys; +import cn.hutool.core.collection.CollUtil; +import com.chanko.yunxi.mes.module.heli.controller.admin.unqualifiednotification.vo.QualityStatistics; +import com.chanko.yunxi.mes.module.heli.controller.admin.unqualifiednotification.vo.UnqualifiedNotificationPageReqVO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.orderyf.OrderYfDO; +import com.chanko.yunxi.mes.module.heli.dal.dataobject.unqualifiednotificationfile.UnqualifiedNotificationFileDO; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -127,5 +131,23 @@ public class OrderYsController { ExcelUtils.write(response, "应收记录.xlsx", "数据", OrderYsExportVO.class, BeanUtils.toBean(list, OrderYsExportVO.class)); } + @GetMapping("/getDetails") + @Operation(summary = "获得明细") + public CommonResult> getDetails(@Valid OrderYsPageReqVO pageReqVO) { + PageResult pageResult = orderYsService.getDetails(pageReqVO); + return success(pageResult); + } + @GetMapping("/exportDetails") + @Operation(summary = "导出应收记录 Excel") + @PreAuthorize("@ss.hasPermission('heli:order-ys:export')") + @OperateLog(type = EXPORT) + public void exportDetails(@Valid OrderYsPageReqVO pageReqVO, + HttpServletResponse response) throws IOException { + pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); + List list = orderYsService.getDetails(pageReqVO).getList(); + // 导出 Excel + ExcelUtils.write(response, "回款明细查询.xlsx", "数据", OrderYsDOVo.class, + BeanUtils.toBean(list, OrderYsDOVo.class)); + } } diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/orderys/vo/OrderYsDOVo.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/orderys/vo/OrderYsDOVo.java new file mode 100644 index 00000000..fbf6a980 --- /dev/null +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/orderys/vo/OrderYsDOVo.java @@ -0,0 +1,26 @@ +package com.chanko.yunxi.mes.module.heli.controller.admin.orderys.vo; + +import com.alibaba.excel.annotation.ExcelProperty; +import com.chanko.yunxi.mes.framework.excel.core.annotations.DictFormat; +import com.chanko.yunxi.mes.framework.excel.core.convert.DictConvert; +import lombok.Data; +import lombok.ToString; + +import java.math.BigDecimal; + +@Data +@ToString(callSuper = true) +public class OrderYsDOVo { + @ExcelProperty("日期") + private String time; + @ExcelProperty("客户名称") + private String customerName; + @ExcelProperty("项目名称") + private String projectName; + @ExcelProperty(value = "类型", converter = DictConvert.class) + @DictFormat("heli_ys_type") + private Integer type; + @ExcelProperty("金额") + private BigDecimal amount; + +} diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/orderys/vo/OrderYsPageReqVO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/orderys/vo/OrderYsPageReqVO.java index e2983bc2..32d8a5c7 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/orderys/vo/OrderYsPageReqVO.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/orderys/vo/OrderYsPageReqVO.java @@ -46,5 +46,8 @@ public class OrderYsPageReqVO extends PageParam { @Schema(description = "备注") private String rem; - + @Schema(description = "客户名称") + private String customerName; + @Schema(description = "类型") + private Integer type; } \ No newline at end of file diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/orderys/OrderYsMapper.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/orderys/OrderYsMapper.java index 33bf686d..bbf0b8c6 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/orderys/OrderYsMapper.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/orderys/OrderYsMapper.java @@ -3,9 +3,11 @@ package com.chanko.yunxi.mes.module.heli.dal.mysql.orderys; import java.util.*; import cn.hutool.core.collection.CollUtil; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.chanko.yunxi.mes.framework.common.pojo.PageResult; import com.chanko.yunxi.mes.framework.mybatis.core.query.LambdaQueryWrapperX; import com.chanko.yunxi.mes.framework.mybatis.core.mapper.BaseMapperX; +import com.chanko.yunxi.mes.module.heli.controller.admin.unqualifiednotification.vo.QualityStatistics; import com.chanko.yunxi.mes.module.heli.dal.dataobject.customer.CustomerDO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.invoice.InvoiceDO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.orderys.OrderYsDO; @@ -16,6 +18,7 @@ import com.chanko.yunxi.mes.module.system.dal.dataobject.user.AdminUserDO; import com.github.yulichang.wrapper.MPJLambdaWrapper; import org.apache.ibatis.annotations.Mapper; import com.chanko.yunxi.mes.module.heli.controller.admin.orderys.vo.*; +import org.apache.ibatis.annotations.Param; import org.springframework.util.StringUtils; /** @@ -32,6 +35,7 @@ public interface OrderYsMapper extends BaseMapperX { query.selectAll(OrderYsDO.class) .select("sum(i.amount) as amount") .select("p.delivery_status as deliveryStatus") + .select("p.id as projectId","p.code as projectCode") .leftJoin( "finance_invoice i ON i.order_code = t.code AND i.deleted=0 and i.tenant_id=2 and i.business_type = 'FINANCE_MAKE_INVOICE' AND i.status !='3'") .leftJoin(ProjectOrderDO.class,"p", ProjectOrderDO::getCode, OrderYsDO::getCode) @@ -66,4 +70,6 @@ public interface OrderYsMapper extends BaseMapperX { return selectOne(query); } + + List getDetails(@Param("page") Page page, @Param("pageReqVO") OrderYsPageReqVO pageReqVO); } \ No newline at end of file diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/deliverorder/DeliverOrderServiceImpl.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/deliverorder/DeliverOrderServiceImpl.java index 7d72f419..66c134aa 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/deliverorder/DeliverOrderServiceImpl.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/deliverorder/DeliverOrderServiceImpl.java @@ -152,7 +152,7 @@ public class DeliverOrderServiceImpl implements DeliverOrderService { updateReqVO.setDeliverStatus(updateObj.getDeliverStatus()); // 更新子表 - updateDeliverOrderSubList(updateReqVO.getId(), updateReqVO.getDeliverOrderSubs(), updateReqVO.getDeliverOrderOtherSubs()); + updateDeliverOrderSubList(updateReqVO.getId(), updateReqVO.getDeliverOrderSubs(), updateReqVO.getDeliverOrderOtherSubs(), updateReqVO.getActive()); if(updateObj.getDeliverStatus().intValue() == DeliverOrderStatusEnum.DELIVER.getCode()) { // crossOrderManager.refreshProjectOrderDeliverStatus(updateReqVO.getSaleOrderIds().split(","),updateReqVO.getDeliverDate()); @@ -414,9 +414,10 @@ public class DeliverOrderServiceImpl implements DeliverOrderService { deliverOrderSubMapper.insertBatch(list); } - private void updateDeliverOrderSubList(Long deliveryOrderId, List list, @Valid List deliverOrderOtherSubs) { + private void updateDeliverOrderSubList(Long deliveryOrderId, List list, @Valid List deliverOrderOtherSubs,String type) { deleteDeliverOrderSubByDeliveryOrderId(deliveryOrderId); list.forEach(o -> o.setId(null).setUpdater(null).setUpdateTime(null)); // 解决更新情况下：1）id 冲突；2）updateTime 不更新 + if ("DELIVER".equals(type)){ //计算分摊运费 for (DeliverOrderSubDO deliverOrderOtherSub : list) { ProjectOrderSubDO projectOrderSubDO = projectOrderSubMapper.selectById(deliverOrderOtherSub.getSaleOrderSubId()); @@ -428,7 +429,7 @@ public class DeliverOrderServiceImpl implements DeliverOrderService { projectOrderSubMapper.updateById(projectOrderSubDO); } } - + } createDeliverOrderSubList(deliveryOrderId, list); if(deliverOrderOtherSubs != null && !deliverOrderOtherSubs.isEmpty()){ deliverOrderOtherSubs.forEach(o -> o.setId(null).setUpdater(null).setUpdateTime(null)); // 解决更新情况下：1）id 冲突；2）updateTime 不更新 diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/orderys/OrderYsService.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/orderys/OrderYsService.java index fe5fa4c3..b7145855 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/orderys/OrderYsService.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/orderys/OrderYsService.java @@ -56,4 +56,6 @@ public interface OrderYsService { void createOrUpdate(ProjectOrderSaveReqVO operateReqVO); void delete(ProjectOrderSaveReqVO operateReqVO); + + PageResult getDetails(OrderYsPageReqVO pageReqVO); } diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/orderys/OrderYsServiceImpl.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/orderys/OrderYsServiceImpl.java index 0cbd98ba..69538582 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/orderys/OrderYsServiceImpl.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/orderys/OrderYsServiceImpl.java @@ -4,8 +4,10 @@ import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.chanko.yunxi.mes.module.heli.controller.admin.orderysdetail.vo.OrderYsDetailSaveReqVO; import com.chanko.yunxi.mes.module.heli.controller.admin.projectorder.vo.ProjectOrderSaveReqVO; +import com.chanko.yunxi.mes.module.heli.controller.admin.unqualifiednotification.vo.QualityStatistics; import com.chanko.yunxi.mes.module.heli.dal.dataobject.orderysdetail.OrderYsDetailDO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.projectorder.ProjectOrderSubDO; import com.chanko.yunxi.mes.module.heli.dal.mysql.orderysdetail.OrderYsDetailMapper; @@ -160,4 +162,11 @@ public class OrderYsServiceImpl implements OrderYsService { orderYsMapper.delete(eq); } + @Override + public PageResult getDetails(OrderYsPageReqVO pageReqVO) { + Page page = new Page<>(pageReqVO.getPageNo(), pageReqVO.getPageSize()); + List list = orderYsMapper.getDetails(page, pageReqVO); + return new PageResult<>(list, page.getTotal()); + } + } diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/processbom/ProcessBomServiceImpl.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/processbom/ProcessBomServiceImpl.java index 8370d94e..494fb9e7 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/processbom/ProcessBomServiceImpl.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/processbom/ProcessBomServiceImpl.java @@ -3,9 +3,7 @@ package com.chanko.yunxi.mes.module.heli.service.processbom; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; -import com.baomidou.mybatisplus.generator.IFill; import com.chanko.yunxi.mes.framework.common.enums.BomEditStatusEnum; import com.chanko.yunxi.mes.framework.common.enums.StatusEnum; import com.chanko.yunxi.mes.framework.common.exception.ErrorCode; @@ -13,7 +11,6 @@ import com.chanko.yunxi.mes.framework.common.pojo.CommonResult; import com.chanko.yunxi.mes.framework.common.pojo.PageParam; import com.chanko.yunxi.mes.framework.common.pojo.PageResult; import com.chanko.yunxi.mes.framework.common.util.object.BeanUtils; -import com.chanko.yunxi.mes.framework.dict.core.util.DictFrameworkUtils; import com.chanko.yunxi.mes.framework.excel.core.util.ExcelUtils; import com.chanko.yunxi.mes.framework.operatelog.core.enums.OperateTypeEnum; import com.chanko.yunxi.mes.framework.security.core.util.SecurityFrameworkUtils; @@ -23,7 +20,6 @@ import com.chanko.yunxi.mes.module.heli.controller.admin.processbom.vo.ProcessBo import com.chanko.yunxi.mes.module.heli.controller.admin.taskdispatch.vo.TaskPlanJDBaoBiaoPageReqVO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.attentiontodo.AttentiontodoDO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.bdgzsomthing.bdgzsomthingDO; -import com.chanko.yunxi.mes.module.heli.dal.dataobject.bgmasterline.BgMasterLineDO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.composition.CompositionDO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.material.MaterialDO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.materialplan.MaterialPlanDO; @@ -33,7 +29,6 @@ import com.chanko.yunxi.mes.module.heli.dal.dataobject.plantask.PlanTaskDO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.plantaskbom.PlanTaskBomDO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.processbom.ProcessBomDO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.processbom.ProcessBomDetailDO; -import com.chanko.yunxi.mes.module.heli.dal.dataobject.purchaseordermakedetail.PurchaseOrderMakeDetailDO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.serialnumber.SerialNumberDO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.shenhe.ShenheDO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.storagelogNow.StorageLogNowDO; @@ -41,7 +36,6 @@ import com.chanko.yunxi.mes.module.heli.dal.dataobject.taskdispatch.TaskDispatch import com.chanko.yunxi.mes.module.heli.dal.dataobject.taskdispatch.TaskDispatchDetailDO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.taskreport.TaskReportDO; import com.chanko.yunxi.mes.module.heli.dal.mysql.attentiontodo.AttentiontodoMapper; -import com.chanko.yunxi.mes.module.heli.dal.mysql.bdgzsomthing.bdgzsomthingMapper; import com.chanko.yunxi.mes.module.heli.dal.mysql.bgmasterline.BgMasterLineMapper; import com.chanko.yunxi.mes.module.heli.dal.mysql.materialplan.MaterialPlanMapper; import com.chanko.yunxi.mes.module.heli.dal.mysql.materialplanboom.MaterialPlanBoomMapper; @@ -70,7 +64,6 @@ import com.chanko.yunxi.mes.module.system.dal.dataobject.dict.DictDataDO; import com.chanko.yunxi.mes.module.system.dal.dataobject.user.AdminUserDO; import com.chanko.yunxi.mes.module.system.dal.mysql.dict.DictDataMapper; import com.chanko.yunxi.mes.module.system.service.user.AdminUserService; -import org.apache.poi.ss.formula.functions.T; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -78,17 +71,16 @@ import org.springframework.validation.annotation.Validated; import com.chanko.yunxi.mes.module.heli.service.shenhe.SerarchUser; import org.springframework.web.multipart.MultipartFile; -import org.thymeleaf.expression.Ids; import javax.annotation.Resource; import javax.validation.Valid; import java.io.IOException; -import java.io.Serializable; import java.math.BigDecimal; import java.rmi.RemoteException; import java.text.SimpleDateFormat; import java.time.LocalDateTime; import java.util.*; +import java.util.concurrent.atomic.AtomicReference; import java.util.stream.Collectors; import static com.chanko.yunxi.mes.framework.common.exception.util.ServiceExceptionUtil.exception; @@ -223,21 +215,31 @@ public class ProcessBomServiceImpl implements ProcessBomService { // list.forEach(item->{ // blueprintNoList.add(item.getBlueprintNo()); // }); + List errorMessages = new ArrayList<>(); + //确保本次传过来的图号没有重复的后看数据库的有没有重复的 groupedByCode.forEach((code, listtemp) -> { //同一个编码下按图号分组，如果有某个图号的list大小大于二就是重复图号，报错 Map> bluePrintNoList = listtemp.stream().collect(Collectors.groupingBy(vo -> vo.getBlueprintNo() == null ? "NULL" : vo.getBlueprintNo())); bluePrintNoList.forEach((printNo, listTemp1) -> { if (listTemp1.size() > 1) { - throw new RuntimeException("图号：" + printNo + "重复!"); +// throw new RuntimeException("图号：" + printNo + "重复!"); + errorMessages.add("图号：" + printNo + "重复!"); } else { Long bomDetailByBluePrintNoAndBomId = processBomDetailMapper.getBomDetailByBluePrintNoAndBomId(Long.valueOf(bomId), printNo); if (bomDetailByBluePrintNoAndBomId > 0) { - throw new RuntimeException("图号：" + printNo + "已存在，勿重复添加！"); +// throw new RuntimeException("图号：" + printNo + "已存在，勿重复添加！"); + errorMessages.add("图号：" + printNo + "已存在，勿重复添加！"); } } }); }); + if (!errorMessages.isEmpty()) { +// String joinedErrors = String.join("\n", errorMessages); + // 此处可根据实际需求返回或处理错误信息 + String joinedErrors = String.join(System.lineSeparator(), errorMessages); + throw new RuntimeException(joinedErrors); // 若仍需抛异常可改用此方式 + } //确保本次传过来的非标准件，物料名称不能重复 groupedByCode.forEach((code, listtemp) -> { //同一个编码下按物料名称分组，如果有某个物料名称的list大小大于1就是重复名称，报错 diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/taskdispatch/TaskDispatchServiceImpl.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/taskdispatch/TaskDispatchServiceImpl.java index f5fbd6b2..0e27af07 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/taskdispatch/TaskDispatchServiceImpl.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/taskdispatch/TaskDispatchServiceImpl.java @@ -183,7 +183,7 @@ public class TaskDispatchServiceImpl implements TaskDispatchService { throw exception(PROCESS_BOM_DETAIL_NOT_EXISTS); } } - if(operateTypeEnum == OperateTypeEnum.SUBMIT||operateTypeEnum == OperateTypeEnum.SAVE){ + if("PRODUCTION".equals(updateReqVO.getDispatchType())&&(operateTypeEnum == OperateTypeEnum.SUBMIT||operateTypeEnum == OperateTypeEnum.SAVE)){ ProcessBomDetailDO bomDetailDO = processBomDetailMapper.selectById(updateReqVO.getBomDetailId()); if (ObjectUtil.isNotEmpty(bomDetailDO)){ ProcessBomDO processBomDO = processBomMapper.selectById(bomDetailDO.getBomId()); diff --git a/mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/OrderYsMapper/OrderYsMapper.xml b/mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/OrderYsMapper/OrderYsMapper.xml new file mode 100644 index 00000000..ab23e047 --- /dev/null +++ b/mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/OrderYsMapper/OrderYsMapper.xml @@ -0,0 +1,57 @@ + + + + + + + + \ No newline at end of file diff --git a/mes-ui/mes-ui-admin-vue3/src/api/heli/orderys/index.ts b/mes-ui/mes-ui-admin-vue3/src/api/heli/orderys/index.ts index 8d94571e..79d1400d 100644 --- a/mes-ui/mes-ui-admin-vue3/src/api/heli/orderys/index.ts +++ b/mes-ui/mes-ui-admin-vue3/src/api/heli/orderys/index.ts @@ -42,4 +42,10 @@ export const deleteOrderYs = async (id: number) => { export const exportOrderYs = async (params) => { return await request.download({ url: `/heli/order-ys/export-excel`, params }) } - +export const getDetails = async (params) => { + return await request.get({ url: `/heli/order-ys/getDetails`, params }) +} +// 导出应收记录 Excel +export const exportDetails = async (params) => { + return await request.download({ url: `/heli/order-ys/exportDetails`, params }) +} diff --git a/mes-ui/mes-ui-admin-vue3/src/utils/dict.ts b/mes-ui/mes-ui-admin-vue3/src/utils/dict.ts index da746381..0a25c318 100644 --- a/mes-ui/mes-ui-admin-vue3/src/utils/dict.ts +++ b/mes-ui/mes-ui-admin-vue3/src/utils/dict.ts @@ -299,5 +299,7 @@ export enum DICT_TYPE { HELI_STORAGE_IN_STATUS = 'heli_storage_in_status',//入库出库状态 HELI_STOCK_MODE = 'heli_stock_mode',//库存变动日志类型 HELI_PROCESS_TYPE="heli_process_type", - HELI_RECEIVING_STATUS="heli_receiving_status" + HELI_RECEIVING_STATUS="heli_receiving_status", + HELI_YS_TYPE = 'heli_ys_type', // 质检类型 + } diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/deliverorder/detail.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/deliverorder/detail.vue index 6c563a23..d96f1b96 100644 --- a/mes-ui/mes-ui-admin-vue3/src/views/heli/deliverorder/detail.vue +++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/deliverorder/detail.vue @@ -46,7 +46,7 @@ - + @@ -68,7 +68,7 @@ - + @@ -194,7 +194,7 @@ @@ -203,7 +203,7 @@ @@ -218,7 +218,7 @@ @@ -230,14 +230,14 @@ @@ -261,7 +261,7 @@ - 新增 + 新增 @@ -272,7 +272,7 @@ @@ -280,7 +280,7 @@