diff --git a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseOutOrderServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseOutOrderServiceImpl.java index a4040c5d..46b24fdc 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseOutOrderServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseOutOrderServiceImpl.java @@ -98,7 +98,7 @@ public class WarehouseOutOrderServiceImpl implements IWarehouseOutOrderService private WarehouseInventoryInquiryDetailMapper inventoryInquiryDetailMapper; @Autowired - private OutsourceRequisitionMapper requisitionMapper; + private OutsourceRequisitionMapper outRequisitionMapper; @Autowired private BaseEmpRequisiteOrderMapper empRequisiteOrderMapper; @@ -1284,91 +1284,89 @@ public class WarehouseOutOrderServiceImpl implements IWarehouseOutOrderService if (warehouseOutOrder == null) { throw new BusinessException("更新出库单信息失败：缺少必要参数"); } - + WarehouseOutOrder oldOutOrder = warehouseOutOrderMapper.selectWarehouseOutOrderByCode(warehouseOutOrder.getOutOrderCode()); List warehouseOutOrderDetailList = warehouseOutOrder.getWarehouseOutOrderDetailList(); - if (CollectionUtils.isEmpty(warehouseOutOrderDetailList)){ - log.warn("保存委外单出库,物料列表信息为空：{}",warehouseOutOrder); throw new BusinessException("出库单详情数据为空"); - }else { - int updateRows = 0; - for (WarehouseOutOrderDetail warehouseOutOrderDetail : warehouseOutOrderDetailList) { - warehouseOutOrderDetail.setUpdateBy(loginName); - warehouseOutOrderDetail.setUpdateTime(DateUtils.getNowDate()); - warehouseOutOrderDetail.setRemark(warehouseOutOrder.getRemark()); - //设置已出库数 - warehouseOutOrderDetail.setHasOutOrderSum(warehouseOutOrderDetail.getActualOutOrderSum()); - //设置仓库员 - warehouseOutOrderDetail.setWarehouseName(loginName); - //更新数据库记录 - updateRows += outOrderDetailMapper.updateWarehouseOutOrderDetail(warehouseOutOrderDetail); - if (updateRows <= 0){ - throw new BusinessException("更新出库单详情数据失败"); - }else { -// 更新库存查询记录，新增库存历史 - String materialNo = warehouseOutOrderDetail.getMaterialNo(); - WarehouseInventoryInquiry inventoryInquiry = inventoryInquiryMapper.selectWarehouseInventoryInquiryByMaterialNo(materialNo); - if(inventoryInquiry == null){ - throw new BusinessException("更新库存查询数据失败！该物料不存在库存数据"); - }else{ - int inquiryUpdateResult = updateWarehouseInventoryInquiry(warehouseOutOrder,warehouseOutOrderDetail,inventoryInquiry); - if (inquiryUpdateResult <= 0){ - throw new BusinessException("更新库存查询数据失败"); - } - } - } - } } - warehouseOutOrder.setUpdateBy(loginName); - warehouseOutOrder.setUpdateTime(DateUtils.getNowDate()); - //表明已出库 - warehouseOutOrder.setWarehouseOutStatus("7"); - //设置出库时间 - warehouseOutOrder.setOutOrderTime(DateUtils.getNowDate()); - //设置仓库员 - warehouseOutOrder.setWarehouseName(loginName); - //计算出库单主表的出库数 - Integer outOrderSum = 0; - // 检查outOrderSum是否含有null值 - boolean hasOutOrderSumNull = warehouseOutOrderDetailList.stream() - .anyMatch(item -> item.getActualOutOrderSum() == null); - - if (hasOutOrderSumNull) { - throw new BusinessException("存在实际出库数为空，请检查！"); + List filtList = warehouseOutOrderDetailList.stream() + .filter(item ->item.getActualOutOrderSum() != null).collect(Collectors.toList()); + if (filtList.size()==0) { + throw new BusinessException("实际出库数不能全为空，请检查！"); + } + // 检查总出库数是否超出申请数 + for (WarehouseOutOrderDetail detail: filtList) { + int hasOutNum = Optional.ofNullable(detail.getHasOutOrderSum()).orElse(0); + int allOutNum = hasOutNum + detail.getActualOutOrderSum(); + int applyNum = Optional.ofNullable(detail.getApplyOutOrderSum()).orElse(0); + if(allOutNum > applyNum){ + throw new BusinessException("物料"+detail.getMaterialNo()+"总出库数超出申请出库数，请检查！"); + } } - // 检查outOrderSum是否含有null值 - boolean hasOutOrderSumOver = warehouseOutOrderDetailList.stream() - .anyMatch(item -> item.getActualOutOrderSum() > item.getApplyOutOrderSum()); - - if (hasOutOrderSumOver) { - throw new BusinessException("存在实际出库数大于申请出库数，请检查！"); + int updateRows = 0; + for (WarehouseOutOrderDetail detail : filtList) { + detail.setUpdateBy(loginName); + detail.setUpdateTime(DateUtils.getNowDate()); + detail.setRemark(warehouseOutOrder.getRemark()); + //设置已出库数 + int hasOutNum = Optional.ofNullable(detail.getHasOutOrderSum()).orElse(0); + hasOutNum = hasOutNum + detail.getActualOutOrderSum(); + detail.setHasOutOrderSum(hasOutNum); + detail.setWarehouseName(loginName); + updateRows += outOrderDetailMapper.updateWarehouseOutOrderDetail(detail); + if (updateRows <= 0){ + throw new BusinessException("更新出库单详情数据失败"); + } + //更新库存查询记录，新增库存历史 + String materialNo = detail.getMaterialNo(); + WarehouseInventoryInquiry inventoryInquiry = inventoryInquiryMapper.selectWarehouseInventoryInquiryByMaterialNo(materialNo); + if(inventoryInquiry == null){ + throw new BusinessException("更新库存查询数据失败！该物料不存在库存数据"); + } + int inquiryUpdateResult = updateWarehouseInventoryInquiry(oldOutOrder,detail,inventoryInquiry); + if (inquiryUpdateResult <= 0){ + throw new BusinessException("更新库存查询数据失败"); + } } + //计算出库单主表的出库数 + Integer outOrderSum = oldOutOrder.getOutOrderSum() != null ? oldOutOrder.getOutOrderSum() : 0; // 计算各个字段的总和 - outOrderSum = warehouseOutOrderDetailList.stream() + Integer detailOutOrderSum = filtList.stream() .mapToInt(WarehouseOutOrderDetail::getActualOutOrderSum) .sum(); - //设置出库单主表的出库数 - warehouseOutOrder.setOutOrderSum(outOrderSum); + outOrderSum = outOrderSum + detailOutOrderSum; - // 更新委外领料单 + //更新委外领料单 OutsourceRequisitionVO temp = new OutsourceRequisitionVO(); - temp.setOutsourceRequisitionNo(warehouseOutOrder.getRelatedOrderCode()); - List outRequisitions = requisitionMapper.selectOutsourceRequisitionList(temp); - OutsourceRequisitionVO requisitionVO = outRequisitions.get(0); - requisitionVO.setRequisitionStatus("2"); - requisitionVO.setUpdateTime(DateUtils.getNowDate()); - requisitionVO.setUpdateBy(ShiroUtils.getLoginName()); - int updateResult = requisitionMapper.updateOutsourceRequisition(requisitionVO); + temp.setOutsourceRequisitionNo(oldOutOrder.getRelatedOrderCode()); + List outsourceRequisitions = outRequisitionMapper.selectOutsourceRequisitionList(temp); + OutsourceRequisitionVO outRequisition = outsourceRequisitions.get(0); + + //设置出库单主表的出库数 + oldOutOrder.setOutOrderSum(outOrderSum); + if(outOrderSum == oldOutOrder.getEnterpriseSum()){ + oldOutOrder.setWarehouseOutStatus("7");//已出库 + outRequisition.setRequisitionStatus("2");//全部领料 + }else if(outOrderSum < oldOutOrder.getEnterpriseSum()){ + oldOutOrder.setWarehouseOutStatus("5");//部分出库 + outRequisition.setRequisitionStatus("1");//部分领料 + } + outRequisition.setUpdateTime(DateUtils.getNowDate()); + outRequisition.setUpdateBy(ShiroUtils.getLoginName()); + int updateResult = outRequisitionMapper.updateOutsourceRequisition(outRequisition); if(updateResult<=0){ throw new BusinessException("更新委外领料单失败！"); } - - return warehouseOutOrderMapper.updateWarehouseOutOrder(warehouseOutOrder); + oldOutOrder.setUpdateBy(loginName); + oldOutOrder.setUpdateTime(DateUtils.getNowDate()); + oldOutOrder.setOutOrderTime(DateUtils.getNowDate()); + oldOutOrder.setWarehouseName(loginName); + return warehouseOutOrderMapper.updateWarehouseOutOrder(oldOutOrder); } - // 请购单-出库 + // 员工领料单-出库 @Transactional(rollbackFor = Exception.class) @Override public int updateRequisitionOutWarehouse(WarehouseOutOrder warehouseOutOrder) { @@ -1377,87 +1375,86 @@ public class WarehouseOutOrderServiceImpl implements IWarehouseOutOrderService if (warehouseOutOrder == null) { throw new BusinessException("更新出库单信息失败：缺少必要参数"); } - + WarehouseOutOrder oldOutOrder = warehouseOutOrderMapper.selectWarehouseOutOrderByCode(warehouseOutOrder.getOutOrderCode()); List warehouseOutOrderDetailList = warehouseOutOrder.getWarehouseOutOrderDetailList(); - if (CollectionUtils.isEmpty(warehouseOutOrderDetailList)){ - log.warn("保存请购单出库,物料列表信息为空：{}",warehouseOutOrder); throw new BusinessException("出库单详情数据为空"); - }else { - int updateRows = 0; - for (WarehouseOutOrderDetail warehouseOutOrderDetail : warehouseOutOrderDetailList) { - warehouseOutOrderDetail.setUpdateBy(loginName); - warehouseOutOrderDetail.setUpdateTime(DateUtils.getNowDate()); - warehouseOutOrderDetail.setRemark(warehouseOutOrder.getRemark()); - //设置已出库数 - warehouseOutOrderDetail.setHasOutOrderSum(warehouseOutOrderDetail.getActualOutOrderSum()); - //设置仓库员 - warehouseOutOrderDetail.setWarehouseName(loginName); - //更新数据库记录 - updateRows += outOrderDetailMapper.updateWarehouseOutOrderDetail(warehouseOutOrderDetail); - if (updateRows <= 0){ - throw new BusinessException("更新出库单详情数据失败"); - }else { -// 更新库存查询记录，新增库存历史 - String materialNo = warehouseOutOrderDetail.getMaterialNo(); - WarehouseInventoryInquiry inventoryInquiry = inventoryInquiryMapper.selectWarehouseInventoryInquiryByMaterialNo(materialNo); - if(inventoryInquiry == null){ - throw new BusinessException("更新库存查询数据失败！该物料不存在库存数据"); - }else{ - int inquiryUpdateResult = updateWarehouseInventoryInquiry(warehouseOutOrder,warehouseOutOrderDetail,inventoryInquiry); - if (inquiryUpdateResult <= 0){ - throw new BusinessException("更新库存查询数据失败"); - } - } - } - } } - warehouseOutOrder.setUpdateBy(loginName); - warehouseOutOrder.setUpdateTime(DateUtils.getNowDate()); - //表明已出库 - warehouseOutOrder.setWarehouseOutStatus("7"); - //设置出库时间 - warehouseOutOrder.setOutOrderTime(DateUtils.getNowDate()); - //设置仓库员 - warehouseOutOrder.setWarehouseName(loginName); - //计算出库单主表的出库数 - Integer outOrderSum = 0; - // 检查outOrderSum是否含有null值 - boolean hasOutOrderSumNull = warehouseOutOrderDetailList.stream() - .anyMatch(item -> item.getActualOutOrderSum() == null); - - if (hasOutOrderSumNull) { - throw new BusinessException("存在实际出库数为空，请检查！"); + List filtList = warehouseOutOrderDetailList.stream() + .filter(item ->item.getActualOutOrderSum() != null).collect(Collectors.toList()); + if (filtList.size()==0) { + throw new BusinessException("实际出库数不能全为空，请检查！"); + } + // 检查总出库数是否超出申请数 + for (WarehouseOutOrderDetail detail: filtList) { + int hasOutNum = Optional.ofNullable(detail.getHasOutOrderSum()).orElse(0); + int allOutNum = hasOutNum + detail.getActualOutOrderSum(); + int applyNum = Optional.ofNullable(detail.getApplyOutOrderSum()).orElse(0); + if(allOutNum > applyNum){ + throw new BusinessException("物料"+detail.getMaterialNo()+"总出库数超出申请出库数，请检查！"); + } } - // 检查outOrderSum是否含有null值 - boolean hasOutOrderSumOver = warehouseOutOrderDetailList.stream() - .anyMatch(item -> item.getActualOutOrderSum() > item.getApplyOutOrderSum()); - - if (hasOutOrderSumOver) { - throw new BusinessException("存在实际出库数大于申请出库数，请检查！"); + int updateRows = 0; + for (WarehouseOutOrderDetail detail : filtList) { + detail.setUpdateBy(loginName); + detail.setUpdateTime(DateUtils.getNowDate()); + detail.setRemark(warehouseOutOrder.getRemark()); + //设置已出库数 + int hasOutNum = Optional.ofNullable(detail.getHasOutOrderSum()).orElse(0); + hasOutNum = hasOutNum + detail.getActualOutOrderSum(); + detail.setHasOutOrderSum(hasOutNum); + detail.setWarehouseName(loginName); + updateRows += outOrderDetailMapper.updateWarehouseOutOrderDetail(detail); + if (updateRows <= 0){ + throw new BusinessException("更新出库单详情数据失败"); + } + //更新库存查询记录，新增库存历史 + String materialNo = detail.getMaterialNo(); + WarehouseInventoryInquiry inventoryInquiry = inventoryInquiryMapper.selectWarehouseInventoryInquiryByMaterialNo(materialNo); + if(inventoryInquiry == null){ + throw new BusinessException("更新库存查询数据失败！该物料不存在库存数据"); + } + int inquiryUpdateResult = updateWarehouseInventoryInquiry(oldOutOrder,detail,inventoryInquiry); + if (inquiryUpdateResult <= 0){ + throw new BusinessException("更新库存查询数据失败"); + } } + //计算出库单主表的出库数 + Integer outOrderSum = oldOutOrder.getOutOrderSum() != null ? oldOutOrder.getOutOrderSum() : 0; // 计算各个字段的总和 - outOrderSum = warehouseOutOrderDetailList.stream() + Integer detailOutOrderSum = filtList.stream() .mapToInt(WarehouseOutOrderDetail::getActualOutOrderSum) .sum(); - //设置出库单主表的出库数 - warehouseOutOrder.setOutOrderSum(outOrderSum); + outOrderSum = outOrderSum + detailOutOrderSum; - // 更新员工领料单 + //更新员工领料单 BaseEmpRequisiteOrderVO temp = new BaseEmpRequisiteOrderVO(); - temp.setRequisitieCode(warehouseOutOrder.getRelatedOrderCode()); + temp.setRequisitieCode(oldOutOrder.getRelatedOrderCode()); List empRequisiteOrderVOS = empRequisiteOrderMapper.selectBaseEmpRequisiteOrderList(temp); BaseEmpRequisiteOrderVO requisitionVO = empRequisiteOrderVOS.get(0); - requisitionVO.setRequisitieStatus("2"); + + //设置出库单主表的出库数 + oldOutOrder.setOutOrderSum(outOrderSum); + if(outOrderSum == oldOutOrder.getEnterpriseSum()){ + oldOutOrder.setWarehouseOutStatus("7");//已出库 + requisitionVO.setRequisitieStatus("2");//全部领料 + }else if(outOrderSum < oldOutOrder.getEnterpriseSum()){ + oldOutOrder.setWarehouseOutStatus("5");//部分出库 + requisitionVO.setRequisitieStatus("1");//部分领料 + } requisitionVO.setUpdateTime(DateUtils.getNowDate()); requisitionVO.setUpdateBy(ShiroUtils.getLoginName()); int updateResult = empRequisiteOrderMapper.updateBaseEmpRequisiteOrder(requisitionVO); if(updateResult<=0){ throw new BusinessException("更新员工领料单失败！"); } - return warehouseOutOrderMapper.updateWarehouseOutOrder(warehouseOutOrder); + oldOutOrder.setUpdateBy(loginName); + oldOutOrder.setUpdateTime(DateUtils.getNowDate()); + oldOutOrder.setOutOrderTime(DateUtils.getNowDate()); + oldOutOrder.setWarehouseName(loginName); + return warehouseOutOrderMapper.updateWarehouseOutOrder(oldOutOrder); } //新增出库单明细(员工领料) private void CreateOutOrderDetailByRequisiteOrderChildList(BaseEmpRequisiteOrderVO baseEmpRequisiteOrderVO, String outOrderCode) { @@ -1479,6 +1476,7 @@ public class WarehouseOutOrderServiceImpl implements IWarehouseOutOrderService warehouseOutOrderDetail.setEnterpriseSum(Math.toIntExact(child.getMaterialNum())); warehouseOutOrderDetail.setMakeNum(Math.toIntExact(child.getMaterialNum())); warehouseOutOrderDetail.setApplyOutOrderSum(Math.toIntExact(child.getMaterialNum())); + warehouseOutOrderDetail.setHasOutOrderSum(0); warehouseOutOrderDetail.setWarehouseOrderType("2"); warehouseOutOrderDetail.setWarehouseOutType("2"); warehouseOutOrderDetail.setCreateTime(DateUtils.getNowDate()); @@ -1507,6 +1505,7 @@ public class WarehouseOutOrderServiceImpl implements IWarehouseOutOrderService String materialNo = outOrderDetail.getMaterialNo(); Long outOrderId = warehouseOutOrder.getOutOrderId(); WarehouseOutOrder oldWarehouseOutOrder = warehouseOutOrderMapper.selectWarehouseOutOrderById(outOrderId); + String outOrderCode = oldWarehouseOutOrder.getOutOrderCode(); //更新锁定数 Integer lockStockNum = inventoryInquiry.getLockStockNum(); int outNum = outOrderDetail.getActualOutOrderSum(); @@ -1556,13 +1555,37 @@ public class WarehouseOutOrderServiceImpl implements IWarehouseOutOrderService if (insertDetailResult <= 0){ throw new BusinessException("新增库存履历失败！"); } + }else if ("2".equals(oldWarehouseOutOrder.getWarehouseOrderType())){ //员工领料单 + WarehouseInventoryInquiryDetail inquiryDetail = createInquiryDetail(materialNo,outOrderCode,outOrderDetail.getActualOutOrderSum()); + inquiryDetail.setInquiryWarehouseType("10");//员工领料 + inquiryDetail.setInquiryOrderType("10");//员工领料单 + inquiryDetail.setInquiryBusinessType("7");//员工服务 + int insertDetailResult = inventoryInquiryDetailMapper.insertWarehouseInventoryInquiryDetail(inquiryDetail); + if (insertDetailResult <= 0){ + throw new BusinessException("新增库存履历失败！"); + } + }else if ("3".equals(oldWarehouseOutOrder.getWarehouseOrderType())){ //委外领料单 + WarehouseInventoryInquiryDetail inquiryDetail = createInquiryDetail(materialNo,outOrderCode,outOrderDetail.getActualOutOrderSum()); + inquiryDetail.setInquiryWarehouseType("12");//委外领料 + inquiryDetail.setInquiryOrderType("12");//委外领料单 + inquiryDetail.setInquiryBusinessType("2");//委外 + int insertDetailResult = inventoryInquiryDetailMapper.insertWarehouseInventoryInquiryDetail(inquiryDetail); + if (insertDetailResult <= 0){ + throw new BusinessException("新增库存履历失败！"); + } } - - - - - - return inquiryUpdateResult; } + /** 生成库存履历*/ + public WarehouseInventoryInquiryDetail createInquiryDetail(String materialNo, String relatedCode, Integer outNum){ + WarehouseInventoryInquiryDetail inquiryDetail = new WarehouseInventoryInquiryDetail(); + inquiryDetail.setMaterialNo(materialNo); + inquiryDetail.setInventoryHistoricalTime(DateUtils.getNowDate()); + inquiryDetail.setCorrelationCode(relatedCode); + inquiryDetail.setIncreaseDecreaseNum(outNum); + inquiryDetail.setInventoryIncreaseDecrease("0");//减少 + inquiryDetail.setCreateTime(DateUtils.getNowDate()); + inquiryDetail.setCreateBy(ShiroUtils.getLoginName()); + return inquiryDetail; + } } diff --git a/ruoyi-admin/src/main/resources/mapper/warehouse/WarehouseOutOrderDetailMapper.xml b/ruoyi-admin/src/main/resources/mapper/warehouse/WarehouseOutOrderDetailMapper.xml index 597fecde..12c32c5d 100644 --- a/ruoyi-admin/src/main/resources/mapper/warehouse/WarehouseOutOrderDetailMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/warehouse/WarehouseOutOrderDetailMapper.xml @@ -84,9 +84,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" diff --git a/ruoyi-admin/src/main/resources/templates/warehouse/warehouseOutOrder/outsourceOutWarehouse.html b/ruoyi-admin/src/main/resources/templates/warehouse/warehouseOutOrder/outsourceOutWarehouse.html index 1bf6965e..3ce7e160 100644 --- a/ruoyi-admin/src/main/resources/templates/warehouse/warehouseOutOrder/outsourceOutWarehouse.html +++ b/ruoyi-admin/src/main/resources/templates/warehouse/warehouseOutOrder/outsourceOutWarehouse.html @@ -110,9 +110,7 @@ showToggle: false, showColumns: false, pagination: false, // 设置不分页 - columns: [{ - checkbox: true - }, + columns: [ { title: '出库单详情ID', field: 'outOrderDetailId', @@ -165,10 +163,10 @@ return $.table.selectDictLabel(processMethodDatas, value); } }, - { - title: '订单数量', - field: 'makeNum', - }, + // { + // title: '订单数量', + // field: 'makeNum', + // }, { title: '已出库数', field: 'hasOutOrderSum', @@ -180,6 +178,12 @@ { title: '实际出库数', field: 'actualOutOrderSum', + formatter: function(value, row, index) { + if(value == null || value == undefined){ + return ''; + } + return value; + }, editable: { type: 'text', mode:'inline', diff --git a/ruoyi-admin/src/main/resources/templates/warehouse/warehouseOutOrder/requisitioningOutWarehouse.html b/ruoyi-admin/src/main/resources/templates/warehouse/warehouseOutOrder/requisitioningOutWarehouse.html index f6a48934..7a8fb09f 100644 --- a/ruoyi-admin/src/main/resources/templates/warehouse/warehouseOutOrder/requisitioningOutWarehouse.html +++ b/ruoyi-admin/src/main/resources/templates/warehouse/warehouseOutOrder/requisitioningOutWarehouse.html @@ -2,6 +2,7 @@ + @@ -11,7 +12,7 @@
- +
@@ -25,13 +26,13 @@
- +
- +
@@ -178,9 +179,14 @@ { title: '实际出库数', field: 'actualOutOrderSum', + formatter: function(value, row, index) { + if(value == null || value == undefined){ + return ''; + } + return value; + }, editable: { type: 'text', - mode:'inline', validate: function (v,row) { if (!v) return '数量不能为空'; if (isNaN(v)) return '数量必须是数字'; diff --git a/ruoyi-admin/src/main/resources/templates/warehouse/warehouseOutOrder/warehouseOutOrder.html b/ruoyi-admin/src/main/resources/templates/warehouse/warehouseOutOrder/warehouseOutOrder.html index 499f2298..3cb6a162 100644 --- a/ruoyi-admin/src/main/resources/templates/warehouse/warehouseOutOrder/warehouseOutOrder.html +++ b/ruoyi-admin/src/main/resources/templates/warehouse/warehouseOutOrder/warehouseOutOrder.html @@ -235,7 +235,7 @@ } /*请购单-出库*/ - if (row.warehouseOutStatus == 4 && row.warehouseOrderType == 2 && row.warehouseOutType == 2){ + if ((row.warehouseOutStatus == 4 || row.warehouseOutStatus == 5) && row.warehouseOrderType == 2 && row.warehouseOutType == 2){ actions.push('出库 '); } @@ -265,7 +265,7 @@ } /*委外单-出库*/ - if (row.warehouseOutStatus == 4 && row.warehouseOrderType == 3 && row.warehouseOutType == 3){ + if ((row.warehouseOutStatus == 4 || row.warehouseOutStatus == 5) && row.warehouseOrderType == 3 && row.warehouseOutType == 3){ actions.push('出库 '); } /*生产单-出库 详情*/