From 8026de6ec28c99f276b7d56321bffb14813da2aa Mon Sep 17 00:00:00 2001 From: "ZHOUZ\\Noble'lift" <1014987728@qq.com> Date: Wed, 17 May 2023 09:54:26 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E5=8E=9F=E6=9D=90=E6=96=99=E5=85=A5?= =?UTF-8?q?=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../storage/SectattrController.java | 2 +- .../storage/StorattrController.java | 11 +- .../storage/StructattrController.java | 23 +- .../storage/IStIvtStructattrService.java | 6 + .../dao/mapper/xml/StIvtSectattrMapper.xml | 72 +- .../impl/StIvtStructattrServiceImpl.java | 38 +- .../java/org/nl/wms/pcs_manage/PCSEnum.java | 40 + .../PcsIfPurchaseorderController.java | 44 ++ .../purchase/IPcsIfPurchaseorderService.java | 35 + .../purchase/dao/PcsIfPurchaseorder.java | 165 ++++ .../dao/mapper/PcsIfPurchaseorderMapper.java | 24 + .../mapper/xml/PcsIfPurchaseorderMapper.xml | 37 + .../purchase/dto/PurchaseOrderQuery.java | 31 + .../impl/PcsIfPurchaseorderServiceImpl.java | 78 ++ .../org/nl/wms/storage_manage/IOSEnum.java | 3 +- .../iostorInv/StIvtIostorinvYlController.java | 4 +- .../StIvtIostorinvYlOutController.java | 78 ++ .../structIvt/StIvtStructivtYlController.java | 21 +- .../IStIvtIostorinvOutYlService.java | 66 ++ .../iostorInv/dao/StIvtIostorinvYl.java | 23 +- .../iostorInv/dao/StIvtIostorinvdisYl.java | 2 + .../iostorInv/dao/StIvtIostorinvdtlYl.java | 3 + .../dao/mapper/StIvtIostorinvOutYlMapper.java | 23 + .../mapper/xml/StIvtIostorinvOutYlMapper.xml | 63 ++ .../impl/StIvtIostorinvOutYlServiceImpl.java | 240 ++++++ .../impl/StIvtIostorinvYlServiceImpl.java | 92 ++- .../impl/StIvtIostorinvdisYlServiceImpl.java | 20 +- .../structIvt/IStIvtStructivtYlService.java | 10 + .../dao/mapper/StIvtStructivtYlMapper.java | 8 + .../dao/mapper/xml/StIvtStructivtYlMapper.xml | 33 + .../structIvt/dto/StructIvtYLQuery.java | 32 + .../impl/StIvtStructivtYlServiceImpl.java | 20 + mes/qd/src/api/wms/basedata/st/sectattr.js | 4 +- .../wms/masterdata_manage/st/struct/index.vue | 2 +- .../rawproduct/rawProductIn/AddDialog.vue | 48 +- .../rawproduct/rawProductIn/AddDtl.vue | 149 ++-- .../rawproduct/rawProductIn/index.vue | 7 +- .../rawproduct/rawProductOut/AddDialog.vue | 427 +++++----- .../rawproduct/rawProductOut/AddDtl.vue | 206 ++--- .../rawproduct/rawProductOut/DivDialog.vue | 735 ++++++++---------- .../rawproduct/rawProductOut/StructIvt.vue | 309 +++----- .../rawproduct/rawProductOut/ViewDialog.vue | 97 +-- .../rawproduct/rawProductOut/index.vue | 315 ++++---- 43 files changed, 2345 insertions(+), 1301 deletions(-) create mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs_manage/PCSEnum.java create mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs_manage/controller/purchase/PcsIfPurchaseorderController.java create mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs_manage/service/purchase/IPcsIfPurchaseorderService.java create mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs_manage/service/purchase/dao/PcsIfPurchaseorder.java create mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs_manage/service/purchase/dao/mapper/PcsIfPurchaseorderMapper.java create mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs_manage/service/purchase/dao/mapper/xml/PcsIfPurchaseorderMapper.xml create mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs_manage/service/purchase/dto/PurchaseOrderQuery.java create mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs_manage/service/purchase/impl/PcsIfPurchaseorderServiceImpl.java create mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/controller/iostorInv/StIvtIostorinvYlOutController.java create mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/iostorInv/IStIvtIostorinvOutYlService.java create mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/iostorInv/dao/mapper/StIvtIostorinvOutYlMapper.java create mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/iostorInv/dao/mapper/xml/StIvtIostorinvOutYlMapper.xml create mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/iostorInv/impl/StIvtIostorinvOutYlServiceImpl.java create mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/structIvt/dto/StructIvtYLQuery.java diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/controller/storage/SectattrController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/controller/storage/SectattrController.java index 7fec72f7..97e0db90 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/controller/storage/SectattrController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/controller/storage/SectattrController.java @@ -75,7 +75,7 @@ public class SectattrController { @GetMapping("/getSect") @Log("查询库区下拉框") @ApiOperation("查询库区下拉框") - public ResponseEntity querySect(@RequestParam JSONObject query) { + public ResponseEntity querySect(@RequestBody(required = false) JSONObject query) { List list = isectattrService.getSect(query); return new ResponseEntity<>(TableDataInfo.build(list), HttpStatus.OK); } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/controller/storage/StorattrController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/controller/storage/StorattrController.java index c9a0bb2b..1141217f 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/controller/storage/StorattrController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/controller/storage/StorattrController.java @@ -2,6 +2,7 @@ package org.nl.wms.masterdata_manage.storage.controller.storage; +import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import io.swagger.annotations.Api; @@ -40,8 +41,14 @@ public class StorattrController { @PostMapping("/queryStor") @Log("查询仓库") @ApiOperation("查询仓库") - public ResponseEntity queryStor() { - List list = stIvtBsrealstorattrService.list(new QueryWrapper().eq("is_used", true)); + public ResponseEntity queryStor(@RequestBody JSONObject jo) { + String stor_type = jo.getString("stor_type"); + QueryWrapper queryWrapper = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(stor_type)){ + queryWrapper.eq("stor_type",stor_type); + } + queryWrapper.eq("is_used", true); + List list = stIvtBsrealstorattrService.list(queryWrapper); return new ResponseEntity<>(TableDataInfo.build(list), HttpStatus.OK); } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/controller/storage/StructattrController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/controller/storage/StructattrController.java index 4325fb74..099698c3 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/controller/storage/StructattrController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/controller/storage/StructattrController.java @@ -22,9 +22,9 @@ import org.springframework.web.bind.annotation.*; import java.util.Arrays; /** -* @author zhouz -* @date 2021-12-09 -**/ + * @author zhouz + * @date 2021-12-09 + **/ @RestController @RequiredArgsConstructor @Api(tags = "仓位管理") @@ -38,16 +38,16 @@ public class StructattrController { @Log("查询仓位") @ApiOperation("查询仓位") //@PreAuthorize("@el.check('structattr:list')") - public ResponseEntity queryAll(StructarrQuery query, PageQuery page){ + public ResponseEntity queryAll(StructarrQuery query, PageQuery page) { Page list = ivtStructattrService.page(page.build(StIvtStructattr.class), query.build()); - return new ResponseEntity<>(TableDataInfo.build(list),HttpStatus.OK); + return new ResponseEntity<>(TableDataInfo.build(list), HttpStatus.OK); } @PostMapping @Log("新增仓位") @ApiOperation("新增仓位") //@PreAuthorize("@el.check('structattr:add')") - public ResponseEntity create(@Validated @RequestBody JSONObject form){ + public ResponseEntity create(@Validated @RequestBody JSONObject form) { ivtStructattrService.create(form); return new ResponseEntity<>(HttpStatus.CREATED); } @@ -56,7 +56,7 @@ public class StructattrController { @Log("修改仓位") @ApiOperation("修改仓位") //@PreAuthorize("@el.check('structattr:edit')") - public ResponseEntity updateForm(@Validated @RequestBody JSONObject form){ + public ResponseEntity updateForm(@Validated @RequestBody JSONObject form) { ivtStructattrService.updateForm(form); return new ResponseEntity<>(HttpStatus.NO_CONTENT); } @@ -66,7 +66,7 @@ public class StructattrController { //@PreAuthorize("@el.check('structattr:del')") @DeleteMapping public ResponseEntity delete(@RequestBody Long[] ids) { - if (ids != null && ids.length>0){ + if (ids != null && ids.length > 0) { ivtStructattrService.removeByIds(Arrays.asList(ids)); } return new ResponseEntity<>(HttpStatus.OK); @@ -79,4 +79,11 @@ public class StructattrController { ivtStructattrService.changeActive(json); return new ResponseEntity<>(HttpStatus.NO_CONTENT); } + + @PostMapping("/getSectCascader") + @Log("查询联级仓位") + @ApiOperation("查询联级仓位") + public ResponseEntity getSectCascader(@RequestBody JSONObject json) { + return new ResponseEntity<>(ivtStructattrService.getSectCascader(json),HttpStatus.OK); + } } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/service/storage/IStIvtStructattrService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/service/storage/IStIvtStructattrService.java index 26a7c8bd..69d619bc 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/service/storage/IStIvtStructattrService.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/service/storage/IStIvtStructattrService.java @@ -34,4 +34,10 @@ public interface IStIvtStructattrService extends IService { * @param json */ void changeActive(JSONObject json); + + /** + * 查询库区下的仓位 + * @param jo + */ + JSONObject getSectCascader(JSONObject jo); } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/service/storage/dao/mapper/xml/StIvtSectattrMapper.xml b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/service/storage/dao/mapper/xml/StIvtSectattrMapper.xml index 14ffda24..af608cfb 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/service/storage/dao/mapper/xml/StIvtSectattrMapper.xml +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/service/storage/dao/mapper/xml/StIvtSectattrMapper.xml @@ -4,43 +4,43 @@ diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/service/storage/impl/StIvtStructattrServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/service/storage/impl/StIvtStructattrServiceImpl.java index 14454977..ef0b99f1 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/service/storage/impl/StIvtStructattrServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/service/storage/impl/StIvtStructattrServiceImpl.java @@ -1,5 +1,7 @@ package org.nl.wms.masterdata_manage.storage.service.storage.impl; +import cn.hutool.core.util.StrUtil; +import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; @@ -11,7 +13,6 @@ import org.nl.modules.common.exception.BadRequestException; import org.nl.wms.masterdata_manage.storage.service.storage.IStIvtBsrealstorattrService; import org.nl.wms.masterdata_manage.storage.service.storage.IStIvtSectattrService; import org.nl.wms.masterdata_manage.storage.service.storage.IStIvtStructattrService; -import org.nl.wms.masterdata_manage.storage.service.storage.dao.StIvtBsrealstorattr; import org.nl.wms.masterdata_manage.storage.service.storage.dao.StIvtSectattr; import org.nl.wms.masterdata_manage.storage.service.storage.dao.StIvtStructattr; import org.nl.wms.masterdata_manage.storage.service.storage.dao.mapper.StIvtStructattrMapper; @@ -19,6 +20,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.Date; +import java.util.List; /** *

@@ -35,6 +37,8 @@ public class StIvtStructattrServiceImpl extends ServiceImpl list = sectattrService.list(new QueryWrapper().eq("is_used", true) + .eq("stor_id", stor_id)); + list.forEach(sect -> { + JSONObject sect_cas = new JSONObject(); + sect_cas.put("value", sect.getSect_id()); + sect_cas.put("label", sect.getSect_name()); + List struct_list = structattrService.list(new QueryWrapper().eq("is_used", true) + .eq("sect_id", sect.getSect_id())); + if (struct_list.size() > 0) { + JSONArray struct_ja = new JSONArray(); + struct_list.forEach(struct -> { + JSONObject struct_cas = new JSONObject(); + struct_cas.put("value", struct.getStruct_id()); + struct_cas.put("label", struct.getStruct_name()); + struct_ja.add(struct_cas); + }); + sect_cas.put("children", struct_ja); + } + cascader_ja.add(sect_cas); + }); + JSONObject result = new JSONObject(); + result.put("content", cascader_ja); + return result; + } + @Override public void changeActive(JSONObject form) { Assert.notNull(form,"请求参数不能为空"); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs_manage/PCSEnum.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs_manage/PCSEnum.java new file mode 100644 index 00000000..4420db19 --- /dev/null +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs_manage/PCSEnum.java @@ -0,0 +1,40 @@ +package org.nl.wms.pcs_manage; + +import lombok.AllArgsConstructor; +import lombok.Getter; +import org.apache.commons.lang3.StringUtils; +import org.nl.common.utils.MapOf; +import org.nl.modules.common.exception.BadRequestException; + +import java.util.Map; + +/* + * @author ZZQ + * @Date 2023/5/4 20:11 + */ +@AllArgsConstructor +@Getter +public enum PCSEnum { + //单据状态 + BILL_STATUS(MapOf.of("生成", "10", "提交", "20", "确认采购", "30", "到货中", "40", "完成", "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/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs_manage/controller/purchase/PcsIfPurchaseorderController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs_manage/controller/purchase/PcsIfPurchaseorderController.java new file mode 100644 index 00000000..ea7c19f0 --- /dev/null +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs_manage/controller/purchase/PcsIfPurchaseorderController.java @@ -0,0 +1,44 @@ +package org.nl.wms.pcs_manage.controller.purchase; + + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import io.swagger.annotations.ApiOperation; +import org.nl.common.TableDataInfo; +import org.nl.common.anno.Log; +import org.nl.common.domain.query.PageQuery; +import org.nl.wms.masterdata_manage.storage.service.storage.dao.StIvtStructattr; +import org.nl.wms.pcs_manage.service.purchase.IPcsIfPurchaseorderService; +import org.nl.wms.pcs_manage.service.purchase.dao.PcsIfPurchaseorder; +import org.nl.wms.pcs_manage.service.purchase.dto.PurchaseOrderQuery; +import org.nl.wms.storage_manage.rawmanage.service.iostorInv.dto.YlIostorInvQuery; +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-05-15 + */ +@RestController +@RequestMapping("/api/pcsIfPurchaseorder") +public class PcsIfPurchaseorderController { + + @Autowired + private IPcsIfPurchaseorderService purchaseorderService; + + @GetMapping(value = "/forRawIn") + @Log("查询需入库的原料需求") + @ApiOperation("查询需入库的原料需求") + public ResponseEntity queryRawIn(PurchaseOrderQuery query, PageQuery page){ + return new ResponseEntity<>(purchaseorderService.queryRawIn(query,page),HttpStatus.OK); + } + +} + diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs_manage/service/purchase/IPcsIfPurchaseorderService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs_manage/service/purchase/IPcsIfPurchaseorderService.java new file mode 100644 index 00000000..e278d4e3 --- /dev/null +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs_manage/service/purchase/IPcsIfPurchaseorderService.java @@ -0,0 +1,35 @@ +package org.nl.wms.pcs_manage.service.purchase; + +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.extension.service.IService; +import org.nl.common.domain.query.PageQuery; +import org.nl.wms.pcs_manage.service.purchase.dao.PcsIfPurchaseorder; +import org.nl.wms.pcs_manage.service.purchase.dto.PurchaseOrderQuery; +import org.nl.wms.storage_manage.rawmanage.service.iostorInv.dto.YlIostorInvQuery; + +/** + *

+ * 原材料需求表 服务类 + *

+ * + * @author generator + * @since 2023-05-15 + */ +public interface IPcsIfPurchaseorderService extends IService { + + /** + * 分页查询 + * + * @param query,page / + * @return JSONObject + */ + Object queryRawIn(PurchaseOrderQuery query, PageQuery page); + + /** + * 修改原料需求表的入库数量并修改状态 + * + * @param jo / + */ + void updatePurchaseNum(JSONObject jo); + +} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs_manage/service/purchase/dao/PcsIfPurchaseorder.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs_manage/service/purchase/dao/PcsIfPurchaseorder.java new file mode 100644 index 00000000..56e68611 --- /dev/null +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs_manage/service/purchase/dao/PcsIfPurchaseorder.java @@ -0,0 +1,165 @@ +package org.nl.wms.pcs_manage.service.purchase.dao; + +import java.math.BigDecimal; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; + +import java.io.Serializable; + +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + *

+ * 原材料需求表 + *

+ * + * @author generator + * @since 2023-05-15 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@TableName("pcs_if_purchaseorder") +public class PcsIfPurchaseorder implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * id + */ + @TableId(value = "id") + private String id; + + /** + * 车间标识 + */ + private String workshop_id; + + /** + * 物料标识 + */ + private String material_id; + + /** + * 数量 + */ + private BigDecimal qty; + + /** + * 安全库存数量 + */ + private BigDecimal safe_qty; + + /** + * 总数量 + */ + private BigDecimal total_qty; + + /** + * 数量计量单位标识 + */ + private String qty_unit_id; + + /** + * 数量计量单位名称 + */ + private String qty_unit_name; + + /** + * 要求到料日期 + */ + private String ask_time; + + /** + * 订单编号 + */ + private String po_code; + + /** + * 确认到料日期 + */ + private String agree_time; + + /** + * 供应商 + */ + private String apply_name; + + /** + * 入库数量 + */ + private BigDecimal instor_qty; + + /** + * 状态 + */ + private String STATUS; + + /** + * 创建人 + */ + private String create_id; + + /** + * 创建人姓名 + */ + private String create_name; + + /** + * 创建时间 + */ + private String create_time; + + /** + * 提交人 + */ + private String audit_optid; + + /** + * 提交时间 + */ + private String audit_time; + + /** + * 提交人姓名 + */ + private String audit_optname; + + /** + * 确认人 + */ + private String confirm_optid; + + /** + * 确认人姓名 + */ + private String confirm_optname; + + /** + * 确认时间 + */ + private String confirm_time; + + /** + * 备注 + */ + private String remark; + + /** + * 是否删除 + */ + private Boolean is_delete; + + /** + * 部门ID + */ + private String sysdeptid; + + /** + * 公司ID + */ + private String syscompanyid; + + +} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs_manage/service/purchase/dao/mapper/PcsIfPurchaseorderMapper.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs_manage/service/purchase/dao/mapper/PcsIfPurchaseorderMapper.java new file mode 100644 index 00000000..194be7ae --- /dev/null +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs_manage/service/purchase/dao/mapper/PcsIfPurchaseorderMapper.java @@ -0,0 +1,24 @@ +package org.nl.wms.pcs_manage.service.purchase.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.pcs_manage.service.purchase.dao.PcsIfPurchaseorder; +import org.nl.wms.pcs_manage.service.purchase.dto.PurchaseOrderQuery; + +import java.util.List; +import java.util.Map; + +/** + *

+ * 原材料需求表 Mapper 接口 + *

+ * + * @author generator + * @since 2023-05-15 + */ +public interface PcsIfPurchaseorderMapper extends BaseMapper { + + List getMstDetail(@Param("query") PurchaseOrderQuery query, @Param(value = "pageQuery") PageQuery pageQuery); +} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs_manage/service/purchase/dao/mapper/xml/PcsIfPurchaseorderMapper.xml b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs_manage/service/purchase/dao/mapper/xml/PcsIfPurchaseorderMapper.xml new file mode 100644 index 00000000..28ca5206 --- /dev/null +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs_manage/service/purchase/dao/mapper/xml/PcsIfPurchaseorderMapper.xml @@ -0,0 +1,37 @@ + + + + + + diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs_manage/service/purchase/dto/PurchaseOrderQuery.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs_manage/service/purchase/dto/PurchaseOrderQuery.java new file mode 100644 index 00000000..290f9ad7 --- /dev/null +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs_manage/service/purchase/dto/PurchaseOrderQuery.java @@ -0,0 +1,31 @@ +package org.nl.wms.pcs_manage.service.purchase.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.pcs_manage.service.purchase.dao.PcsIfPurchaseorder; + +/* + * @author ZZQ + * @Date 2023/5/4 19:49 + */ +@Data +public class PurchaseOrderQuery extends BaseQuery { + + + private String bill_code; + + private String material_search; + + 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()); + super.doP.put("material_search", QParam.builder().k(new String[]{"material_search"}).type(QueryTEnum.LK).build()); + } + + +} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs_manage/service/purchase/impl/PcsIfPurchaseorderServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs_manage/service/purchase/impl/PcsIfPurchaseorderServiceImpl.java new file mode 100644 index 00000000..d5d9c380 --- /dev/null +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs_manage/service/purchase/impl/PcsIfPurchaseorderServiceImpl.java @@ -0,0 +1,78 @@ +package org.nl.wms.pcs_manage.service.purchase.impl; + +import cn.hutool.core.date.DateUtil; +import cn.hutool.core.util.NumberUtil; +import cn.hutool.core.util.StrUtil; +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 org.nl.common.TableDataInfo; +import org.nl.common.domain.query.PageQuery; +import org.nl.common.utils.SecurityUtils; +import org.nl.modules.common.exception.BadRequestException; +import org.nl.wms.pcs_manage.PCSEnum; +import org.nl.wms.pcs_manage.service.purchase.IPcsIfPurchaseorderService; +import org.nl.wms.pcs_manage.service.purchase.dao.PcsIfPurchaseorder; +import org.nl.wms.pcs_manage.service.purchase.dao.mapper.PcsIfPurchaseorderMapper; +import org.nl.wms.pcs_manage.service.purchase.dto.PurchaseOrderQuery; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.math.BigDecimal; +import java.util.List; +import java.util.Map; + +/** + *

+ * 原材料需求表 服务实现类 + *

+ * + * @author generator + * @since 2023-05-15 + */ +@Service +public class PcsIfPurchaseorderServiceImpl extends ServiceImpl implements IPcsIfPurchaseorderService { + + + @Autowired + private PcsIfPurchaseorderMapper purchaseorderMapper; + + @Override + public Object queryRawIn(PurchaseOrderQuery query, PageQuery pageQuery) { + Page page = PageHelper.startPage(pageQuery.getPage() + 1, pageQuery.getSize()); + List mst_detail = purchaseorderMapper.getMstDetail(query, pageQuery); + TableDataInfo build = TableDataInfo.build(mst_detail); + build.setTotalElements(page.getTotal()); + return build; + } + + @Override + public void updatePurchaseNum(JSONObject jo) { + String po_code = jo.getString("po_code"); + double instor_qty = jo.getDoubleValue("instor_qty"); + if (StrUtil.isEmpty(po_code)) { + throw new BadRequestException("原料需求的订单编号不能为空！"); + } + if (instor_qty <= 0) { + throw new BadRequestException("入库数量必须大于0！"); + } + PcsIfPurchaseorder purchaseorder = this.getOne(new QueryWrapper().eq("po_code", po_code)); + + if (purchaseorder.getSTATUS().equals(PCSEnum.BILL_STATUS.code("确认"))) { + throw new BadRequestException("当前单据状态已经完成，无法进行入库数修改！"); + } + + BigDecimal new_instor_qty = NumberUtil.add(instor_qty, purchaseorder.getInstor_qty(), 3); + if (purchaseorder.getTotal_qty().compareTo(new_instor_qty) <= 0) { + purchaseorder.setSTATUS(PCSEnum.BILL_STATUS.code("完成")); + purchaseorder.setConfirm_optid(SecurityUtils.getCurrentUserId()); + purchaseorder.setConfirm_optname(SecurityUtils.getCurrentNickName()); + purchaseorder.setConfirm_time(DateUtil.now()); + } else { + purchaseorder.setSTATUS(PCSEnum.BILL_STATUS.code("到货中")); + } + this.updateById(purchaseorder); + } +} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/IOSEnum.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/IOSEnum.java index 7222a497..9df59192 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/IOSEnum.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/IOSEnum.java @@ -18,7 +18,8 @@ public enum IOSEnum { //出入库类型 IO_TYPE(MapOf.of("入库", "1", "出库", "2")), //单据类型 - BILL_TYPE(MapOf.of("生产入库", "1", "手工入库", "2")), + BILL_TYPE(MapOf.of("生产入库", "11", "手工入库", "12", "原料入库", "13" + , "领料出库", "21", "销售出库", "22", "手工出库", "23")), //单据状态 BILL_STATUS(MapOf.of("生成", "10", "分配中", "20", "分配完", "30", "完成", "99")), //单据状态 diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/controller/iostorInv/StIvtIostorinvYlController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/controller/iostorInv/StIvtIostorinvYlController.java index 62f055d9..b68f1d87 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/controller/iostorInv/StIvtIostorinvYlController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/controller/iostorInv/StIvtIostorinvYlController.java @@ -34,8 +34,8 @@ public class StIvtIostorinvYlController { private IStIvtIostorinvYlService iostorinvYlService; @GetMapping - @Log("查询入库单") - @ApiOperation("查询入库单") + @Log("查询原料入库单") + @ApiOperation("查询原料入库单") public ResponseEntity query(YlIostorInvQuery query, PageQuery page){ return new ResponseEntity<>(iostorinvYlService.pageQuery(query,page),HttpStatus.OK); } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/controller/iostorInv/StIvtIostorinvYlOutController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/controller/iostorInv/StIvtIostorinvYlOutController.java new file mode 100644 index 00000000..42139480 --- /dev/null +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/controller/iostorInv/StIvtIostorinvYlOutController.java @@ -0,0 +1,78 @@ +package org.nl.wms.storage_manage.rawmanage.controller.iostorInv; + + +import com.alibaba.fastjson.JSONObject; +import io.swagger.annotations.ApiOperation; +import org.nl.common.anno.Log; +import org.nl.common.domain.query.PageQuery; +import org.nl.wms.storage_manage.rawmanage.service.iostorInv.IStIvtIostorinvOutYlService; +import org.nl.wms.storage_manage.rawmanage.service.iostorInv.dto.YlIostorInvQuery; +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-05-10 + */ +@RestController +@RequestMapping("/api/out/stIvtIostorinvYl") +public class StIvtIostorinvYlOutController { + + @Autowired + private IStIvtIostorinvOutYlService iostorinvOutYlService; + + @GetMapping + @Log("查询原料出库单") + @ApiOperation("查询原料出库单") + public ResponseEntity query(YlIostorInvQuery query, PageQuery page){ + return new ResponseEntity<>(iostorinvOutYlService.pageQuery(query,page),HttpStatus.OK); + } + + @PostMapping + @Log("创建入库单") + @ApiOperation("创建入库单") + public ResponseEntity create(@RequestBody JSONObject whereJson) { + iostorinvOutYlService.create(whereJson); + return new ResponseEntity<>(HttpStatus.OK); + } + + @PostMapping("/update") + @Log("修改入库单") + @ApiOperation("修改入库单") + public ResponseEntity update(@RequestBody JSONObject whereJson) { + iostorinvOutYlService.updateBill(whereJson); + return new ResponseEntity<>(HttpStatus.NO_CONTENT); + } + + @PostMapping("/delete") + @Log("删除入库单") + @ApiOperation("删除入库单") + public ResponseEntity delete(@RequestBody Long[] ids){ + iostorinvOutYlService.delete(ids); + return new ResponseEntity<>(HttpStatus.OK); + } + + @PostMapping("/getIODtl") + @Log("查询入库分配明细") + @ApiOperation("查询入库分配明细") + public ResponseEntity getIODtl(@RequestBody JSONObject whereJson) { + return new ResponseEntity<>(iostorinvOutYlService.getInvDtl(whereJson), HttpStatus.OK); + } + + @PostMapping("/confirm") + @Log("强制确认") + @ApiOperation("强制确认") + public ResponseEntity confirm(@RequestBody JSONObject whereJson) { + iostorinvOutYlService.confirm(whereJson); + return new ResponseEntity<>(HttpStatus.OK); + } + + +} + diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/controller/structIvt/StIvtStructivtYlController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/controller/structIvt/StIvtStructivtYlController.java index 8b34c49f..5308d3ab 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/controller/structIvt/StIvtStructivtYlController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/controller/structIvt/StIvtStructivtYlController.java @@ -1,8 +1,16 @@ package org.nl.wms.storage_manage.rawmanage.controller.structIvt; +import io.swagger.annotations.ApiOperation; +import org.nl.common.anno.Log; +import org.nl.common.domain.query.PageQuery; +import org.nl.wms.storage_manage.rawmanage.service.structIvt.IStIvtStructivtYlService; +import org.nl.wms.storage_manage.rawmanage.service.structIvt.dto.StructIvtYLQuery; +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; /** @@ -14,8 +22,17 @@ import org.springframework.web.bind.annotation.RestController; * @since 2023-05-10 */ @RestController -@RequestMapping("/stIvtStructivtYl") +@RequestMapping("/api/stIvtStructivtYl") public class StIvtStructivtYlController { + @Autowired + private IStIvtStructivtYlService structivtYlService; + + @GetMapping("/getRawIvt") + @Log("查询可用的原料库存") + @ApiOperation("查询可用的原料库存") + public ResponseEntity getRawIvt(StructIvtYLQuery query, PageQuery page){ + return new ResponseEntity<>(structivtYlService.getRawIvt(query,page), HttpStatus.OK); + } } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/iostorInv/IStIvtIostorinvOutYlService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/iostorInv/IStIvtIostorinvOutYlService.java new file mode 100644 index 00000000..513db65d --- /dev/null +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/iostorInv/IStIvtIostorinvOutYlService.java @@ -0,0 +1,66 @@ +package org.nl.wms.storage_manage.rawmanage.service.iostorInv; + +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.rawmanage.service.iostorInv.dao.StIvtIostorinvYl; +import org.nl.wms.storage_manage.rawmanage.service.iostorInv.dto.YlIostorInvQuery; + +import java.util.List; +import java.util.Map; + +/** + *

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

+ * + * @author generator + * @since 2023-05-10 + */ +public interface IStIvtIostorinvOutYlService extends IService { + + /** + * 分页查询 + * @param query,page / + * @return JSONObject + */ + Object pageQuery(YlIostorInvQuery query, PageQuery page); + + /** + * 创建 + * + * @param form / + */ + void create(JSONObject form); + + /** + * 修改单据 + * @param form + * @return + */ + String updateBill(JSONObject form); + + /** + * 删除 + * @param ids + * { + * 主表id.. + * } + */ + void delete(Long[] ids); + + /** + * 获取分配明细 + * @param form + * @return + */ + List getInvDtl(JSONObject form); + + /** + * 强制确认 + * @param form + * @return + */ + void confirm(JSONObject form); + +} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/iostorInv/dao/StIvtIostorinvYl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/iostorInv/dao/StIvtIostorinvYl.java index ad5c1cc5..0fb387c5 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/iostorInv/dao/StIvtIostorinvYl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/iostorInv/dao/StIvtIostorinvYl.java @@ -1,17 +1,13 @@ package org.nl.wms.storage_manage.rawmanage.service.iostorInv.dao; -import java.math.BigDecimal; - import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import java.util.Date; -import java.io.Serializable; - -import com.fasterxml.jackson.annotation.JsonFormat; -import io.swagger.models.auth.In; import lombok.Data; import lombok.EqualsAndHashCode; +import java.io.Serializable; +import java.math.BigDecimal; + /** *

* 出入库单主表 @@ -121,8 +117,7 @@ public class StIvtIostorinvYl implements Serializable { /** * 创建时间 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date create_time; + private String create_time; /** * 修改人 @@ -137,8 +132,7 @@ public class StIvtIostorinvYl implements Serializable { /** * 修改时间 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date update_time; + private String update_time; /** * 分配人 @@ -153,8 +147,7 @@ public class StIvtIostorinvYl implements Serializable { /** * 分配时间 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date dis_time; + private String dis_time; /** * 确认人 @@ -169,7 +162,7 @@ public class StIvtIostorinvYl implements Serializable { /** * 确认时间 */ - private Date confirm_time; + private String confirm_time; /** * 部门ID @@ -204,7 +197,7 @@ public class StIvtIostorinvYl implements Serializable { /** * 回传时间 */ - private Date upload_time; + private String upload_time; /** * 车间标识 diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/iostorInv/dao/StIvtIostorinvdisYl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/iostorInv/dao/StIvtIostorinvdisYl.java index 5fb0be2b..3cb567c0 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/iostorInv/dao/StIvtIostorinvdisYl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/iostorInv/dao/StIvtIostorinvdisYl.java @@ -2,6 +2,7 @@ package org.nl.wms.storage_manage.rawmanage.service.iostorInv.dao; import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import java.io.Serializable; @@ -27,6 +28,7 @@ public class StIvtIostorinvdisYl implements Serializable { /** * 出入单分配标识 */ + @TableId(value = "iostorinvdis_id") private String iostorinvdis_id; /** diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/iostorInv/dao/StIvtIostorinvdtlYl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/iostorInv/dao/StIvtIostorinvdtlYl.java index 13248864..7c3293b8 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/iostorInv/dao/StIvtIostorinvdtlYl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/iostorInv/dao/StIvtIostorinvdtlYl.java @@ -1,6 +1,8 @@ package org.nl.wms.storage_manage.rawmanage.service.iostorInv.dao; import java.math.BigDecimal; + +import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import java.io.Serializable; import lombok.Data; @@ -24,6 +26,7 @@ public class StIvtIostorinvdtlYl implements Serializable { /** * 出入单明细标识 */ + @TableId(value = "iostorinvdtl_id") private String iostorinvdtl_id; /** diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/iostorInv/dao/mapper/StIvtIostorinvOutYlMapper.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/iostorInv/dao/mapper/StIvtIostorinvOutYlMapper.java new file mode 100644 index 00000000..5cf7a176 --- /dev/null +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/iostorInv/dao/mapper/StIvtIostorinvOutYlMapper.java @@ -0,0 +1,23 @@ +package org.nl.wms.storage_manage.rawmanage.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.rawmanage.service.iostorInv.dao.StIvtIostorinvYl; +import org.nl.wms.storage_manage.rawmanage.service.iostorInv.dto.YlIostorInvQuery; + +import java.util.List; +import java.util.Map; + +/** + *

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

+ * + * @author generator + * @since 2023-05-10 + */ +public interface StIvtIostorinvOutYlMapper extends BaseMapper { + + List getMstDetail(@Param("query") YlIostorInvQuery query, @Param("pageQuery") PageQuery pageQuery); +} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/iostorInv/dao/mapper/xml/StIvtIostorinvOutYlMapper.xml b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/iostorInv/dao/mapper/xml/StIvtIostorinvOutYlMapper.xml new file mode 100644 index 00000000..54d19ba5 --- /dev/null +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/iostorInv/dao/mapper/xml/StIvtIostorinvOutYlMapper.xml @@ -0,0 +1,63 @@ + + + + + + diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/iostorInv/impl/StIvtIostorinvOutYlServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/iostorInv/impl/StIvtIostorinvOutYlServiceImpl.java new file mode 100644 index 00000000..cb970e2a --- /dev/null +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/iostorInv/impl/StIvtIostorinvOutYlServiceImpl.java @@ -0,0 +1,240 @@ +package org.nl.wms.storage_manage.rawmanage.service.iostorInv.impl; + +import cn.hutool.core.date.DateUtil; +import cn.hutool.core.util.ObjectUtil; +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 io.jsonwebtoken.lang.Assert; +import org.jetbrains.annotations.NotNull; +import org.nl.common.TableDataInfo; +import org.nl.common.domain.query.PageQuery; +import org.nl.common.utils.IdUtil; +import org.nl.common.utils.SecurityUtils; +import org.nl.modules.common.exception.BadRequestException; +import org.nl.modules.system.util.CodeUtil; +import org.nl.wms.masterdata_manage.storage.service.storage.IStIvtBsrealstorattrService; +import org.nl.wms.masterdata_manage.storage.service.storage.dao.StIvtBsrealstorattr; +import org.nl.wms.pcs_manage.service.purchase.IPcsIfPurchaseorderService; +import org.nl.wms.storage_manage.CHANGE_BILL_TYPE_ENUM; +import org.nl.wms.storage_manage.IOSEnum; +import org.nl.wms.storage_manage.basedata.service.record.dto.StIvtStructivtflowDto; +import org.nl.wms.storage_manage.basedata.service.record.service.IStIvtStructivtflowService; +import org.nl.wms.storage_manage.rawmanage.service.iostorInv.IStIvtIostorinvOutYlService; +import org.nl.wms.storage_manage.rawmanage.service.iostorInv.IStIvtIostorinvYlService; +import org.nl.wms.storage_manage.rawmanage.service.iostorInv.IStIvtIostorinvdisYlService; +import org.nl.wms.storage_manage.rawmanage.service.iostorInv.IStIvtIostorinvdtlYlService; +import org.nl.wms.storage_manage.rawmanage.service.iostorInv.dao.StIvtIostorinvYl; +import org.nl.wms.storage_manage.rawmanage.service.iostorInv.dao.StIvtIostorinvdisYl; +import org.nl.wms.storage_manage.rawmanage.service.iostorInv.dao.StIvtIostorinvdtlYl; +import org.nl.wms.storage_manage.rawmanage.service.iostorInv.dao.mapper.StIvtIostorinvYlMapper; +import org.nl.wms.storage_manage.rawmanage.service.iostorInv.dto.YlIostorInvQuery; +import org.nl.wms.storage_manage.rawmanage.service.structIvt.IStIvtStructivtYlService; +import org.nl.wms.storage_manage.rawmanage.service.structIvt.dao.StIvtStructivtYl; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import javax.transaction.Transactional; +import java.util.List; +import java.util.Map; + +/** + *

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

+ * + * @author generator + * @since 2023-05-10 + */ +@Service +public class StIvtIostorinvOutYlServiceImpl extends ServiceImpl implements IStIvtIostorinvOutYlService { + + @Autowired + private IStIvtBsrealstorattrService stIvtBsrealstorattrService; + + @Autowired + private IStIvtIostorinvdtlYlService iostorinvdtlYlService; + + @Autowired + private StIvtIostorinvYlMapper iostorinvYlMapper; + + @Autowired + private IStIvtIostorinvdisYlService iostorinvdisYlService; + + @Autowired + private IStIvtStructivtflowService structivtflowService; + + @Autowired + private IStIvtStructivtYlService structivtYlService; + + @Autowired + private IPcsIfPurchaseorderService purchaseorderService; + + + @Override + public Object pageQuery(YlIostorInvQuery query, PageQuery pageQuery) { + Page page = PageHelper.startPage(pageQuery.getPage() + 1, pageQuery.getSize()); + List mst_detail = iostorinvYlMapper.getMstDetail(query, pageQuery); + TableDataInfo build = TableDataInfo.build(mst_detail); + build.setTotalElements(page.getTotal()); + return build; + } + + @Override + public void create(JSONObject form) { + JSONArray rows = form.getJSONArray("tableData"); + if (ObjectUtil.isEmpty(rows)) throw new BadRequestException("请求参数不能为空"); + + // 调用主表 插入/更新方法 + StIvtIostorinvYl stIvtIostorinvYl = packageMstForm(new StIvtIostorinvYl(), form, false); + // 插入主表 + this.save(stIvtIostorinvYl); + + // 调用明细表 插入/更新方法 + iostorinvdtlYlService.create(rows, stIvtIostorinvYl.getIostorinv_id()); + } + + @Override + public String updateBill(JSONObject form) { + Assert.notNull(new Object[]{form, form.get("iostorinv_id")}, "请求参数不能为空"); + StIvtIostorinvYl mst = form.toJavaObject(StIvtIostorinvYl.class); + mst.setUpdate_id(SecurityUtils.getCurrentUserId()); + mst.setUpdate_name(SecurityUtils.getCurrentNickName()); + mst.setUpdate_time(DateUtil.now()); + this.updateById(mst); + + JSONArray rows = form.getJSONArray("tableData"); + if (ObjectUtil.isEmpty(rows)) throw new BadRequestException("请求参数不能为空"); + // 调用明细表 插入/更新方法 + iostorinvdtlYlService.create(rows, form.getString("iostorinv_id")); + return mst.getIostorinv_id(); + } + + @Override + public void delete(Long[] ids) { + + for (Long id : ids) { + StIvtIostorinvYl dao = this.getOne(new QueryWrapper().eq("iostorinv_id", id)); + dao.setIs_delete(true); + + this.updateById(dao); + } + } + + @Override + public List getInvDtl(JSONObject form) { + return iostorinvdtlYlService.getDtlList(form); + } + + @Override + @Transactional(rollbackOn = Exception.class) + public void confirm(JSONObject form) { + Assert.notNull(new Object[]{form, form.get("iostorinv_id")}, "请求参数不能为空"); + + String iostorinv_id = form.getString("iostorinv_id"); + + StIvtIostorinvYl mst = this.getById(iostorinv_id); + + List dis_list = iostorinvdisYlService.list(new QueryWrapper().eq("iostorinv_id", iostorinv_id)); + List dtl_list = iostorinvdtlYlService.list(new QueryWrapper().eq("iostorinv_id", iostorinv_id)); + + if (ObjectUtil.isEmpty(dis_list)) { + throw new BadRequestException("该入库单不存在分配明细！"); + } + + if (mst == null || mst.getIs_delete() == true) { + throw new BadRequestException("单据不存在"); + } + + //修改分配状态 + dis_list.forEach(dis -> { + dis.setReal_qty(dis.getPlan_qty()); + dis.setWork_status(IOSEnum.WORK_STATUS.code("完成")); + iostorinvdisYlService.updateById(dis); + + //修改库存和插入库存变动记录表 + structivtflowService.recordStructivtFlow( + StIvtStructivtflowDto.builder() + .bill_code(mst.getBill_code()).change_type_scode(CHANGE_BILL_TYPE_ENUM.IOSTORINV_IN_CONFIRM).bill_table("st_ivt_iostorinv_bcp") + .material_id(dis.getMaterial_id()).pcsn(dis.getPcsn()) + .struct_code(dis.getStruct_code()).result_qty(structivtYlService.getOne(new QueryWrapper().eq("struct_code", dis.getStruct_code())).getCanuse_qty()).change_qty(dis.getReal_qty()) + .task_id(dis.getTask_id()) + .storagevehicle_code(dis.getStoragevehicle_code()) + .build() + ); + }); + + //修改明细状态 + dtl_list.forEach(dtl -> { + dtl.setReal_qty(dtl.getPlan_qty()); + dtl.setBill_status(IOSEnum.BILL_STATUS.code("完成")); + iostorinvdtlYlService.updateById(dtl); + + //如果单据类型为原料入库 + if (mst.getBill_type().equals(IOSEnum.BILL_TYPE.code("原料入库"))) { + JSONObject pur_jo = new JSONObject(); + pur_jo.put("po_code", dtl.getSource_bill_code()); + pur_jo.put("instor_qty", dtl.getReal_qty()); + purchaseorderService.updatePurchaseNum(pur_jo); + } + }); + + //修改主表 + mst.setConfirm_id(SecurityUtils.getCurrentUserId()); + mst.setConfirm_name(SecurityUtils.getCurrentNickName()); + mst.setConfirm_time(DateUtil.now()); + mst.setBill_status(IOSEnum.BILL_STATUS.code("完成")); + this.updateById(mst); + + } + + @NotNull + private StIvtIostorinvYl packageMstForm(StIvtIostorinvYl stIvtIostorinvYl, JSONObject whereJson, Boolean isUpdate) { + JSONArray rows = whereJson.getJSONArray("tableData"); + if (!isUpdate) { + // 新增 + stIvtIostorinvYl.setIostorinv_id(IdUtil.getStringId()); + stIvtIostorinvYl.setBill_code(CodeUtil.getNewCode("IO_CODE")); + stIvtIostorinvYl.setIo_type(IOSEnum.IO_TYPE.code("入库")); + stIvtIostorinvYl.setBuss_type(whereJson.getString("bill_type")); + stIvtIostorinvYl.setBill_type(stIvtIostorinvYl.getBuss_type()); + stIvtIostorinvYl.setBill_status(IOSEnum.BILL_STATUS.code("生成")); + stIvtIostorinvYl.setCreate_id(SecurityUtils.getCurrentUserId()); + stIvtIostorinvYl.setCreate_name(SecurityUtils.getCurrentNickName()); + stIvtIostorinvYl.setCreate_time(DateUtil.now()); + stIvtIostorinvYl.setIs_delete(false); + stIvtIostorinvYl.setUpdate_id(SecurityUtils.getCurrentUserId()); + stIvtIostorinvYl.setUpdate_name(SecurityUtils.getCurrentNickName()); + stIvtIostorinvYl.setUpdate_time(DateUtil.now()); + // TODO 暂时写死 + stIvtIostorinvYl.setSysdeptid("111"); + stIvtIostorinvYl.setSyscompanyid("111"); + + } else { + // 修改 + stIvtIostorinvYl.setUpdate_id(SecurityUtils.getCurrentUserId()); + stIvtIostorinvYl.setUpdate_name(SecurityUtils.getCurrentNickName()); + stIvtIostorinvYl.setUpdate_time(DateUtil.now()); + } + + stIvtIostorinvYl.setBiz_date(whereJson.getString("biz_date").substring(0, 10)); + // 获取仓库信息 + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq("stor_id", whereJson.getString("stor_id")); + wrapper.eq("is_used", true); + StIvtBsrealstorattr bsrealDao = stIvtBsrealstorattrService.getOne(wrapper); + if (ObjectUtil.isEmpty(bsrealDao)) throw new BadRequestException("仓库不存在或未启用！"); + + stIvtIostorinvYl.setStor_id(bsrealDao.getStor_id()); + stIvtIostorinvYl.setStor_code(bsrealDao.getStor_code()); + stIvtIostorinvYl.setStor_name(bsrealDao.getStor_name()); + stIvtIostorinvYl.setTotal_qty(whereJson.getBigDecimal("total_qty")); + stIvtIostorinvYl.setDetail_count(rows.size()); + stIvtIostorinvYl.setRemark(whereJson.getString("remark")); + + return stIvtIostorinvYl; + } +} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/iostorInv/impl/StIvtIostorinvYlServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/iostorInv/impl/StIvtIostorinvYlServiceImpl.java index 3e45bfae..43025748 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/iostorInv/impl/StIvtIostorinvYlServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/iostorInv/impl/StIvtIostorinvYlServiceImpl.java @@ -1,5 +1,6 @@ package org.nl.wms.storage_manage.rawmanage.service.iostorInv.impl; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; @@ -17,17 +18,27 @@ import org.nl.modules.common.exception.BadRequestException; import org.nl.modules.system.util.CodeUtil; import org.nl.wms.masterdata_manage.storage.service.storage.IStIvtBsrealstorattrService; import org.nl.wms.masterdata_manage.storage.service.storage.dao.StIvtBsrealstorattr; +import org.nl.wms.pcs_manage.service.purchase.IPcsIfPurchaseorderService; +import org.nl.wms.storage_manage.CHANGE_BILL_TYPE_ENUM; import org.nl.wms.storage_manage.IOSEnum; +import org.nl.wms.storage_manage.basedata.service.record.dto.StIvtStructivtflowDto; +import org.nl.wms.storage_manage.basedata.service.record.service.IStIvtStructivtflowService; import org.nl.wms.storage_manage.rawmanage.service.iostorInv.IStIvtIostorinvYlService; +import org.nl.wms.storage_manage.rawmanage.service.iostorInv.IStIvtIostorinvdisYlService; import org.nl.wms.storage_manage.rawmanage.service.iostorInv.IStIvtIostorinvdtlYlService; import org.nl.wms.storage_manage.rawmanage.service.iostorInv.dao.StIvtIostorinvYl; +import org.nl.wms.storage_manage.rawmanage.service.iostorInv.dao.StIvtIostorinvdisYl; +import org.nl.wms.storage_manage.rawmanage.service.iostorInv.dao.StIvtIostorinvdtlYl; import org.nl.wms.storage_manage.rawmanage.service.iostorInv.dao.mapper.StIvtIostorinvYlMapper; import org.nl.wms.storage_manage.rawmanage.service.iostorInv.dto.YlIostorInvQuery; +import org.nl.wms.storage_manage.rawmanage.service.structIvt.IStIvtStructivtYlService; +import org.nl.wms.storage_manage.rawmanage.service.structIvt.dao.StIvtStructivtYl; +import org.nl.wms.storage_manage.semimanage.service.structIvt.dao.StIvtStructivtBcp; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.Date; +import javax.transaction.Transactional; import java.util.List; import java.util.Map; @@ -51,6 +62,18 @@ public class StIvtIostorinvYlServiceImpl extends ServiceImpl dis_list = iostorinvdisYlService.list(new QueryWrapper().eq("iostorinv_id", iostorinv_id)); + List dtl_list = iostorinvdtlYlService.list(new QueryWrapper().eq("iostorinv_id", iostorinv_id)); + + if (ObjectUtil.isEmpty(dis_list)) { + throw new BadRequestException("该入库单不存在分配明细！"); + } + + if (mst == null || mst.getIs_delete() == true) { + throw new BadRequestException("单据不存在"); + } + + //修改分配状态 + dis_list.forEach(dis -> { + dis.setReal_qty(dis.getPlan_qty()); + dis.setWork_status(IOSEnum.WORK_STATUS.code("完成")); + iostorinvdisYlService.updateById(dis); + + //修改库存和插入库存变动记录表 + structivtflowService.recordStructivtFlow( + StIvtStructivtflowDto.builder() + .bill_code(mst.getBill_code()).change_type_scode(CHANGE_BILL_TYPE_ENUM.IOSTORINV_IN_CONFIRM).bill_table("st_ivt_iostorinv_bcp") + .material_id(dis.getMaterial_id()).pcsn(dis.getPcsn()) + .struct_code(dis.getStruct_code()).result_qty(structivtYlService.getOne(new QueryWrapper().eq("struct_code", dis.getStruct_code())).getCanuse_qty()).change_qty(dis.getReal_qty()) + .task_id(dis.getTask_id()) + .storagevehicle_code(dis.getStoragevehicle_code()) + .build() + ); + }); + + //修改明细状态 + dtl_list.forEach(dtl -> { + dtl.setReal_qty(dtl.getPlan_qty()); + dtl.setBill_status(IOSEnum.BILL_STATUS.code("完成")); + iostorinvdtlYlService.updateById(dtl); + + //如果单据类型为原料入库 + if (mst.getBill_type().equals(IOSEnum.BILL_TYPE.code("原料入库"))) { + JSONObject pur_jo = new JSONObject(); + pur_jo.put("po_code", dtl.getSource_bill_code()); + pur_jo.put("instor_qty", dtl.getReal_qty()); + purchaseorderService.updatePurchaseNum(pur_jo); + } + }); + + //修改主表 + mst.setConfirm_id(SecurityUtils.getCurrentUserId()); + mst.setConfirm_name(SecurityUtils.getCurrentNickName()); + mst.setConfirm_time(DateUtil.now()); + mst.setBill_status(IOSEnum.BILL_STATUS.code("完成")); + this.updateById(mst); } @@ -125,20 +205,20 @@ public class StIvtIostorinvYlServiceImpl extends ServiceImpl sect_wrapper = new QueryWrapper<>(); - sect_wrapper.eq("sect_id", row.getSect_id()); - sect_wrapper.eq("is_used", true); - StIvtSectattr sectDao = sectattrService.getOne(sect_wrapper); - if (ObjectUtil.isEmpty(sectDao)) throw new BadRequestException("库区不存在或未启用！"); - - row.setSect_code(sectDao.getSect_code()); - row.setSect_name(sectDao.getSect_name()); - // 获取仓位信息 - QueryWrapper struct_wrapper = new QueryWrapper<>(); - struct_wrapper.eq("struct_id", row.getStruct_id()); - struct_wrapper.eq("is_used", true); - StIvtStructattr structDao = structattrService.getOne(struct_wrapper); - if (ObjectUtil.isEmpty(structDao)) throw new BadRequestException("仓位不存在或未启用！"); - - row.setStruct_code(structDao.getStruct_code()); - row.setStruct_name(structDao.getStruct_name()); row.setPcsn(DateUtil.today()); this.save(row); } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/structIvt/IStIvtStructivtYlService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/structIvt/IStIvtStructivtYlService.java index 560cfe07..89cffbb9 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/structIvt/IStIvtStructivtYlService.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/structIvt/IStIvtStructivtYlService.java @@ -1,7 +1,10 @@ package org.nl.wms.storage_manage.rawmanage.service.structIvt; +import org.nl.common.domain.query.PageQuery; +import org.nl.wms.pcs_manage.service.purchase.dto.PurchaseOrderQuery; import org.nl.wms.storage_manage.rawmanage.service.structIvt.dao.StIvtStructivtYl; import com.baomidou.mybatisplus.extension.service.IService; +import org.nl.wms.storage_manage.rawmanage.service.structIvt.dto.StructIvtYLQuery; /** *

@@ -13,4 +16,11 @@ import com.baomidou.mybatisplus.extension.service.IService; */ public interface IStIvtStructivtYlService extends IService { + /** + * 分页查询可用的原料库存 + * + * @param query,page / + * @return JSONObject + */ + Object getRawIvt(StructIvtYLQuery query, PageQuery page); } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/structIvt/dao/mapper/StIvtStructivtYlMapper.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/structIvt/dao/mapper/StIvtStructivtYlMapper.java index 5a9309b3..908770df 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/structIvt/dao/mapper/StIvtStructivtYlMapper.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/structIvt/dao/mapper/StIvtStructivtYlMapper.java @@ -1,7 +1,14 @@ package org.nl.wms.storage_manage.rawmanage.service.structIvt.dao.mapper; +import org.apache.ibatis.annotations.Param; +import org.nl.common.domain.query.PageQuery; +import org.nl.wms.pcs_manage.service.purchase.dto.PurchaseOrderQuery; import org.nl.wms.storage_manage.rawmanage.service.structIvt.dao.StIvtStructivtYl; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.nl.wms.storage_manage.rawmanage.service.structIvt.dto.StructIvtYLQuery; + +import java.util.List; +import java.util.Map; /** *

@@ -13,4 +20,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; */ public interface StIvtStructivtYlMapper extends BaseMapper { + List getRawIvt(@Param("query") StructIvtYLQuery query, @Param("pageQuery") PageQuery pageQuery); } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/structIvt/dao/mapper/xml/StIvtStructivtYlMapper.xml b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/structIvt/dao/mapper/xml/StIvtStructivtYlMapper.xml index 1f2ad518..19b90380 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/structIvt/dao/mapper/xml/StIvtStructivtYlMapper.xml +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/structIvt/dao/mapper/xml/StIvtStructivtYlMapper.xml @@ -2,4 +2,37 @@ + diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/structIvt/dto/StructIvtYLQuery.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/structIvt/dto/StructIvtYLQuery.java new file mode 100644 index 00000000..8786ca65 --- /dev/null +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/structIvt/dto/StructIvtYLQuery.java @@ -0,0 +1,32 @@ +package org.nl.wms.storage_manage.rawmanage.service.structIvt.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.rawmanage.service.structIvt.dao.StIvtStructivtYl; + +/* + * @author ZZQ + * @Date 2023/5/4 19:49 + */ +@Data +public class StructIvtYLQuery extends BaseQuery { + + + private String sect_id; + + private String struct_id; + + private String material_search; + + private Boolean is_delete = false; + + + @Override + public void paramMapping() { + super.doP.put("material_search", QParam.builder().k(new String[]{"material_search"}).type(QueryTEnum.LK).build()); + } + + +} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/structIvt/impl/StIvtStructivtYlServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/structIvt/impl/StIvtStructivtYlServiceImpl.java index a8026f25..65aaa8b0 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/structIvt/impl/StIvtStructivtYlServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/structIvt/impl/StIvtStructivtYlServiceImpl.java @@ -1,11 +1,21 @@ package org.nl.wms.storage_manage.rawmanage.service.structIvt.impl; +import com.github.pagehelper.Page; +import com.github.pagehelper.PageHelper; +import org.nl.common.TableDataInfo; +import org.nl.common.domain.query.PageQuery; +import org.nl.wms.pcs_manage.service.purchase.dto.PurchaseOrderQuery; import org.nl.wms.storage_manage.rawmanage.service.structIvt.dao.StIvtStructivtYl; import org.nl.wms.storage_manage.rawmanage.service.structIvt.dao.mapper.StIvtStructivtYlMapper; import org.nl.wms.storage_manage.rawmanage.service.structIvt.IStIvtStructivtYlService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.nl.wms.storage_manage.rawmanage.service.structIvt.dto.StructIvtYLQuery; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.List; +import java.util.Map; + /** *

* 仓位库存表 服务实现类 @@ -17,4 +27,14 @@ import org.springframework.stereotype.Service; @Service public class StIvtStructivtYlServiceImpl extends ServiceImpl implements IStIvtStructivtYlService { + @Autowired + private StIvtStructivtYlMapper structivtYlMapper; + @Override + public Object getRawIvt(StructIvtYLQuery query, PageQuery pageQuery) { + Page page = PageHelper.startPage(pageQuery.getPage() + 1, pageQuery.getSize()); + List mst_detail = structivtYlMapper.getRawIvt(query, pageQuery); + TableDataInfo build = TableDataInfo.build(mst_detail); + build.setTotalElements(page.getTotal()); + return build; + } } diff --git a/mes/qd/src/api/wms/basedata/st/sectattr.js b/mes/qd/src/api/wms/basedata/st/sectattr.js index 18b511af..5ffa83c6 100644 --- a/mes/qd/src/api/wms/basedata/st/sectattr.js +++ b/mes/qd/src/api/wms/basedata/st/sectattr.js @@ -24,11 +24,11 @@ export function edit(data) { }) } -export function getSect(params) { +export function getSect(data) { return request({ url: 'api/sectattr/getSect', method: 'get', - params + data }) } diff --git a/mes/qd/src/views/wms/masterdata_manage/st/struct/index.vue b/mes/qd/src/views/wms/masterdata_manage/st/struct/index.vue index 3329089f..f5771f1e 100644 --- a/mes/qd/src/views/wms/masterdata_manage/st/struct/index.vue +++ b/mes/qd/src/views/wms/masterdata_manage/st/struct/index.vue @@ -379,7 +379,7 @@ export default { } }, created() { - crudSectattr.getSect().then(res => { + crudSectattr.getSect({}).then(res => { this.sects = res.content }) /* checkoutbill.getInvTypes().then(res => { diff --git a/mes/qd/src/views/wms/storage_manage/rawproduct/rawProductIn/AddDialog.vue b/mes/qd/src/views/wms/storage_manage/rawproduct/rawProductIn/AddDialog.vue index 9876573a..43ec2139 100644 --- a/mes/qd/src/views/wms/storage_manage/rawproduct/rawProductIn/AddDialog.vue +++ b/mes/qd/src/views/wms/storage_manage/rawproduct/rawProductIn/AddDialog.vue @@ -139,6 +139,16 @@ + + 添加单据物料 + - + diff --git a/mes/qd/src/views/wms/storage_manage/rawproduct/rawProductOut/ViewDialog.vue b/mes/qd/src/views/wms/storage_manage/rawproduct/rawProductOut/ViewDialog.vue index 22e697da..ed872468 100644 --- a/mes/qd/src/views/wms/storage_manage/rawproduct/rawProductOut/ViewDialog.vue +++ b/mes/qd/src/views/wms/storage_manage/rawproduct/rawProductOut/ViewDialog.vue @@ -2,17 +2,18 @@