diff --git a/nladmin-system/wms-server/src/main/java/org/nl/wms/ext_manage/api/request/ReceiveOutRequest.java b/nladmin-system/wms-server/src/main/java/org/nl/wms/ext_manage/api/request/ReceiveOutRequest.java index dc5e2a0..1b25a41 100644 --- a/nladmin-system/wms-server/src/main/java/org/nl/wms/ext_manage/api/request/ReceiveOutRequest.java +++ b/nladmin-system/wms-server/src/main/java/org/nl/wms/ext_manage/api/request/ReceiveOutRequest.java @@ -19,6 +19,8 @@ public class ReceiveOutRequest { private String requsername; private String comment; private String cztype; + private String workArea; + private String trackNo; private List entrys; @Data diff --git a/nladmin-system/wms-server/src/main/java/org/nl/wms/ext_manage/mes/mq/producer/WorkReportProducer.java b/nladmin-system/wms-server/src/main/java/org/nl/wms/ext_manage/mes/mq/producer/WorkReportProducer.java index 29495ef..97fec44 100644 --- a/nladmin-system/wms-server/src/main/java/org/nl/wms/ext_manage/mes/mq/producer/WorkReportProducer.java +++ b/nladmin-system/wms-server/src/main/java/org/nl/wms/ext_manage/mes/mq/producer/WorkReportProducer.java @@ -1,8 +1,11 @@ package org.nl.wms.ext_manage.mes.mq.producer; import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import org.apache.commons.lang3.StringUtils; import org.nl.wms.ext_manage.mes.service.dto.WorkReportParam; +import org.nl.wms.warehouse_manage.stockReturn.receiveOutRetur.dao.ReceiveOutReturn; +import org.nl.wms.warehouse_manage.stockReturn.receiveOutRetur.service.IReceiveOutReturnService; import org.springframework.amqp.rabbit.core.RabbitTemplate; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -11,8 +14,15 @@ import org.springframework.stereotype.Component; public class WorkReportProducer { @Autowired private RabbitTemplate rabbitTemplate; + @Autowired + private IReceiveOutReturnService receiveOutReturnService; public void send(WorkReportParam param) { + if (!StringUtils.isEmpty(param.getSn())){ + ReceiveOutReturn one = receiveOutReturnService.getOne(new LambdaQueryWrapper() + .eq(ReceiveOutReturn::getSn, param.getSn())); + if (one != null) return;//已存在跳过 + } rabbitTemplate.convertAndSend("Mes", "workReport", JSON.toJSONString(param)); } } diff --git a/nladmin-system/wms-server/src/main/java/org/nl/wms/ext_manage/mes/service/impl/MesReportServiceImpl.java b/nladmin-system/wms-server/src/main/java/org/nl/wms/ext_manage/mes/service/impl/MesReportServiceImpl.java index b503445..6bd72d2 100644 --- a/nladmin-system/wms-server/src/main/java/org/nl/wms/ext_manage/mes/service/impl/MesReportServiceImpl.java +++ b/nladmin-system/wms-server/src/main/java/org/nl/wms/ext_manage/mes/service/impl/MesReportServiceImpl.java @@ -8,11 +8,8 @@ import org.nl.common.exception.BadRequestException; import org.nl.common.utils.SecurityUtils; import org.nl.wms.basedata_manage.service.IStructattrService; import org.nl.wms.basedata_manage.service.dao.Structattr; -import org.nl.wms.ext_manage.api.MesApi; import org.nl.wms.ext_manage.mes.service.MesReportService; -import org.nl.wms.ext_manage.mes.service.dto.WorkOrderBomItem; import org.nl.wms.ext_manage.mes.service.dto.WorkReportParam; -import org.nl.wms.ext_manage.service.WmsToZDWmdService; import org.nl.wms.pda_manage.ios_manage.service.PdaIosOutService; import org.nl.wms.pda_manage.outBound.dto.LineSideDto; import org.nl.wms.sch_manage.service.ISchBaseRegionService; @@ -25,9 +22,6 @@ import org.springframework.stereotype.Service; import java.math.BigDecimal; import java.time.LocalDate; -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; @Service public class MesReportServiceImpl implements MesReportService { @@ -74,6 +68,8 @@ public class MesReportServiceImpl implements MesReportService { sideDto.setSn(workReportParam.getSn()); sideDto.setStorageVehicleCode(one.getStoragevehicle_code()); sideDto.setReportParam(JSON.toJSONString(workReportParam)); + sideDto.setTrackNo(workReportParam.getTrackNo()); + sideDto.setWorkArea(workReportParam.getWorkArea()); pdaIosOutService.directConfirm(sideDto); }catch (Exception ex){ ReceiveOutReturn entity = new ReceiveOutReturn(); @@ -87,6 +83,8 @@ public class MesReportServiceImpl implements MesReportService { entity.setRequserno("WMS"); entity.setRequsername("WMS"); entity.setCztype("02"); + entity.setTrackNo(workReportParam.getTrackNo()); + entity.setWorkArea(workReportParam.getWorkArea()); entity.setCreateTime(DateUtil.now()); entity.setRemark(ex.getMessage()); entity.setStatus(StockReturnStatusEnum.ERROR.getCode() ); diff --git a/nladmin-system/wms-server/src/main/java/org/nl/wms/ext_manage/purchase/service/impl/InboundEasSyncServiceImpl.java b/nladmin-system/wms-server/src/main/java/org/nl/wms/ext_manage/purchase/service/impl/InboundEasSyncServiceImpl.java index b2074fc..a4f2c10 100644 --- a/nladmin-system/wms-server/src/main/java/org/nl/wms/ext_manage/purchase/service/impl/InboundEasSyncServiceImpl.java +++ b/nladmin-system/wms-server/src/main/java/org/nl/wms/ext_manage/purchase/service/impl/InboundEasSyncServiceImpl.java @@ -560,6 +560,11 @@ public class InboundEasSyncServiceImpl implements InboundEasSyncService { } } + /** + * 退料入库 + * 注意是红字单据 + * @param billChangeDto + */ @Override public void syncReturnInBill(BillChangeDto billChangeDto) { String billId = billChangeDto.getBillid(); @@ -606,6 +611,7 @@ public class InboundEasSyncServiceImpl implements InboundEasSyncService { //更新单据 Boolean allZD = true; for (Purchasedtl dtl : easDtlList) { + dtl.setQty(dtl.getQty().abs()); if (ZD_STOR_SET.contains(dtl.getHouse_code())){ //中鼎立库 dtl.setInstock_qty(dtl.getQty()); diff --git a/nladmin-system/wms-server/src/main/java/org/nl/wms/pda_manage/ios_manage/service/impl/PdaIosOutServiceImpl.java b/nladmin-system/wms-server/src/main/java/org/nl/wms/pda_manage/ios_manage/service/impl/PdaIosOutServiceImpl.java index a8751af..af39a31 100644 --- a/nladmin-system/wms-server/src/main/java/org/nl/wms/pda_manage/ios_manage/service/impl/PdaIosOutServiceImpl.java +++ b/nladmin-system/wms-server/src/main/java/org/nl/wms/pda_manage/ios_manage/service/impl/PdaIosOutServiceImpl.java @@ -2,7 +2,6 @@ package org.nl.wms.pda_manage.ios_manage.service.impl; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; -import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; @@ -37,30 +36,27 @@ import org.nl.wms.pda_manage.util.PdaResponse; import org.nl.wms.sch_manage.enums.StatusEnum; import org.nl.wms.sch_manage.enums.TaskEnum; import org.nl.wms.sch_manage.service.ISchBasePointService; -import org.nl.wms.sch_manage.service.dao.SchBasePoint; import org.nl.wms.sch_manage.service.core.AbstractTask; import org.nl.wms.sch_manage.service.core.tasks.PdaPointTask; import org.nl.wms.sch_manage.service.core.tasks.VehicleOutTask; +import org.nl.wms.sch_manage.service.dao.SchBasePoint; import org.nl.wms.warehouse_manage.enums.IOSConstant; import org.nl.wms.warehouse_manage.enums.IOSEnum; import org.nl.wms.warehouse_manage.inAndOut.service.IOutBillService; -import org.nl.wms.warehouse_manage.inventory.IStInventoryService; -import org.nl.wms.warehouse_manage.inventory.core.enums.InventoryChangeType; -import org.nl.wms.warehouse_manage.inventory.core.param.impl.InFinishParam; -import org.nl.wms.warehouse_manage.inventory.core.param.impl.OutFinishParam; -import org.nl.wms.warehouse_manage.service.IMdPbGroupplateService; -import org.nl.wms.warehouse_manage.service.dao.GroupPlate; import org.nl.wms.warehouse_manage.inAndOut.service.dao.IOStorInv; import org.nl.wms.warehouse_manage.inAndOut.service.dao.IOStorInvDis; import org.nl.wms.warehouse_manage.inAndOut.service.dao.IOStorInvDtl; import org.nl.wms.warehouse_manage.inAndOut.service.dao.mapper.IOStorInvDisMapper; import org.nl.wms.warehouse_manage.inAndOut.service.dao.mapper.IOStorInvDtlMapper; import org.nl.wms.warehouse_manage.inAndOut.service.dao.mapper.IOStorInvMapper; +import org.nl.wms.warehouse_manage.inventory.IStInventoryService; +import org.nl.wms.warehouse_manage.inventory.core.enums.InventoryChangeType; +import org.nl.wms.warehouse_manage.inventory.core.param.impl.OutFinishParam; +import org.nl.wms.warehouse_manage.service.IMdPbGroupplateService; +import org.nl.wms.warehouse_manage.service.dao.GroupPlate; import org.nl.wms.warehouse_manage.service.dao.mapper.MdPbGroupplateMapper; import org.nl.wms.warehouse_manage.stockReturn.receiveOutRetur.dao.ReceiveOutReturn; import org.nl.wms.warehouse_manage.stockReturn.receiveOutRetur.service.IReceiveOutReturnService; -import org.nl.wms.warehouse_manage.stockReturn.service.IPmStockReturnService; -import org.nl.wms.warehouse_manage.stockReturn.service.dao.PmStockReturn; import org.nl.wms.warehouse_manage.stockReturn.service.enums.StockReturnStatusEnum; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -296,8 +292,11 @@ public class PdaIosOutServiceImpl implements PdaIosOutService { entry.setSrcbillentryid(bomItem.getItemId()); if (qty.compareTo(actualQty) > 0) { status = StockReturnStatusEnum.FAIL.getCode(); - entry.setStatus(StockReturnStatusEnum.TODO.getCode()); + entry.setStatus(StockReturnStatusEnum.FAIL.getCode()); entry.setRemark(materialCode+"WMS库存不足:当前" + actualQty + "需求" + qty.intValue()); + if (entry.getBaseqty().compareTo(BigDecimal.ZERO) == 0){ + entry.setStatus(StockReturnStatusEnum.IGNORE.getCode()); + } entrys.add(entry); }else { final IOStorInvDtl ioStorInvDtl = new IOStorInvDtl(); @@ -358,7 +357,7 @@ public class PdaIosOutServiceImpl implements PdaIosOutService { .eq(GroupPlate::getStatus, IOSEnum.GROUP_PLATE_STATUS.code("入库"))); } entry.setRemark("等待回传EAS"); - entry.setStatus(StockReturnStatusEnum.FAIL.getCode()); + entry.setStatus(StockReturnStatusEnum.TODO.getCode()); entrys.add(entry); } } @@ -383,6 +382,8 @@ public class PdaIosOutServiceImpl implements PdaIosOutService { receiveOutRequest.setRequsername("WMS"); receiveOutRequest.setDeptno("01.09.14.02"); receiveOutRequest.setDeptno("01.09.14.02"); + receiveOutRequest.setTrackNo(param.getTrackNo()); + receiveOutRequest.setWorkArea(param.getWorkArea()); receiveOutRequest.setEntrys(entrys); ReceiveOutReturn entity = receiveOutReturnService.saveFromRequest( receiveOutRequest, status, null,CollectionUtils.isEmpty(ioStorInvDtls)?null:ioStorInv.getBill_code(),param.getReportParam()); diff --git a/nladmin-system/wms-server/src/main/java/org/nl/wms/pda_manage/outBound/dto/LineSideDto.java b/nladmin-system/wms-server/src/main/java/org/nl/wms/pda_manage/outBound/dto/LineSideDto.java index 13c86dd..ac557f3 100644 --- a/nladmin-system/wms-server/src/main/java/org/nl/wms/pda_manage/outBound/dto/LineSideDto.java +++ b/nladmin-system/wms-server/src/main/java/org/nl/wms/pda_manage/outBound/dto/LineSideDto.java @@ -1,11 +1,8 @@ package org.nl.wms.pda_manage.outBound.dto; import lombok.Data; -import org.nl.wms.ext_manage.mes.service.dto.WorkOrderBomItem; import java.math.BigDecimal; -import java.util.List; -import java.util.Map; @Data public class LineSideDto { @@ -31,5 +28,7 @@ public class LineSideDto { private BigDecimal reportedQty; private String storageVehicleCode; private String reportParam; + private String trackNo; + private String workArea; } diff --git a/nladmin-system/wms-server/src/main/java/org/nl/wms/sch_manage/service/core/FormReturnAutoTask.java b/nladmin-system/wms-server/src/main/java/org/nl/wms/sch_manage/service/core/FormReturnAutoTask.java index 83b3035..5d95b58 100644 --- a/nladmin-system/wms-server/src/main/java/org/nl/wms/sch_manage/service/core/FormReturnAutoTask.java +++ b/nladmin-system/wms-server/src/main/java/org/nl/wms/sch_manage/service/core/FormReturnAutoTask.java @@ -35,7 +35,11 @@ public class FormReturnAutoTask { List rows = new ArrayList<>(); for (PmStockReturn item : list) { rows.add(item); - pmStockReturnService.uploadRows(rows); + try { + pmStockReturnService.uploadRows(rows); + } catch (Exception e) { + log.error("定时回传任务错误{}",e.getMessage()); + } Thread.sleep(1000 * 5); rows.remove(item); } diff --git a/nladmin-system/wms-server/src/main/java/org/nl/wms/sch_manage/service/core/ReceiveReturnAutoTask.java b/nladmin-system/wms-server/src/main/java/org/nl/wms/sch_manage/service/core/ReceiveReturnAutoTask.java index ff178e6..24a962b 100644 --- a/nladmin-system/wms-server/src/main/java/org/nl/wms/sch_manage/service/core/ReceiveReturnAutoTask.java +++ b/nladmin-system/wms-server/src/main/java/org/nl/wms/sch_manage/service/core/ReceiveReturnAutoTask.java @@ -33,7 +33,11 @@ public class ReceiveReturnAutoTask { .last("limit 5")); log.info("========>倒冲领料定时回传列表：{}", JSON.toJSONString(list)); for (ReceiveOutReturn item : list) { - receiveOutReturnService.uploadErp(item); + try { + receiveOutReturnService.uploadErp(item); + } catch (Exception e) { + log.error("========>倒冲领料定时回传错误：{}", e.getMessage()); + } Thread.sleep(1000 * 5); } } diff --git a/nladmin-system/wms-server/src/main/java/org/nl/wms/warehouse_manage/stockReturn/receiveOutRetur/dao/ReceiveOutReturn.java b/nladmin-system/wms-server/src/main/java/org/nl/wms/warehouse_manage/stockReturn/receiveOutRetur/dao/ReceiveOutReturn.java index 59e1a54..83cc857 100644 --- a/nladmin-system/wms-server/src/main/java/org/nl/wms/warehouse_manage/stockReturn/receiveOutRetur/dao/ReceiveOutReturn.java +++ b/nladmin-system/wms-server/src/main/java/org/nl/wms/warehouse_manage/stockReturn/receiveOutRetur/dao/ReceiveOutReturn.java @@ -29,6 +29,10 @@ public class ReceiveOutReturn implements Serializable { private String requsername; private String comment; private String cztype; + @TableField("track_no") + private String trackNo; + @TableField("work_area") + private String workArea; @TableField("create_time") private String createTime; diff --git a/nladmin-system/wms-server/src/main/java/org/nl/wms/warehouse_manage/stockReturn/receiveOutRetur/dao/ReceiveOutReturnDetail.java b/nladmin-system/wms-server/src/main/java/org/nl/wms/warehouse_manage/stockReturn/receiveOutRetur/dao/ReceiveOutReturnDetail.java index 036fdae..f265671 100644 --- a/nladmin-system/wms-server/src/main/java/org/nl/wms/warehouse_manage/stockReturn/receiveOutRetur/dao/ReceiveOutReturnDetail.java +++ b/nladmin-system/wms-server/src/main/java/org/nl/wms/warehouse_manage/stockReturn/receiveOutRetur/dao/ReceiveOutReturnDetail.java @@ -36,6 +36,7 @@ public class ReceiveOutReturnDetail implements Serializable { private String lotnumber; private String stockerno; private String stockername; + private String iobillcode; @TableField("update_time") private String updateTime; private String status; diff --git a/nladmin-system/wms-server/src/main/java/org/nl/wms/warehouse_manage/stockReturn/receiveOutRetur/service/impl/ReceiveOutReturnServiceImpl.java b/nladmin-system/wms-server/src/main/java/org/nl/wms/warehouse_manage/stockReturn/receiveOutRetur/service/impl/ReceiveOutReturnServiceImpl.java index cfa5a07..24da266 100644 --- a/nladmin-system/wms-server/src/main/java/org/nl/wms/warehouse_manage/stockReturn/receiveOutRetur/service/impl/ReceiveOutReturnServiceImpl.java +++ b/nladmin-system/wms-server/src/main/java/org/nl/wms/warehouse_manage/stockReturn/receiveOutRetur/service/impl/ReceiveOutReturnServiceImpl.java @@ -8,7 +8,6 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.google.common.collect.Lists; import lombok.extern.slf4j.Slf4j; import org.nl.common.domain.query.PageQuery; import org.nl.common.exception.BadRequestException; @@ -19,7 +18,6 @@ import org.nl.wms.basedata_manage.enums.BaseDataEnum; import org.nl.wms.basedata_manage.service.IBsrealStorattrService; import org.nl.wms.basedata_manage.service.IMdMeMaterialbaseService; import org.nl.wms.basedata_manage.service.ISectattrService; -import org.nl.wms.basedata_manage.service.IStructattrService; import org.nl.wms.basedata_manage.service.dao.BsrealStorattr; import org.nl.wms.basedata_manage.service.dao.MdMeMaterialbase; import org.nl.wms.basedata_manage.service.dao.Sectattr; @@ -27,8 +25,6 @@ import org.nl.wms.ext_manage.api.EasApi; import org.nl.wms.ext_manage.api.request.QueryEasStockRequest; import org.nl.wms.ext_manage.api.request.ReceiveOutRequest; import org.nl.wms.ext_manage.api.response.QueryEasStockResponse; -import org.nl.wms.ext_manage.mes.service.dto.WorkOrderBomItem; -import org.nl.wms.ext_manage.service.WmsToErpService; import org.nl.wms.ext_manage.util.ErpUtil; import org.nl.wms.warehouse_manage.enums.IOSEnum; import org.nl.wms.warehouse_manage.inAndOut.service.dao.IOStorInv; @@ -200,13 +196,15 @@ public class ReceiveOutReturnServiceImpl extends ServiceImpl entrys) { + private void saveRequestDetails(Long returnId, List entrys, String ioBillCode) { if (entrys == null || entrys.isEmpty()) { return; } @@ -232,6 +230,7 @@ public class ReceiveOutReturnServiceImpl extends ServiceImpl 0) { + if (qty.compareTo(actualQty) > 0 && detail.getStatus().equals(StockReturnStatusEnum.FAIL.getCode())) { + //跳过 + sucess = Boolean.FALSE; continue; + } else if (qty.compareTo(actualQty) > 0 && detail.getStatus().equals(StockReturnStatusEnum.TODO.getCode())) { + sucess = Boolean.FALSE; + continue;//库存不足但是同步时生成过出入库单 + } else{ + detail.setStatus(StockReturnStatusEnum.TODO.getCode()); + detail.setIobillcode(ioStorInv.getBill_code()); } entrys.add(detail); //待回传的说明还没做库存变动 - if (detail.getStatus().equals(StockReturnStatusEnum.FAIL.getCode())){ + if (detail.getStatus().equals(StockReturnStatusEnum.FAIL.getCode())){//失败说明库存不足，直接跳过 continue; } final IOStorInvDtl ioStorInvDtl = new IOStorInvDtl(); @@ -453,6 +461,7 @@ public class ReceiveOutReturnServiceImpl extends ServiceImpl() - .set(ReceiveOutReturnDetail::getStatus,StockReturnStatusEnum.FAIL.getCode()) +// .set(ReceiveOutReturnDetail::getStatus,StockReturnStatusEnum.FAIL.getCode()) .set(ReceiveOutReturnDetail::getRemark,"EAS库存不足") .set(ReceiveOutReturnDetail::getUpdateTime,now) .in(ReceiveOutReturnDetail::getId,unsatisfiedList.stream() @@ -497,11 +506,8 @@ public class ReceiveOutReturnServiceImpl extends ServiceImpl details, String now, ErpUtil login) { - String status; - String remark = ""; - Boolean sucess =Boolean.TRUE; if (id == null ) { throw new IllegalArgumentException("回传记录ID和明细ID不能为空"); } @@ -513,20 +519,17 @@ public class ReceiveOutReturnServiceImpl extends ServiceImpl请求EAS领料出库单接口：" + JSONObject.toJSONString(req)); login.audit(req.toJSONString()); - status = StockReturnStatusEnum.SUCESS.getCode(); } catch (Exception e) { - sucess = Boolean.FALSE; log.error("请求EAS领料出库单接口失败，回传记录ID：{}", id, e); - status = StockReturnStatusEnum.FAIL.getCode(); - remark = e.getMessage(); + throw new BadRequestException(e.getMessage()); } receiveOutReturnDetailMapper.update(null,new LambdaUpdateWrapper() - .set(ReceiveOutReturnDetail::getStatus,status) - .set(ReceiveOutReturnDetail::getRemark,remark) + .set(ReceiveOutReturnDetail::getStatus,StockReturnStatusEnum.SUCESS.getCode()) + .set(ReceiveOutReturnDetail::getRemark,"") .set(ReceiveOutReturnDetail::getUpdateTime,now) .in(ReceiveOutReturnDetail::getId,details.stream() .map(ReceiveOutReturnDetail::getId).collect(Collectors.toList()))); - return sucess; + return Boolean.TRUE; } private Boolean callEasByOneBill(ReceiveOutReturn entity, Boolean sucess, Long id, List details, String now, ErpUtil login) { diff --git a/nladmin-system/wms-server/src/main/java/org/nl/wms/warehouse_manage/stockReturn/service/enums/StockReturnStatusEnum.java b/nladmin-system/wms-server/src/main/java/org/nl/wms/warehouse_manage/stockReturn/service/enums/StockReturnStatusEnum.java index a14c27c..c6c6b87 100644 --- a/nladmin-system/wms-server/src/main/java/org/nl/wms/warehouse_manage/stockReturn/service/enums/StockReturnStatusEnum.java +++ b/nladmin-system/wms-server/src/main/java/org/nl/wms/warehouse_manage/stockReturn/service/enums/StockReturnStatusEnum.java @@ -11,6 +11,7 @@ public enum StockReturnStatusEnum { SUCESS("1","回传成功"), FAIL("2","回传失败"), ERROR("3","回传异常"), + IGNORE("4","忽略过账"), ; StockReturnStatusEnum(String code, String desc) { diff --git a/nladmin-ui/src/views/wms/pm_manage/receiveOutReturn/index.vue b/nladmin-ui/src/views/wms/pm_manage/receiveOutReturn/index.vue index 72c59ab..ac968f7 100644 --- a/nladmin-ui/src/views/wms/pm_manage/receiveOutReturn/index.vue +++ b/nladmin-ui/src/views/wms/pm_manage/receiveOutReturn/index.vue @@ -73,6 +73,8 @@ + + @@ -121,7 +123,7 @@ {{ currentRow.remark }} {{ currentRow.reportParam }} - + +
关闭
@@ -212,6 +222,7 @@ export default { viewShow: false, uploadFlag: true, currentRow: {}, + detailPage: { page: 1, size: 10 }, permission: { add: ['purchasemst:add'], edit: ['purchasemst:edit'], @@ -221,7 +232,8 @@ export default { { value: '0', label: '待回传' }, { value: '1', label: '回传成功' }, { value: '2', label: '回传失败' }, - { value: '3', label: '回传异常' } + { value: '3', label: '回传异常' }, + { value: '4', label: '忽略过账' }, ], rules: { orgno: [{ required: true, message: '请输入机构编号', trigger: 'blur' }], @@ -230,6 +242,22 @@ export default { } } }, + computed: { + pagedDetails() { + const list = this.currentRow.details || [] + const start = (this.detailPage.page - 1) * this.detailPage.size + return list.slice(start, start + this.detailPage.size) + } + }, + watch: { + 'detailPage.size'() { + const total = (this.currentRow.details || []).length + const maxPage = Math.max(1, Math.ceil(total / this.detailPage.size)) + if (this.detailPage.page > maxPage) { + this.detailPage.page = maxPage + } + } + }, methods: { [CRUD.HOOK.beforeRefresh]() { if (this.query.dateRange) { @@ -332,6 +360,7 @@ export default { toView(row) { get(row.id).then(res => { this.currentRow = res.data + this.detailPage.page = 1 this.viewShow = true }) }