From e3985366aaf5d47e08f755f67374137367e29c38 Mon Sep 17 00:00:00 2001 From: liuxy Date: Tue, 14 Nov 2023 16:02:11 +0800 Subject: [PATCH] =?UTF-8?q?add:=E5=85=A5=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PdmBiSubpackagerelationController.java | 37 ++ .../IPdmBiSubpackagerelationService.java | 24 ++ .../service/dao/PdmBiSubpackagerelation.java | 256 +++++++++++++ .../mapper/PdmBiSubpackagerelationMapper.java | 23 ++ .../xml/PdmBiSubpackagerelationMapper.xml | 49 +++ .../service/dto/SubPackageQuery.java | 36 ++ .../PdmBiSubpackagerelationServiceImpl.java | 38 ++ .../iostorInv/StIvtIostorinvController.java | 41 ++ .../wms/storage_manage/ios/enums/IOSEnum.java | 55 +++ .../iostorInv/IStIvtIostorinvService.java | 33 ++ .../service/iostorInv/dao/StIvtIostorinv.java | 345 +++++++++++++++++ .../dao/mapper/StIvtIostorinvMapper.java | 23 ++ .../dao/mapper/xml/StIvtIostorinvMapper.xml | 37 ++ .../service/iostorInv/dto/IostorInvQuery.java | 36 ++ .../impl/StIvtIostorinvServiceImpl.java | 68 ++++ .../storage_manage/ios/inbill/AddDialog.vue | 340 +++++++++++++++++ .../wms/storage_manage/ios/inbill/AddDtl.vue | 169 +++++++++ .../storage_manage/ios/inbill/DivDialog.vue | 342 +++++++++++++++++ .../storage_manage/ios/inbill/TaskDialog.vue | 229 ++++++++++++ .../storage_manage/ios/inbill/ViewDialog.vue | 283 ++++++++++++++ .../wms/storage_manage/ios/inbill/inbill.js | 35 ++ .../wms/storage_manage/ios/inbill/index.vue | 351 ++++++++++++++++++ 22 files changed, 2850 insertions(+) create mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/subpackage/controller/PdmBiSubpackagerelationController.java create mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/subpackage/service/IPdmBiSubpackagerelationService.java create mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/subpackage/service/dao/PdmBiSubpackagerelation.java create mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/subpackage/service/dao/mapper/PdmBiSubpackagerelationMapper.java create mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/subpackage/service/dao/mapper/xml/PdmBiSubpackagerelationMapper.xml create mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/subpackage/service/dto/SubPackageQuery.java create mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/subpackage/service/impl/PdmBiSubpackagerelationServiceImpl.java create mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/ios/controller/iostorInv/StIvtIostorinvController.java create mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/ios/enums/IOSEnum.java create mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/ios/service/iostorInv/IStIvtIostorinvService.java create mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/ios/service/iostorInv/dao/StIvtIostorinv.java create mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/ios/service/iostorInv/dao/mapper/StIvtIostorinvMapper.java create mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/ios/service/iostorInv/dao/mapper/xml/StIvtIostorinvMapper.xml create mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/ios/service/iostorInv/dto/IostorInvQuery.java create mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvServiceImpl.java create mode 100644 lms/nladmin-ui/src/views/wms/storage_manage/ios/inbill/AddDialog.vue create mode 100644 lms/nladmin-ui/src/views/wms/storage_manage/ios/inbill/AddDtl.vue create mode 100644 lms/nladmin-ui/src/views/wms/storage_manage/ios/inbill/DivDialog.vue create mode 100644 lms/nladmin-ui/src/views/wms/storage_manage/ios/inbill/TaskDialog.vue create mode 100644 lms/nladmin-ui/src/views/wms/storage_manage/ios/inbill/ViewDialog.vue create mode 100644 lms/nladmin-ui/src/views/wms/storage_manage/ios/inbill/inbill.js create mode 100644 lms/nladmin-ui/src/views/wms/storage_manage/ios/inbill/index.vue diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/subpackage/controller/PdmBiSubpackagerelationController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/subpackage/controller/PdmBiSubpackagerelationController.java new file mode 100644 index 0000000..5168ac5 --- /dev/null +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/subpackage/controller/PdmBiSubpackagerelationController.java @@ -0,0 +1,37 @@ +package org.nl.wms.pdm.subpackage.controller; + + +import org.nl.common.domain.query.PageQuery; +import org.nl.common.logging.annotation.Log; +import org.nl.wms.pdm.subpackage.service.IPdmBiSubpackagerelationService; +import org.nl.wms.pdm.subpackage.service.dto.SubPackageQuery; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + *

+ * 子卷包装关系表 前端控制器 + *

+ * + * @author generator + * @since 2023-11-14 + */ +@RestController +@RequestMapping("/api/pdmBiSubpackagerelation") +public class PdmBiSubpackagerelationController { + + @Autowired + private IPdmBiSubpackagerelationService iPdmBiSubpackagerelationService; + + @GetMapping + @Log("查询子卷包装关系") + public ResponseEntity query(SubPackageQuery query, PageQuery page){ + return new ResponseEntity<>(iPdmBiSubpackagerelationService.pageQuery(query,page), HttpStatus.OK); + } + +} + diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/subpackage/service/IPdmBiSubpackagerelationService.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/subpackage/service/IPdmBiSubpackagerelationService.java new file mode 100644 index 0000000..32ec350 --- /dev/null +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/subpackage/service/IPdmBiSubpackagerelationService.java @@ -0,0 +1,24 @@ +package org.nl.wms.pdm.subpackage.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import org.nl.common.domain.query.PageQuery; +import org.nl.wms.pdm.subpackage.service.dao.PdmBiSubpackagerelation; +import org.nl.wms.pdm.subpackage.service.dto.SubPackageQuery; + +/** + *

+ * 子卷包装关系表 服务类 + *

+ * + * @author generator + * @since 2023-11-14 + */ +public interface IPdmBiSubpackagerelationService extends IService { + + /** + * @param query / + * @param page / + * @return / + */ + Object pageQuery(SubPackageQuery query, PageQuery page); +} diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/subpackage/service/dao/PdmBiSubpackagerelation.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/subpackage/service/dao/PdmBiSubpackagerelation.java new file mode 100644 index 0000000..bbe3151 --- /dev/null +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/subpackage/service/dao/PdmBiSubpackagerelation.java @@ -0,0 +1,256 @@ +package org.nl.wms.pdm.subpackage.service.dao; + +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serializable; +import java.math.BigDecimal; + +/** + *

+ * 子卷包装关系表 + *

+ * + * @author generator + * @since 2023-11-14 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@TableName("pdm_bi_subpackagerelation") +public class PdmBiSubpackagerelation implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 子卷包装标识 + */ + private String workorder_id; + + /** + * 木箱唯一码 + */ + private String package_box_sn; + + /** + * 箱内子卷数量 + */ + private BigDecimal quanlity_in_box; + + /** + * 木箱自身重量 + */ + private BigDecimal box_weight; + + /** + * 保质期 + */ + private String quality_guaran_period; + + /** + * 销售订单及行号 + */ + private String sale_order_name; + + /** + * 客户编号 + */ + private String customer_name; + + /** + * 客户名称 + */ + private String customer_description; + + /** + * 产品编码 + */ + private String product_name; + + /** + * 产品描述 + */ + private String product_description; + + /** + * 入库日期 + */ + private String date_of_FG_inbound; + + /** + * 子卷号 + */ + private String container_name; + + /** + * 产品规格(幅宽) + */ + private String width; + + /** + * 产品厚度 + */ + private String thickness; + + /** + * 单位面积质量 + */ + private BigDecimal mass_per_unit_area; + + /** + * 净重 + */ + private BigDecimal net_weight; + + /** + * 长度 + */ + private BigDecimal length; + + /** + * 制造完成日期 + */ + private String date_of_production; + + /** + * 计划外分切的子卷 + */ + private Boolean is_un_plan_production; + + /** + * 子卷的物性值1 + */ + private String un_plan_product_property1; + + /** + * 子卷的物性值2 + */ + private String un_plan_product_property2; + + /** + * 子卷的物性值3 + */ + private String un_plan_product_property3; + + /** + * 备注 + */ + private String remark; + + /** + * 创建人 + */ + private String create_id; + + /** + * 创建人姓名 + */ + private String create_name; + + /** + * 创建时间 + */ + private String create_time; + + /** + * 状态 + */ + private String status; + + /** + * 是否需要重打外包装标签 + */ + private Boolean isRePrintPackageBoxLabel; + + /** + * 是否需要拆包重打子卷标签 + */ + private Boolean isUnPackBox; + + /** + * 木箱料号 + */ + private String box_type; + + /** + * SAP批次 + */ + private String sap_pcsn; + + /** + * 交货单号 + */ + private String vbeln; + + /** + * 交货单行号 + */ + private String posnr; + + /** + * 木箱长度 + */ + private String box_length; + + /** + * 木箱宽度 + */ + private String box_width; + + /** + * 木箱高度 + */ + private String box_high; + + /** + * 销售订单描述 + */ + private String sale_order_description; + + /** + * 客户要求规格幅宽 + */ + private String width_standard; + + /** + * 物料标准厚度 + */ + private String thickness_request; + + /** + * 实际木箱自身重量 + */ + private BigDecimal real_weight; + + /** + * 包装关系类型 + */ + private String sub_type; + + /** + * 客户需求抗拉下限 + */ + private String demand_limit; + + /** + * 内控标准抗拉下限 + */ + private String standard_limit; + + /** + * 生产实际抗拉值 + */ + private String actual_value; + + /** + * 解绑删除标识 + */ + private Boolean need_delete; + + /** + * 储存地点 + */ + private String ext_code; + + +} diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/subpackage/service/dao/mapper/PdmBiSubpackagerelationMapper.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/subpackage/service/dao/mapper/PdmBiSubpackagerelationMapper.java new file mode 100644 index 0000000..c787ea7 --- /dev/null +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/subpackage/service/dao/mapper/PdmBiSubpackagerelationMapper.java @@ -0,0 +1,23 @@ +package org.nl.wms.pdm.subpackage.service.dao.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; +import org.nl.common.domain.query.PageQuery; +import org.nl.wms.pdm.subpackage.service.dao.PdmBiSubpackagerelation; +import org.nl.wms.pdm.subpackage.service.dto.SubPackageQuery; + +import java.util.List; +import java.util.Map; + +/** + *

+ * 子卷包装关系表 Mapper 接口 + *

+ * + * @author generator + * @since 2023-11-14 + */ +public interface PdmBiSubpackagerelationMapper extends BaseMapper { + + List getPageQuery(@Param("query") SubPackageQuery query, @Param("pageQuery") PageQuery pageQuery); +} diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/subpackage/service/dao/mapper/xml/PdmBiSubpackagerelationMapper.xml b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/subpackage/service/dao/mapper/xml/PdmBiSubpackagerelationMapper.xml new file mode 100644 index 0000000..06d6ff5 --- /dev/null +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/subpackage/service/dao/mapper/xml/PdmBiSubpackagerelationMapper.xml @@ -0,0 +1,49 @@ + + + + + + + diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/subpackage/service/dto/SubPackageQuery.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/subpackage/service/dto/SubPackageQuery.java new file mode 100644 index 0000000..c7d4c30 --- /dev/null +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/subpackage/service/dto/SubPackageQuery.java @@ -0,0 +1,36 @@ +package org.nl.wms.pdm.subpackage.service.dto; + +import lombok.Data; +import org.nl.common.domain.query.BaseQuery; +import org.nl.common.domain.query.QParam; +import org.nl.common.enums.QueryTEnum; +import org.nl.wms.pdm.subpackage.service.dao.PdmBiSubpackagerelation; + +/* + * @author LXY + * @Date 2023/11/10 14:49 + */ +@Data +public class SubPackageQuery extends BaseQuery { + + + private String package_box_sn; + + private String sale_order_name; + + private String customer_name; + + private String container_name; + + private String status; + + private String sap_pcsn; + + + @Override + public void paramMapping() { + super.doP.put("package_box_sn", QParam.builder().k(new String[]{"package_box_sn"}).type(QueryTEnum.LK).build()); + } + + +} diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/subpackage/service/impl/PdmBiSubpackagerelationServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/subpackage/service/impl/PdmBiSubpackagerelationServiceImpl.java new file mode 100644 index 0000000..cf94d3f --- /dev/null +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/subpackage/service/impl/PdmBiSubpackagerelationServiceImpl.java @@ -0,0 +1,38 @@ +package org.nl.wms.pdm.subpackage.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.github.pagehelper.Page; +import com.github.pagehelper.PageHelper; +import org.nl.common.base.TableDataInfo; +import org.nl.common.domain.query.PageQuery; +import org.nl.wms.pdm.subpackage.service.IPdmBiSubpackagerelationService; +import org.nl.wms.pdm.subpackage.service.dao.PdmBiSubpackagerelation; +import org.nl.wms.pdm.subpackage.service.dao.mapper.PdmBiSubpackagerelationMapper; +import org.nl.wms.pdm.subpackage.service.dto.SubPackageQuery; +import org.springframework.stereotype.Service; + +import java.util.List; +import java.util.Map; + +/** + *

+ * 子卷包装关系表 服务实现类 + *

+ * + * @author generator + * @since 2023-11-14 + */ +@Service +public class PdmBiSubpackagerelationServiceImpl extends ServiceImpl implements IPdmBiSubpackagerelationService { + + @Override + public Object pageQuery(SubPackageQuery query, PageQuery pageQuery) { + Page page = PageHelper.startPage(pageQuery.getPage() + 1, pageQuery.getSize()); + page.setOrderBy("package_box_sn DESC"); + List mst_detail = this.baseMapper.getPageQuery(query, pageQuery); + + TableDataInfo build = TableDataInfo.build(mst_detail); + build.setTotalElements(page.getTotal()); + return build; + } +} diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/ios/controller/iostorInv/StIvtIostorinvController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/ios/controller/iostorInv/StIvtIostorinvController.java new file mode 100644 index 0000000..ad378d1 --- /dev/null +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/ios/controller/iostorInv/StIvtIostorinvController.java @@ -0,0 +1,41 @@ +package org.nl.wms.storage_manage.ios.controller.iostorInv; + + +import com.alibaba.fastjson.JSONObject; +import org.nl.common.domain.query.PageQuery; +import org.nl.common.logging.annotation.Log; +import org.nl.wms.storage_manage.ios.service.iostorInv.IStIvtIostorinvService; +import org.nl.wms.storage_manage.ios.service.iostorInv.dto.IostorInvQuery; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; + +/** + *

+ * 入库单主表 前端控制器 + *

+ * + * @author generator + * @since 2023-11-10 + */ +@RestController +@RequestMapping("/api/stIvtIostorinv/inBill") +public class StIvtIostorinvController { + + @Autowired + private IStIvtIostorinvService iStIvtIostorinvService; + + @GetMapping + @Log("查询入库单") + public ResponseEntity query(IostorInvQuery query, PageQuery page){ + return new ResponseEntity<>(iStIvtIostorinvService.pageQuery(query,page), HttpStatus.OK); + } + + @PostMapping("/queryBoxMater") + @Log("查询入库单") + public ResponseEntity queryBoxMater(@RequestBody JSONObject whereJson){ + return new ResponseEntity<>(iStIvtIostorinvService.queryBoxMater(whereJson), HttpStatus.OK); + } +} + diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/ios/enums/IOSEnum.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/ios/enums/IOSEnum.java new file mode 100644 index 0000000..31a519b --- /dev/null +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/ios/enums/IOSEnum.java @@ -0,0 +1,55 @@ +package org.nl.wms.storage_manage.ios.enums; + +import lombok.AllArgsConstructor; +import lombok.Getter; +import org.apache.commons.lang3.StringUtils; +import org.nl.common.exception.BadRequestException; +import org.nl.config.MapOf; + +import java.util.Map; + +/* + * @author lxy + * @Date 2023/11/14 20:11 + */ +@AllArgsConstructor +@Getter +public enum IOSEnum { + //出入库类型 + IO_TYPE(MapOf.of("入库", "0", "出库", "1","移库", "2")), + + //出入单据状态 + BILL_STATUS(MapOf.of("生成", "10", "提交", "20","分配中", "30","分配完","40","完成","99")), + + //出入单创建方式 + CREATE_MODE(MapOf.of("PC产生", "10", "终端产生", "20","外部接口产生", "30")), + + //出入任务执行状态 + WORK_STATUS(MapOf.of("未生成", "10", "生成", "20","执行中", "30","完成","99")), + + //入库单据类型 + IN_TYPE(MapOf.of("手工入库", "99")), + + //出库单据类型 + OUT_TYPE(MapOf.of("手工出库", "99")), + ; + + private Map code; + + public String code(String desc) { + String code = this.getCode().get(desc); + if (StringUtils.isNotEmpty(code)) { + return code; + } + throw new BadRequestException(this.name() + "对应类型" + desc + "未定义"); + } + + public String check(String code) { + for (Map.Entry entry : this.getCode().entrySet()) { + if (entry.getValue().equals("code")) { + return entry.getValue(); + } + } + throw new BadRequestException(this.name() + "对应类型" + code + "未定义"); + } +} diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/ios/service/iostorInv/IStIvtIostorinvService.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/ios/service/iostorInv/IStIvtIostorinvService.java new file mode 100644 index 0000000..50ff6d9 --- /dev/null +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/ios/service/iostorInv/IStIvtIostorinvService.java @@ -0,0 +1,33 @@ +package org.nl.wms.storage_manage.ios.service.iostorInv; + +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.extension.service.IService; +import org.nl.common.domain.query.PageQuery; +import org.nl.wms.storage_manage.ios.service.iostorInv.dao.StIvtIostorinv; +import org.nl.wms.storage_manage.ios.service.iostorInv.dto.IostorInvQuery; + +/** + *

+ * 入库单主表 服务类 + *

+ * + * @author generator + * @since 2023-11-10 + */ +public interface IStIvtIostorinvService extends IService { + + /** + * 分页查询 + * @param query,page / + * @return Object + */ + Object pageQuery(IostorInvQuery query, PageQuery page); + + /** + * 根据箱号查询子卷 + * @param whereJson 、 + * @return 、 + */ + JSONArray queryBoxMater(JSONObject whereJson); +} diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/ios/service/iostorInv/dao/StIvtIostorinv.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/ios/service/iostorInv/dao/StIvtIostorinv.java new file mode 100644 index 0000000..89df5b1 --- /dev/null +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/ios/service/iostorInv/dao/StIvtIostorinv.java @@ -0,0 +1,345 @@ +package org.nl.wms.storage_manage.ios.service.iostorInv.dao; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Builder; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serializable; +import java.math.BigDecimal; + +/** + *

+ * 出入库单主表 + *

+ * + * @author generator + * @since 2023-11-10 + */ +@Data +@Builder +@EqualsAndHashCode(callSuper = false) +@TableName("st_ivt_iostorinv") +public class StIvtIostorinv implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 出入单标识 + */ + @TableId + private String iostorinv_id; + + /** + * 单据编号 + */ + private String bill_code; + + /** + * 出入类型 + */ + private String io_type; + + /** + * 业务类型 + */ + private String buss_type; + + /** + * 单据类型 + */ + private String bill_type; + + /** + * 业务日期 + */ + private String biz_date; + + /** + * 仓库标识 + */ + private String stor_id; + + /** + * 仓库编码 + */ + private String stor_code; + + /** + * 仓库名称 + */ + private String stor_name; + + /** + * 来源方标识 + */ + private String source_id; + + /** + * 来源方名称 + */ + private String source_name; + + /** + * 来源方类型 + */ + private String source_type; + + /** + * 总数量 + */ + private BigDecimal total_qty; + + /** + * 总重量 + */ + private BigDecimal total_weight; + + /** + * 明细数 + */ + private BigDecimal detail_count; + + /** + * 单据状态 + */ + private String bill_status; + + /** + * 备注 + */ + private String remark; + + /** + * 生成方式 + */ + private String create_mode; + + /** + * 制单人 + */ + private String input_optid; + + /** + * 制单人姓名 + */ + private String input_optname; + + /** + * 制单时间 + */ + private String input_time; + + /** + * 修改人 + */ + private String update_optid; + + /** + * 修改人姓名 + */ + private String update_optname; + + /** + * 修改时间 + */ + private String update_time; + + /** + * 分配人 + */ + private String dis_optid; + + /** + * 分配人姓名 + */ + private String dis_optname; + + /** + * 分配时间 + */ + private String dis_time; + + /** + * 确认人 + */ + private String confirm_optid; + + /** + * 确认人姓名 + */ + private String confirm_optname; + + /** + * 确认时间 + */ + private String confirm_time; + + /** + * 部门ID + */ + private String sysdeptid; + + /** + * 公司ID + */ + private String syscompanyid; + + /** + * 是否删除 + */ + private Boolean is_delete; + + /** + * 是否已上传 + */ + private Boolean is_upload; + + /** + * 回传人 + */ + private String upload_optid; + + /** + * 回传时间 + */ + private String upload_time; + + /** + * 是否冲销 + */ + private Boolean is_writeoff; + + /** + * 冲销人 + */ + private String writeoff_optid; + + /** + * 冲销时间 + */ + private String writeoff_time; + + /** + * 收货单位 + */ + private String consignee; + + /** + * 收货人 + */ + private String receiver; + + /** + * 收货地址 + */ + private String receiptaddress; + + /** + * 收货人联系电话 + */ + private String receiptphone; + + /** + * 物流公司 + */ + private String logisticscompany; + + /** + * 司机 + */ + private String drivername; + + /** + * 车牌号 + */ + private String carno; + + /** + * 司机联系电话 + */ + private String driverphone; + + /** + * 合同号 + */ + private String contractno; + + /** + * 送货单位 + */ + private String deliveryunit; + + /** + * 送货方地址 + */ + private String deliveryaddress; + + /** + * 送货方联系人 + */ + private String deliveryname; + + /** + * 送货联系电话 + */ + private String deliveryphone; + + /** + * 物流公司编码 + */ + private String trans_code; + + /** + * 预估运费 + */ + private BigDecimal estimated_freight; + + /** + * 客户编码 + */ + private String cust_code; + + /** + * 移入仓库标识 + */ + private String out_stor_id; + + /** + * 回传MES + */ + private Boolean upload_mes; + + /** + * 回传SAP + */ + private Boolean upload_sap; + + /** + * 运转费 + */ + private BigDecimal run_freight; + + /** + * 卸车费 + */ + private BigDecimal unload_freight; + + /** + * 其他费用 + */ + private BigDecimal other_freight; + + /** + * 运单号 + */ + private String order_number; + + /** + * 车型 + */ + private String car_type; + + +} diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/ios/service/iostorInv/dao/mapper/StIvtIostorinvMapper.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/ios/service/iostorInv/dao/mapper/StIvtIostorinvMapper.java new file mode 100644 index 0000000..4284432 --- /dev/null +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/ios/service/iostorInv/dao/mapper/StIvtIostorinvMapper.java @@ -0,0 +1,23 @@ +package org.nl.wms.storage_manage.ios.service.iostorInv.dao.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; +import org.nl.common.domain.query.PageQuery; +import org.nl.wms.storage_manage.ios.service.iostorInv.dao.StIvtIostorinv; +import org.nl.wms.storage_manage.ios.service.iostorInv.dto.IostorInvQuery; + +import java.util.List; +import java.util.Map; + +/** + *

+ * 出入库单主表 Mapper 接口 + *

+ * + * @author generator + * @since 2023-11-10 + */ +public interface StIvtIostorinvMapper extends BaseMapper { + + List getPageQuery(@Param("query") IostorInvQuery query, @Param("pageQuery") PageQuery pageQuery); +} diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/ios/service/iostorInv/dao/mapper/xml/StIvtIostorinvMapper.xml b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/ios/service/iostorInv/dao/mapper/xml/StIvtIostorinvMapper.xml new file mode 100644 index 0000000..47a65d0 --- /dev/null +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/ios/service/iostorInv/dao/mapper/xml/StIvtIostorinvMapper.xml @@ -0,0 +1,37 @@ + + + + + + + diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/ios/service/iostorInv/dto/IostorInvQuery.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/ios/service/iostorInv/dto/IostorInvQuery.java new file mode 100644 index 0000000..5adb63f --- /dev/null +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/ios/service/iostorInv/dto/IostorInvQuery.java @@ -0,0 +1,36 @@ +package org.nl.wms.storage_manage.ios.service.iostorInv.dto; + +import lombok.Data; +import org.nl.common.domain.query.BaseQuery; +import org.nl.common.domain.query.QParam; +import org.nl.common.enums.QueryTEnum; +import org.nl.wms.storage_manage.ios.service.iostorInv.dao.StIvtIostorinv; + +/* + * @author LXY + * @Date 2023/11/10 14:49 + */ +@Data +public class IostorInvQuery extends BaseQuery { + + + private String stor_id; + + private String bill_status; + + private String bill_type; + + private String bill_code; + + private String io_type; + + private Boolean is_delete = false; + + + @Override + public void paramMapping() { + super.doP.put("bill_code", QParam.builder().k(new String[]{"bill_code"}).type(QueryTEnum.LK).build()); + } + + +} diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvServiceImpl.java new file mode 100644 index 0000000..515a16a --- /dev/null +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvServiceImpl.java @@ -0,0 +1,68 @@ +package org.nl.wms.storage_manage.ios.service.iostorInv.impl; + +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.github.pagehelper.Page; +import com.github.pagehelper.PageHelper; +import oracle.sql.ROWID; +import org.nl.common.base.TableDataInfo; +import org.nl.common.domain.query.PageQuery; +import org.nl.wms.pdm.subpackage.service.IPdmBiSubpackagerelationService; +import org.nl.wms.pdm.subpackage.service.dao.PdmBiSubpackagerelation; +import org.nl.wms.storage_manage.ios.service.iostorInv.IStIvtIostorinvService; +import org.nl.wms.storage_manage.ios.service.iostorInv.dao.StIvtIostorinv; +import org.nl.wms.storage_manage.ios.service.iostorInv.dao.mapper.StIvtIostorinvMapper; +import org.nl.wms.storage_manage.ios.service.iostorInv.dto.IostorInvQuery; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +/** + *

+ * 出入库单主表 服务实现类 + *

+ * + * @author generator + * @since 2023-11-10 + */ +@Service +public class StIvtIostorinvServiceImpl extends ServiceImpl implements IStIvtIostorinvService { + + @Autowired + private IPdmBiSubpackagerelationService iPdmBiSubpackagerelationService; // 子卷包装关系服务 + + @Override + public Object pageQuery(IostorInvQuery query, PageQuery pageQuery) { + Page page = PageHelper.startPage(pageQuery.getPage() + 1, pageQuery.getSize()); + page.setOrderBy("create_time DESC"); + List mst_detail = this.baseMapper.getPageQuery(query, pageQuery); + + TableDataInfo build = TableDataInfo.build(mst_detail); + build.setTotalElements(page.getTotal()); + return build; + } + + @Override + public JSONArray queryBoxMater(JSONObject whereJson) { + JSONArray data = whereJson.getJSONArray("data"); + + List resultList = iPdmBiSubpackagerelationService.list( + new QueryWrapper().lambda() + .in(PdmBiSubpackagerelation::getPackage_box_sn, + data.stream() + .map(row -> JSON.parseObject(JSONObject.toJSONString(row))) + .map(row -> row.getString("package_box_sn")) + .collect(Collectors.toSet()) + ) + .orderByAsc(PdmBiSubpackagerelation::getPackage_box_sn) + ); + + return JSONArray.parseArray(JSONObject.toJSONString(resultList)); + } +} diff --git a/lms/nladmin-ui/src/views/wms/storage_manage/ios/inbill/AddDialog.vue b/lms/nladmin-ui/src/views/wms/storage_manage/ios/inbill/AddDialog.vue new file mode 100644 index 0000000..5f2c0cd --- /dev/null +++ b/lms/nladmin-ui/src/views/wms/storage_manage/ios/inbill/AddDialog.vue @@ -0,0 +1,340 @@ + + + + + diff --git a/lms/nladmin-ui/src/views/wms/storage_manage/ios/inbill/AddDtl.vue b/lms/nladmin-ui/src/views/wms/storage_manage/ios/inbill/AddDtl.vue new file mode 100644 index 0000000..19bc202 --- /dev/null +++ b/lms/nladmin-ui/src/views/wms/storage_manage/ios/inbill/AddDtl.vue @@ -0,0 +1,169 @@ + + + + diff --git a/lms/nladmin-ui/src/views/wms/storage_manage/ios/inbill/DivDialog.vue b/lms/nladmin-ui/src/views/wms/storage_manage/ios/inbill/DivDialog.vue new file mode 100644 index 0000000..64878e9 --- /dev/null +++ b/lms/nladmin-ui/src/views/wms/storage_manage/ios/inbill/DivDialog.vue @@ -0,0 +1,342 @@ + + + + + diff --git a/lms/nladmin-ui/src/views/wms/storage_manage/ios/inbill/TaskDialog.vue b/lms/nladmin-ui/src/views/wms/storage_manage/ios/inbill/TaskDialog.vue new file mode 100644 index 0000000..9ff85bb --- /dev/null +++ b/lms/nladmin-ui/src/views/wms/storage_manage/ios/inbill/TaskDialog.vue @@ -0,0 +1,229 @@ + + + + + diff --git a/lms/nladmin-ui/src/views/wms/storage_manage/ios/inbill/ViewDialog.vue b/lms/nladmin-ui/src/views/wms/storage_manage/ios/inbill/ViewDialog.vue new file mode 100644 index 0000000..316acb6 --- /dev/null +++ b/lms/nladmin-ui/src/views/wms/storage_manage/ios/inbill/ViewDialog.vue @@ -0,0 +1,283 @@ + + + + + diff --git a/lms/nladmin-ui/src/views/wms/storage_manage/ios/inbill/inbill.js b/lms/nladmin-ui/src/views/wms/storage_manage/ios/inbill/inbill.js new file mode 100644 index 0000000..b05e5e5 --- /dev/null +++ b/lms/nladmin-ui/src/views/wms/storage_manage/ios/inbill/inbill.js @@ -0,0 +1,35 @@ +import request from '@/utils/request' + +export function add(data) { + return request({ + url: '/api/stIvtIostorinv/inBill', + method: 'post', + data + }) +} + +export function del(ids) { + return request({ + url: '/api/stIvtIostorinv/inBill', + method: 'delete', + data: ids + }) +} + +export function edit(data) { + return request({ + url: '/api/stIvtIostorinv/inBill', + method: 'put', + data + }) +} + +export function queryBoxMater(data) { + return request({ + url: '/api/stIvtIostorinv/inBill/queryBoxMater', + method: 'post', + data + }) +} + +export default { add, edit, del, queryBoxMater } diff --git a/lms/nladmin-ui/src/views/wms/storage_manage/ios/inbill/index.vue b/lms/nladmin-ui/src/views/wms/storage_manage/ios/inbill/index.vue new file mode 100644 index 0000000..7bf4782 --- /dev/null +++ b/lms/nladmin-ui/src/views/wms/storage_manage/ios/inbill/index.vue @@ -0,0 +1,351 @@ + + + +