From 619a6de84fec15a0cebcfd4374b47ce90227af7b Mon Sep 17 00:00:00 2001 From: liyongde <1419499670@qq.com> Date: Wed, 11 Jun 2025 17:00:27 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=87=BA=E5=BA=93=E6=98=8E=E7=BB=86?= =?UTF-8?q?=E3=80=81=E5=88=86=E9=85=8D=E6=98=8E=E7=BB=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iostorInv/IStIvtIostorinvdisService.java | 9 + .../iostorInv/IStIvtIostorinvdtlService.java | 8 + .../dao/mapper/StIvtIostorinvdisMapper.java | 4 + .../dao/mapper/StIvtIostorinvdisMapper.xml | 36 ++++ .../dao/mapper/StIvtIostorinvdtlMapper.java | 6 + .../dao/mapper/StIvtIostorinvdtlMapper.xml | 72 ++++++++ .../impl/StIvtIostorinvdisServiceImpl.java | 20 +++ .../impl/StIvtIostorinvdtlServiceImpl.java | 9 + .../wms/st/instor/rest/CheckController.java | 4 +- .../outbill/rest/CheckOutBillController.java | 35 ++++ .../outbill/service/CheckOutBillService.java | 28 ++++ .../service/dto/OutBillDtlQueryParam.java | 19 +++ .../outbill/service/dto/OutBillTaskParam.java | 18 ++ .../service/impl/CheckOutBillServiceImpl.java | 36 ++++ .../st/outbill/service/vo/OutBillDtlVo.java | 150 +++++++++++++++++ .../st/outbill/service/vo/OutBillTaskVo.java | 155 ++++++++++++++++++ .../src/views/wms/st/outbill/ViewDialog.vue | 8 + 17 files changed, 616 insertions(+), 1 deletion(-) create mode 100644 lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/rest/CheckOutBillController.java create mode 100644 lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/CheckOutBillService.java create mode 100644 lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/dto/OutBillDtlQueryParam.java create mode 100644 lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/dto/OutBillTaskParam.java create mode 100644 lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java create mode 100644 lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/vo/OutBillDtlVo.java create mode 100644 lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/vo/OutBillTaskVo.java diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/IStIvtIostorinvdisService.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/IStIvtIostorinvdisService.java index 4c1567b..7c1ae94 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/IStIvtIostorinvdisService.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/IStIvtIostorinvdisService.java @@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; import org.nl.b_lms.storage_manage.ios.service.iostorInv.dao.StIvtIostorinvdis; import org.nl.common.domain.query.PageQuery; +import org.nl.wms.st.outbill.service.dto.OutBillTaskParam; +import org.nl.wms.st.outbill.service.vo.OutBillTaskVo; import org.nl.wms.stat.service.dto.InBillPageParam; import org.nl.wms.stat.service.dto.OutBillPageParam; import org.nl.wms.stat.service.vo.InBillPageVo; @@ -85,5 +87,12 @@ public interface IStIvtIostorinvdisService extends IService { * @return */ List getAllocationByIosId(String iosId); + + /** + * 详情查询出库单分配任务2 + * @param param + * @return + */ + List getOutBillTask2(OutBillTaskParam param); } diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/IStIvtIostorinvdtlService.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/IStIvtIostorinvdtlService.java index a93bae9..792036d 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/IStIvtIostorinvdtlService.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/IStIvtIostorinvdtlService.java @@ -3,6 +3,8 @@ package org.nl.b_lms.storage_manage.ios.service.iostorInv; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.extension.service.IService; import org.nl.b_lms.storage_manage.ios.service.iostorInv.dao.StIvtIostorinvdtl; +import org.nl.wms.st.outbill.service.dto.OutBillDtlQueryParam; +import org.nl.wms.st.outbill.service.vo.OutBillDtlVo; import java.util.ArrayList; import java.util.HashMap; @@ -76,4 +78,10 @@ public interface IStIvtIostorinvdtlService extends IService { */ void updateStatus(String iostorinvdtl_id); + /** + * 查询出库明细 + * @param param + * @return + */ + List getOutBillDtl(OutBillDtlQueryParam param); } diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/dao/mapper/StIvtIostorinvdisMapper.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/dao/mapper/StIvtIostorinvdisMapper.java index 363c430..c38b265 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/dao/mapper/StIvtIostorinvdisMapper.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/dao/mapper/StIvtIostorinvdisMapper.java @@ -8,6 +8,8 @@ import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; import org.nl.b_lms.storage_manage.ios.service.iostorInv.dao.StIvtIostorinvdis; +import org.nl.wms.st.outbill.service.dto.OutBillTaskParam; +import org.nl.wms.st.outbill.service.vo.OutBillTaskVo; import org.nl.wms.stat.service.dto.InBillPageParam; import org.nl.wms.stat.service.dto.OutBillPageParam; import org.nl.wms.stat.service.vo.InBillPageVo; @@ -89,4 +91,6 @@ public interface StIvtIostorinvdisMapper extends BaseMapper { IPage selectOutBillPageLeftJoin(IPage pages, OutBillPageParam paramMap); List getOutBillData(@Param("paramMap") OutBillPageParam paramMap); + + List getOutBillTask2(@Param("param") OutBillTaskParam param); } diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/dao/mapper/StIvtIostorinvdisMapper.xml b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/dao/mapper/StIvtIostorinvdisMapper.xml index a3d6b53..49e89d1 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/dao/mapper/StIvtIostorinvdisMapper.xml +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/dao/mapper/StIvtIostorinvdisMapper.xml @@ -1063,6 +1063,42 @@ WHERE 1=1 limit 0,50000 + diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/dao/mapper/StIvtIostorinvdtlMapper.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/dao/mapper/StIvtIostorinvdtlMapper.java index dcc2d46..87964e6 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/dao/mapper/StIvtIostorinvdtlMapper.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/dao/mapper/StIvtIostorinvdtlMapper.java @@ -4,6 +4,10 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; import com.alibaba.fastjson.JSONArray; import org.nl.b_lms.storage_manage.ios.service.iostorInv.dao.StIvtIostorinvdtl; +import org.nl.wms.st.outbill.service.dto.OutBillDtlQueryParam; +import org.nl.wms.st.outbill.service.vo.OutBillDtlVo; + +import java.util.List; /** *

@@ -16,4 +20,6 @@ import org.nl.b_lms.storage_manage.ios.service.iostorInv.dao.StIvtIostorinvdtl; public interface StIvtIostorinvdtlMapper extends BaseMapper { JSONArray selectIoDtl(@Param("billCode") String id, @Param("openFlag") String openFlag); + + List getOutBillDtl(@Param("param") OutBillDtlQueryParam param); } diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/dao/mapper/StIvtIostorinvdtlMapper.xml b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/dao/mapper/StIvtIostorinvdtlMapper.xml index 09110e5..d6dbb4a 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/dao/mapper/StIvtIostorinvdtlMapper.xml +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/dao/mapper/StIvtIostorinvdtlMapper.xml @@ -29,4 +29,76 @@ dtl.box_no, dtl.pcsn + diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvdisServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvdisServiceImpl.java index 18023f4..bd25825 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvdisServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvdisServiceImpl.java @@ -21,6 +21,8 @@ import org.nl.b_lms.storage_manage.ios.service.iostorInv.dao.mapper.StIvtIostori import org.nl.common.domain.query.PageQuery; import org.nl.common.utils.IdUtil; import org.nl.modules.wql.util.SpringContextHolder; +import org.nl.wms.st.outbill.service.dto.OutBillTaskParam; +import org.nl.wms.st.outbill.service.vo.OutBillTaskVo; import org.nl.wms.stat.service.dto.InBillPageParam; import org.nl.wms.stat.service.dto.OutBillPageParam; import org.nl.wms.stat.service.vo.InBillPageVo; @@ -295,4 +297,22 @@ public class StIvtIostorinvdisServiceImpl extends ServiceImpl getOutBillTask2(OutBillTaskParam param) { + List outBillTask2 = stIvtIostorinvdisMapper.getOutBillTask2(param); + outBillTask2.forEach(bill -> { + String taskStatus = bill.getTask_status(); + if (ObjectUtil.isEmpty(taskStatus)) { + String workStatus = bill.getWork_status(); + if ("01".equals(workStatus)) { + bill.setTask_status("01"); + } + if ("99".equals(workStatus)) { + bill.setTask_status("07"); + } + } + }); + return outBillTask2; + } } diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvdtlServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvdtlServiceImpl.java index ab72054..2c847da 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvdtlServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvdtlServiceImpl.java @@ -17,6 +17,8 @@ import org.nl.b_lms.storage_manage.ios.service.iostorInv.dao.mapper.StIvtIostori import org.nl.common.utils.IdUtil; import org.nl.modules.common.exception.BadRequestException; import org.nl.modules.wql.core.bean.WQLObject; +import org.nl.wms.st.outbill.service.dto.OutBillDtlQueryParam; +import org.nl.wms.st.outbill.service.vo.OutBillDtlVo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -48,6 +50,8 @@ public class StIvtIostorinvdtlServiceImpl extends ServiceImpl>insertDtl(List rows, String iostorinv_id) { @@ -316,6 +320,11 @@ public class StIvtIostorinvdtlServiceImpl extends ServiceImpl getOutBillDtl(OutBillDtlQueryParam param) { + return stIvtIostorinvdtlMapper.getOutBillDtl(param); + } + /** * 组织分配明细所需数据 * @param dtlDao： 明细实体类 diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/rest/CheckController.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/rest/CheckController.java index eb4c27e..e21cdfe 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/rest/CheckController.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/rest/CheckController.java @@ -14,9 +14,11 @@ import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.Map; +/** + * 盘点功能 + */ @RestController @RequiredArgsConstructor - @RequestMapping("/api/check") @Slf4j public class CheckController { diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/rest/CheckOutBillController.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/rest/CheckOutBillController.java new file mode 100644 index 0000000..2250ca2 --- /dev/null +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/rest/CheckOutBillController.java @@ -0,0 +1,35 @@ +package org.nl.wms.st.outbill.rest; + +import lombok.extern.slf4j.Slf4j; +import org.nl.modules.logging.annotation.Log; +import org.nl.wms.st.outbill.service.CheckOutBillService; +import org.nl.wms.st.outbill.service.dto.OutBillDtlQueryParam; +import org.nl.wms.st.outbill.service.dto.OutBillTaskParam; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import java.util.Map; + +/** + * @Author: lyd + * @Date: 2025/6/11 + */ +@RestController +@RequestMapping("/api/checkoutbill") +@Slf4j +public class CheckOutBillController { + @Resource + private CheckOutBillService checkOutBillService; + @GetMapping("/getOutBillDtl") + @Log("查询出库明细") + public ResponseEntity getOutBillDtl(OutBillDtlQueryParam param) { + return new ResponseEntity<>(checkOutBillService.getOutBillDtl(param), HttpStatus.OK); + } + @PostMapping("/getOutBillTask2") + @Log("详情查询出库单分配任务2") + public ResponseEntity getOutBillTask2(@RequestBody OutBillTaskParam param) { + return new ResponseEntity<>(checkOutBillService.getOutBillTask2(param), HttpStatus.OK); + } +} diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/CheckOutBillService.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/CheckOutBillService.java new file mode 100644 index 0000000..5bcab01 --- /dev/null +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/CheckOutBillService.java @@ -0,0 +1,28 @@ +package org.nl.wms.st.outbill.service; + +import org.nl.wms.st.outbill.service.dto.OutBillDtlQueryParam; +import org.nl.wms.st.outbill.service.dto.OutBillTaskParam; +import org.nl.wms.st.outbill.service.vo.OutBillDtlVo; +import org.nl.wms.st.outbill.service.vo.OutBillTaskVo; + +import java.util.List; + +/** + * @Author: lyd + * @Date: 2025/6/11 + */ +public interface CheckOutBillService { + /** + * 查询出库明细 + * @param param + * @return + */ + List getOutBillDtl(OutBillDtlQueryParam param); + + /** + * 详情查询出库单分配任务2 + * @param param + * @return + */ + List getOutBillTask2(OutBillTaskParam param); +} diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/dto/OutBillDtlQueryParam.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/dto/OutBillDtlQueryParam.java new file mode 100644 index 0000000..309c834 --- /dev/null +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/dto/OutBillDtlQueryParam.java @@ -0,0 +1,19 @@ +package org.nl.wms.st.outbill.service.dto; + +import lombok.Data; + +import java.io.Serializable; + +/** + * 出库单明细查询参数类 + * @Author: lyd + * @Date: 2025/6/11 + */ +@Data +public class OutBillDtlQueryParam implements Serializable { + private String iostorinv_id; + private String iostorinvdtl_id; + private String bill_status; + private String unassign_flag; + +} diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/dto/OutBillTaskParam.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/dto/OutBillTaskParam.java new file mode 100644 index 0000000..501206d --- /dev/null +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/dto/OutBillTaskParam.java @@ -0,0 +1,18 @@ +package org.nl.wms.st.outbill.service.dto; + +import lombok.Data; + +import java.io.Serializable; + +/** + * 出库单任务查询参数 + * @Author: lyd + * @Date: 2025/6/11 + */ +@Data +public class OutBillTaskParam implements Serializable { + private String iostorinvdtl_id; + private String iostorinv_id; + private String is_issued; + private String struct_id; +} diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java new file mode 100644 index 0000000..c34a6ed --- /dev/null +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java @@ -0,0 +1,36 @@ +package org.nl.wms.st.outbill.service.impl; + +import lombok.extern.slf4j.Slf4j; +import org.nl.b_lms.storage_manage.ios.service.iostorInv.IStIvtIostorinvdisService; +import org.nl.b_lms.storage_manage.ios.service.iostorInv.IStIvtIostorinvdtlService; +import org.nl.wms.st.outbill.service.CheckOutBillService; +import org.nl.wms.st.outbill.service.dto.OutBillDtlQueryParam; +import org.nl.wms.st.outbill.service.dto.OutBillTaskParam; +import org.nl.wms.st.outbill.service.vo.OutBillDtlVo; +import org.nl.wms.st.outbill.service.vo.OutBillTaskVo; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * @Author: lyd + * @Date: 2025/6/11 + */ +@Service +@Slf4j +public class CheckOutBillServiceImpl implements CheckOutBillService { + @Autowired + private IStIvtIostorinvdtlService iostorinvdtlService; + @Autowired + private IStIvtIostorinvdisService iostorinvdisService; + @Override + public List getOutBillDtl(OutBillDtlQueryParam param) { + return iostorinvdtlService.getOutBillDtl(param); + } + + @Override + public List getOutBillTask2(OutBillTaskParam param) { + return iostorinvdisService.getOutBillTask2(param); + } +} diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/vo/OutBillDtlVo.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/vo/OutBillDtlVo.java new file mode 100644 index 0000000..e807088 --- /dev/null +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/vo/OutBillDtlVo.java @@ -0,0 +1,150 @@ +package org.nl.wms.st.outbill.service.vo; + +import lombok.Data; + +import java.io.Serializable; +import java.math.BigDecimal; + +/** + * 出库单明细vo实体 + * @Author: lyd + * @Date: 2025/6/11 + */ +@Data +public class OutBillDtlVo implements Serializable { + /** + * 出入单明细标识 + */ + private String iostorinvdtl_id; + + /** + * 出入单标识 + */ + private String iostorinv_id; + + /** + * 明细序号 + */ + private BigDecimal seq_no; + + /** + * 物料标识 + */ + private Long material_id; + + /** + * 批次 + */ + private String pcsn; + + /** + * 品质类型 + */ + private String quality_scode; + + /** + * 单据明细状态 + */ + private String bill_status; + + /** + * 数量计量单位标识 + */ + private Long qty_unit_id; + + /** + * 数量计量单位名称 + */ + private String qty_unit_name; + + /** + * 计划数量 + */ + private BigDecimal plan_qty; + + /** + * 实际数量 + */ + private BigDecimal real_qty; + + /** + * 来源单据明细标识 + */ + private Long source_billdtl_id; + + /** + * 来源单据类型 + */ + private String source_bill_type; + + /** + * 来源单编号 + */ + private String source_bill_code; + + /** + * 来源单表名 + */ + private String source_bill_table; + + /** + * 基础单据明细标识 + */ + private Long base_billdtl_id; + + /** + * 基础单据类型 + */ + private String base_bill_type; + + /** + * 基础单编号 + */ + private String base_bill_code; + + /** + * 基础单表名 + */ + private String base_bill_table; + + /** + * 备注 + */ + private String remark; + + /** + * 已分配数量 + */ + private BigDecimal assign_qty; + + /** + * 未分配数量 + */ + private BigDecimal unassign_qty; + + /** + * 箱号 + */ + private String box_no; + + /** + * 来源交货单 + */ + private String vbeln; + + /** + * 来源交货单行 + */ + private String posnr; + + /** + * 发货幅宽 + */ + private String width; + private String bill_code; + private String material_code; + private String material_name; + private String material_spec; + private String material_model; + private String sap_pcsn; +} diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/vo/OutBillTaskVo.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/vo/OutBillTaskVo.java new file mode 100644 index 0000000..98628e8 --- /dev/null +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/vo/OutBillTaskVo.java @@ -0,0 +1,155 @@ +package org.nl.wms.st.outbill.service.vo; + +import lombok.Data; + +import java.io.Serializable; +import java.math.BigDecimal; + +/** + * 出库单任务vo + * @Author: lyd + * @Date: 2025/6/11 + */ +@Data +public class OutBillTaskVo implements Serializable { + /** + * 出入单分配标识 + */ + private String iostorinvdis_id; + + /** + * 出入单标识 + */ + private String iostorinv_id; + + /** + * 出入单明细标识 + */ + private String iostorinvdtl_id; + + /** + * 明细序号 + */ + private BigDecimal seq_no; + + /** + * 库区标识 + */ + private String sect_id; + + /** + * 库区编码 + */ + private String sect_code; + + /** + * 库区名称 + */ + private String sect_name; + + /** + * 仓位标识 + */ + private String struct_id; + + /** + * 仓位编码 + */ + private String struct_code; + + /** + * 仓位名称 + */ + private String struct_name; + + /** + * 物料标识 + */ + private String material_id; + + /** + * 批次 + */ + private String pcsn; + + /** + * 品质类型 + */ + private String quality_scode; + + /** + * 执行状态 + */ + private String work_status; + + /** + * 任务标识 + */ + private String task_id; + + /** + * 存储载具标识 + */ + private String storagevehicle_id; + + /** + * 存储载具编码 + */ + private String storagevehicle_code; + + /** + * 是否已下发 + */ + private String is_issued; + + /** + * 数量计量单位标识 + */ + private String qty_unit_id; + + /** + * 数量计量单位名称 + */ + private String qty_unit_name; + + /** + * 计划数量 + */ + private BigDecimal plan_qty; + + /** + * 实际数量 + */ + private BigDecimal real_qty; + + /** + * 出入点位标识 + */ + private String point_id; + + /** + * 箱号 + */ + private String box_no; + + /** + * 是否超期 + */ + private String is_overdue; + + /** + * 入库时间 + */ + private String instorage_time; + + /** + * 是否回传 + */ + private String is_upload; + private String task_code; + private String task_type; + private String task_status; + private String sap_pcsn; + private String width_standard; + private String task_type_name; +} diff --git a/lms/nladmin-ui/src/views/wms/st/outbill/ViewDialog.vue b/lms/nladmin-ui/src/views/wms/st/outbill/ViewDialog.vue index 8b6a568..963a101 100644 --- a/lms/nladmin-ui/src/views/wms/st/outbill/ViewDialog.vue +++ b/lms/nladmin-ui/src/views/wms/st/outbill/ViewDialog.vue @@ -113,6 +113,7 @@ { this.tableDtl = res + this.loading = false }) }, queryTableDdis() { @@ -288,6 +294,8 @@ export default { this.tabledis = res }).catch(() => { this.tabledis = [] + }).finally(() => { + this.loading2 = false }) } }