From 40ec3496ff8562b8aca5231caf6cd0836c6c62a3 Mon Sep 17 00:00:00 2001 From: "ZHOUZ\\Noble'lift" <1014987728@qq.com> Date: Fri, 26 May 2023 16:24:02 +0800 Subject: [PATCH] =?UTF-8?q?rev=EF=BC=9A=E6=96=B0=E5=A2=9E=E5=8E=9F?= =?UTF-8?q?=E6=9D=90=E6=96=99=E7=9B=98=E7=82=B9=E3=80=81=E6=8D=9F=E6=BA=A2?= =?UTF-8?q?=EF=BC=9B=E8=80=81=E8=BD=A6=E9=97=B4=E5=8C=85=E8=A3=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dao/mapper/xml/StIvtSectattrMapper.xml | 3 + .../service/storage/dto/StructarrQuery.java | 1 + .../org/nl/wms/storage_manage/CHECKEnum.java | 45 +++ .../check/StIvtCheckmstYlController.java | 88 +++++- .../structIvt/StIvtStructivtYlController.java | 12 +- .../check/IStIvtCheckdtlYlService.java | 16 + .../check/IStIvtCheckmstYlService.java | 39 +++ .../service/check/dao/StIvtCheckdtlYl.java | 9 +- .../service/check/dao/StIvtCheckmstYl.java | 13 +- .../dao/mapper/StIvtCheckdtlYlMapper.java | 5 + .../dao/mapper/xml/StIvtCheckdtlYlMapper.xml | 33 ++ .../service/check/dto/CheckQuery.java | 34 ++ .../impl/StIvtCheckdtlYlServiceImpl.java | 74 +++++ .../impl/StIvtCheckmstYlServiceImpl.java | 292 +++++++++++++++++- .../impl/StIvtIostorinvOutYlServiceImpl.java | 58 +++- .../impl/StIvtIostorinvYlServiceImpl.java | 4 - .../impl/StIvtIostorinvdisYlServiceImpl.java | 21 ++ .../structIvt/IStIvtStructivtYlService.java | 5 + .../dao/mapper/StIvtStructivtYlMapper.java | 2 + .../dao/mapper/xml/StIvtStructivtYlMapper.xml | 38 ++- .../impl/StIvtStructivtYlServiceImpl.java | 5 + .../wms/old_manage/old_package/index.vue | 90 +++--- .../wms/product_manage/workorder/index.vue | 44 +++ .../rawproduct/rawProductIn/AddDialog.vue | 4 +- .../rawproduct/rawProductOut/index.vue | 2 +- .../rawproduct/rawProductOut/rawproductout.js | 54 ++-- .../rawproduct/rawproductCheck/AddDialog.vue | 97 +++--- .../rawproductCheck/CheckDialog.vue | 31 +- .../rawproductCheck/ProcessDialog.vue | 22 +- .../rawproductCheck/ReCheckDialog.vue | 4 +- .../rawproduct/rawproductCheck/StructIvt.vue | 156 ++++++++++ .../rawproduct/rawproductCheck/check.js | 41 ++- .../rawproduct/rawproductCheck/index.vue | 68 ++-- .../rawproductmoreOrless/AddDialog.vue | 202 +++++------- .../rawproductmoreOrless/StructDiv.vue | 48 ++- .../rawproduct/rawproductmoreOrless/index.vue | 13 +- .../rawproductmoreOrless/moreorless.js | 4 +- 37 files changed, 1299 insertions(+), 378 deletions(-) create mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/CHECKEnum.java create mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/check/dto/CheckQuery.java create mode 100644 mes/qd/src/views/wms/storage_manage/rawproduct/rawproductCheck/StructIvt.vue 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 af608cfb..782ac138 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 @@ -42,5 +42,8 @@ and st_ivt_sectattr.sect_type_attr = #{sect_type_attr} + + and stor.stor_type = #{stor_type} + diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/service/storage/dto/StructarrQuery.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/service/storage/dto/StructarrQuery.java index 26952b30..6cb26e27 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/service/storage/dto/StructarrQuery.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/service/storage/dto/StructarrQuery.java @@ -20,6 +20,7 @@ public class StructarrQuery extends BaseQuery { private String is_productstore; private String is_semi_finished; private String is_virtualstore; + private String sect_id; @Override public void paramMapping() { diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/CHECKEnum.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/CHECKEnum.java new file mode 100644 index 00000000..3f00c9ae --- /dev/null +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/CHECKEnum.java @@ -0,0 +1,45 @@ +package org.nl.wms.storage_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 CHECKEnum { + //单据类型 + BILL_TYPE(MapOf.of("计划盘点", "31", "临时盘点", "32")), + //单据状态 + BILL_STATUS(MapOf.of("生成", "10", "盘点中", "30", "完成", "99")), + //单据状态 + DTL_STATUS(MapOf.of("生成", "01", "盘点中", "04", "已盘点", "05", "异常处理中", "06", "异常处理完成" + , "07", "确认完成", "99")), + PROCESS_TYPE(MapOf.of("账务为准", "0", "实盘为准", "1")), + CREATE_MODE(MapOf.of("PC产生", "01", "终端产生", "02", "外部接口产生", "03", "内部调度产生", "04")); + 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/storage_manage/rawmanage/controller/check/StIvtCheckmstYlController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/controller/check/StIvtCheckmstYlController.java index 50dd34ef..601fec13 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/controller/check/StIvtCheckmstYlController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/controller/check/StIvtCheckmstYlController.java @@ -1,9 +1,16 @@ package org.nl.wms.storage_manage.rawmanage.controller.check; -import org.springframework.web.bind.annotation.RequestMapping; - -import org.springframework.web.bind.annotation.RestController; +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.check.IStIvtCheckmstYlService; +import org.nl.wms.storage_manage.rawmanage.service.check.dto.CheckQuery; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; /** *

@@ -14,8 +21,81 @@ import org.springframework.web.bind.annotation.RestController; * @since 2023-05-10 */ @RestController -@RequestMapping("/stIvtCheckmstYl") +@RequestMapping("/api/check") public class StIvtCheckmstYlController { + @Autowired + private IStIvtCheckmstYlService checkmstYlService; + + @GetMapping + @Log("查询原料入库单") + @ApiOperation("查询原料入库单") + public ResponseEntity query(CheckQuery query, PageQuery page) { + return new ResponseEntity<>(checkmstYlService.pageQuery(query, page), HttpStatus.OK); + } + + @PostMapping + @Log("创建盘点单") + @ApiOperation("创建盘点单") + public ResponseEntity create(@RequestBody JSONObject whereJson) { + checkmstYlService.create(whereJson); + return new ResponseEntity<>(HttpStatus.OK); + } + + @PostMapping("/getCheckDtl") + @Log("查询盘点明细") + @ApiOperation("查询盘点明细") + public ResponseEntity getCheckDtl(@RequestBody JSONObject whereJson) { + return new ResponseEntity<>(checkmstYlService.getCheckDtl(whereJson), HttpStatus.OK); + } + + @PostMapping("/update") + @Log("修改盘点单") + @ApiOperation("修改盘点单") + public ResponseEntity update(@RequestBody JSONObject whereJson) { + checkmstYlService.update(whereJson); + return new ResponseEntity<>(HttpStatus.OK); + } + + @PostMapping("/delete") + @Log("删除入库单") + @ApiOperation("删除入库单") + public ResponseEntity delete(@RequestBody Long[] ids){ + checkmstYlService.delete(ids); + return new ResponseEntity<>(HttpStatus.OK); + } + + @PostMapping("/saveCheck") + @Log("盘点保存") + @ApiOperation("盘点保存") + public ResponseEntity saveCheck(@RequestBody JSONObject whereJson) { + checkmstYlService.saveCheck(whereJson); + return new ResponseEntity<>(HttpStatus.NO_CONTENT); + } + + @PostMapping("/confirm") + @Log("移库单强制确认") + @ApiOperation("移库单强制确认") + public ResponseEntity confirm(@RequestBody JSONObject whereJson) { + checkmstYlService.confirm(whereJson); + return new ResponseEntity<>(HttpStatus.NO_CONTENT); + } + + @PostMapping("/process1") + @Log("实盘为准，生成损溢单修改库存") + @ApiOperation("实盘为准，生成损溢单修改库存") + public ResponseEntity process1(@RequestBody JSONObject whereJson) { + checkmstYlService.process1(whereJson); + return new ResponseEntity<>(HttpStatus.NO_CONTENT); + } + + @PostMapping("/process0") + @Log("账务为准") + @ApiOperation("账务为准") + public ResponseEntity process0(@RequestBody JSONObject whereJson) { + checkmstYlService.process0(whereJson); + return new ResponseEntity<>(HttpStatus.NO_CONTENT); + } + } 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 5308d3ab..0b03c860 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 @@ -10,6 +10,7 @@ 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.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -31,8 +32,15 @@ public class StIvtStructivtYlController { @GetMapping("/getRawIvt") @Log("查询可用的原料库存") @ApiOperation("查询可用的原料库存") - public ResponseEntity getRawIvt(StructIvtYLQuery query, PageQuery page){ - return new ResponseEntity<>(structivtYlService.getRawIvt(query,page), HttpStatus.OK); + public ResponseEntity getRawIvt(StructIvtYLQuery query, PageQuery page) { + return new ResponseEntity<>(structivtYlService.getRawIvt(query, page), HttpStatus.OK); + } + + @PostMapping("/getStructIvt") + @Log("查询库存") + @ApiOperation("查询库存") + public ResponseEntity getStructIvt(StructIvtYLQuery query) { + return new ResponseEntity<>(structivtYlService.getStructIvt(query), HttpStatus.OK); } } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/check/IStIvtCheckdtlYlService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/check/IStIvtCheckdtlYlService.java index 79b3aa71..d9024ebd 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/check/IStIvtCheckdtlYlService.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/check/IStIvtCheckdtlYlService.java @@ -1,7 +1,13 @@ package org.nl.wms.storage_manage.rawmanage.service.check; +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; import org.nl.wms.storage_manage.rawmanage.service.check.dao.StIvtCheckdtlYl; import com.baomidou.mybatisplus.extension.service.IService; +import org.nl.wms.storage_manage.rawmanage.service.check.dao.StIvtCheckmstYl; + +import java.util.List; +import java.util.Map; /** *

@@ -13,4 +19,14 @@ import com.baomidou.mybatisplus.extension.service.IService; */ public interface IStIvtCheckdtlYlService extends IService { + /** + * 主单据使用 + * @param row + * @param mst + * @return + */ + double create(JSONArray row, StIvtCheckmstYl mst); + + List getCheckDtl(JSONObject map); + } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/check/IStIvtCheckmstYlService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/check/IStIvtCheckmstYlService.java index e05414de..deed9d77 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/check/IStIvtCheckmstYlService.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/check/IStIvtCheckmstYlService.java @@ -1,7 +1,14 @@ package org.nl.wms.storage_manage.rawmanage.service.check; +import com.alibaba.fastjson.JSONObject; +import org.nl.common.domain.query.PageQuery; import org.nl.wms.storage_manage.rawmanage.service.check.dao.StIvtCheckmstYl; import com.baomidou.mybatisplus.extension.service.IService; +import org.nl.wms.storage_manage.rawmanage.service.check.dto.CheckQuery; +import org.nl.wms.storage_manage.rawmanage.service.iostorInv.dto.YlIostorInvQuery; + +import java.util.List; +import java.util.Map; /** *

@@ -13,4 +20,36 @@ import com.baomidou.mybatisplus.extension.service.IService; */ public interface IStIvtCheckmstYlService extends IService { + /** + * 分页查询 + * @param query,page / + * @return JSONObject + */ + Object pageQuery(CheckQuery query, PageQuery page); + + void create(JSONObject jo); + + List getCheckDtl(JSONObject map); + + void update(JSONObject map); + + /** + * 删除 + * @param ids + * { + * 主表id.. + * } + */ + void delete(Long[] ids); + + void saveCheck(JSONObject jo); + + void confirm(JSONObject jo); + + void process0(JSONObject jo); + + void process1(JSONObject jo); + + + } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/check/dao/StIvtCheckdtlYl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/check/dao/StIvtCheckdtlYl.java index 3fcc89a6..9c1270cc 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/check/dao/StIvtCheckdtlYl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/check/dao/StIvtCheckdtlYl.java @@ -1,6 +1,8 @@ package org.nl.wms.storage_manage.rawmanage.service.check.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; @@ -25,6 +27,7 @@ public class StIvtCheckdtlYl implements Serializable { /** * 盘点单明细id */ + @TableId(value = "checkdtl_id") private String checkdtl_id; /** @@ -115,7 +118,7 @@ public class StIvtCheckdtlYl implements Serializable { /** * 盘点结果 */ - private Boolean check_result; + private String check_result; /** * 盘点人 @@ -130,7 +133,7 @@ public class StIvtCheckdtlYl implements Serializable { /** * 盘点时间 */ - private Date check_time; + private String check_time; /** * 异常是否处理 @@ -150,7 +153,7 @@ public class StIvtCheckdtlYl implements Serializable { /** * 处理时间 */ - private Date process_time; + private String process_time; } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/check/dao/StIvtCheckmstYl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/check/dao/StIvtCheckmstYl.java index 48eccf21..f8b5aec6 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/check/dao/StIvtCheckmstYl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/check/dao/StIvtCheckmstYl.java @@ -1,6 +1,8 @@ package org.nl.wms.storage_manage.rawmanage.service.check.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; @@ -25,6 +27,7 @@ public class StIvtCheckmstYl implements Serializable { /** * 盘点单标识 */ + @TableId(value = "check_id") private String check_id; /** @@ -75,7 +78,7 @@ public class StIvtCheckmstYl implements Serializable { /** * 创建时间 */ - private Date create_time; + private String create_time; /** * 审核人 @@ -90,7 +93,7 @@ public class StIvtCheckmstYl implements Serializable { /** * 审核时间 */ - private Date audit_time; + private String audit_time; /** * 确认人 @@ -105,7 +108,7 @@ public class StIvtCheckmstYl implements Serializable { /** * 确认时间 */ - private Date confirm_time; + private String confirm_time; /** * 备注 @@ -145,7 +148,7 @@ public class StIvtCheckmstYl implements Serializable { /** * 回传时间 */ - private Date upload_time; + private String upload_time; /** * 部门ID @@ -160,7 +163,7 @@ public class StIvtCheckmstYl implements Serializable { /** * 车间标识 */ - private String product_area; + private String workshop_id; } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/check/dao/mapper/StIvtCheckdtlYlMapper.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/check/dao/mapper/StIvtCheckdtlYlMapper.java index 1af0c99e..d4d9077e 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/check/dao/mapper/StIvtCheckdtlYlMapper.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/check/dao/mapper/StIvtCheckdtlYlMapper.java @@ -1,8 +1,12 @@ package org.nl.wms.storage_manage.rawmanage.service.check.dao.mapper; +import org.apache.ibatis.annotations.Param; import org.nl.wms.storage_manage.rawmanage.service.check.dao.StIvtCheckdtlYl; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import java.util.List; +import java.util.Map; + /** *

* 盘点单明细表 Mapper 接口 @@ -13,4 +17,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; */ public interface StIvtCheckdtlYlMapper extends BaseMapper { + List getCheckDtl(@Param("map") Map map); } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/check/dao/mapper/xml/StIvtCheckdtlYlMapper.xml b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/check/dao/mapper/xml/StIvtCheckdtlYlMapper.xml index f94561d2..a5d4a3e9 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/check/dao/mapper/xml/StIvtCheckdtlYlMapper.xml +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/check/dao/mapper/xml/StIvtCheckdtlYlMapper.xml @@ -2,4 +2,37 @@ + diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/check/dto/CheckQuery.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/check/dto/CheckQuery.java new file mode 100644 index 00000000..6a8603c8 --- /dev/null +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/check/dto/CheckQuery.java @@ -0,0 +1,34 @@ +package org.nl.wms.storage_manage.rawmanage.service.check.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.check.dao.StIvtCheckmstYl; + +/* + * @author ZZQ + * @Date 2023/5/4 19:49 + */ +@Data +public class CheckQuery extends BaseQuery { + + + private String stor_id; + + private String status; + + private String check_type; + + private String check_code; + + private Boolean is_delete = false; + + + @Override + public void paramMapping() { + super.doP.put("check_code", QParam.builder().k(new String[]{"check_code"}).type(QueryTEnum.LK).build()); + } + + +} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/check/impl/StIvtCheckdtlYlServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/check/impl/StIvtCheckdtlYlServiceImpl.java index 36774480..17ea9827 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/check/impl/StIvtCheckdtlYlServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/check/impl/StIvtCheckdtlYlServiceImpl.java @@ -1,11 +1,33 @@ package org.nl.wms.storage_manage.rawmanage.service.check.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.core.conditions.update.UpdateWrapper; +import org.apache.commons.lang3.StringUtils; +import org.nl.common.utils.IdUtil; +import org.nl.modules.common.exception.BadRequestException; +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.StIvtSectattr; +import org.nl.wms.masterdata_manage.storage.service.storage.dao.StIvtStructattr; +import org.nl.wms.storage_manage.CHECKEnum; +import org.nl.wms.storage_manage.IOSEnum; import org.nl.wms.storage_manage.rawmanage.service.check.dao.StIvtCheckdtlYl; +import org.nl.wms.storage_manage.rawmanage.service.check.dao.StIvtCheckmstYl; import org.nl.wms.storage_manage.rawmanage.service.check.dao.mapper.StIvtCheckdtlYlMapper; import org.nl.wms.storage_manage.rawmanage.service.check.IStIvtCheckdtlYlService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.nl.wms.storage_manage.rawmanage.service.iostorInv.dao.StIvtIostorinvdtlYl; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.math.BigDecimal; +import java.util.List; +import java.util.Map; + /** *

* 盘点单明细表 服务实现类 @@ -17,4 +39,56 @@ import org.springframework.stereotype.Service; @Service public class StIvtCheckdtlYlServiceImpl extends ServiceImpl implements IStIvtCheckdtlYlService { + @Autowired + private IStIvtSectattrService sectattrService; + @Autowired + private IStIvtStructattrService structattrService; + + @Override + public double create(JSONArray rows, StIvtCheckmstYl mst) { + double total_qty = 0; + + if (rows.size() > 0 && ObjectUtil.isNotEmpty(mst)) { + // 先删除在插入 + this.remove(new QueryWrapper().eq("check_id", mst.getCheck_id())); + + for (int i = 0; i < rows.size(); i++) { + String checkdtl_id = IdUtil.getStringId(); + StIvtCheckdtlYl row = rows.getJSONObject(i).toJavaObject(StIvtCheckdtlYl.class); + row.setCheckdtl_id(checkdtl_id); + row.setCheck_id(mst.getCheck_id()); + row.setCheck_code(mst.getCheck_code()); + row.setSeq_no(BigDecimal.valueOf(i + 1)); + + // 获取库区信息 + QueryWrapper 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_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_name(structDao.getStruct_name()); + + row.setStoragevehicle_id("999999"); + row.setStoragevehicle_code("999999"); + row.setStatus(CHECKEnum.DTL_STATUS.code("生成")); + this.save(row); + + //锁定货位 + structattrService.update(new UpdateWrapper().set("lock_type", "1").set("inv_code",mst.getCheck_code()).eq("struct_id", row.getStruct_id())); + } + } + return total_qty; + } + + @Override + public List getCheckDtl(JSONObject map) { + return this.baseMapper.getCheckDtl(map); + } } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/check/impl/StIvtCheckmstYlServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/check/impl/StIvtCheckmstYlServiceImpl.java index aac32a1e..1a173941 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/check/impl/StIvtCheckmstYlServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/check/impl/StIvtCheckmstYlServiceImpl.java @@ -1,11 +1,44 @@ package org.nl.wms.storage_manage.rawmanage.service.check.impl; +import cn.hutool.core.date.DateUtil; +import cn.hutool.core.util.ObjectUtil; +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; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +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.IStIvtStructattrService; +import org.nl.wms.masterdata_manage.storage.service.storage.dao.StIvtBsrealstorattr; +import org.nl.wms.masterdata_manage.storage.service.storage.dao.StIvtStructattr; +import org.nl.wms.storage_manage.CHECKEnum; +import org.nl.wms.storage_manage.IOSEnum; +import org.nl.wms.storage_manage.productmanage.service.iostorInv.dao.StIvtIostorinvCp; +import org.nl.wms.storage_manage.rawmanage.service.check.IStIvtCheckdtlYlService; +import org.nl.wms.storage_manage.rawmanage.service.check.IStIvtCheckmstYlService; +import org.nl.wms.storage_manage.rawmanage.service.check.dao.StIvtCheckdtlYl; import org.nl.wms.storage_manage.rawmanage.service.check.dao.StIvtCheckmstYl; import org.nl.wms.storage_manage.rawmanage.service.check.dao.mapper.StIvtCheckmstYlMapper; -import org.nl.wms.storage_manage.rawmanage.service.check.IStIvtCheckmstYlService; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.nl.wms.storage_manage.rawmanage.service.check.dto.CheckQuery; +import org.nl.wms.storage_manage.rawmanage.service.iostorInv.dao.StIvtIostorinvYl; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.math.BigDecimal; +import java.util.*; +import java.util.stream.Stream; + /** *

* 盘点单主表 服务实现类 @@ -17,4 +50,259 @@ import org.springframework.stereotype.Service; @Service public class StIvtCheckmstYlServiceImpl extends ServiceImpl implements IStIvtCheckmstYlService { + @Autowired + private IStIvtBsrealstorattrService stIvtBsrealstorattrService; + + @Autowired + private IStIvtCheckdtlYlService checkdtlYlService; + + @Autowired + private IStIvtStructattrService structattrService; + + @Override + public Object pageQuery(CheckQuery query, PageQuery page) { + // 查询条件 + page.setSort("check_code,ASC"); + // 分页查询 + Page pageQuery = this.page(page.build(), query.build()); + TableDataInfo build = TableDataInfo.build(pageQuery); + return build; + } + + @Override + public void create(JSONObject form) { + JSONArray rows = form.getJSONArray("tableData"); + if (ObjectUtil.isEmpty(rows)) throw new BadRequestException("请求参数不能为空"); + + // 调用主表 插入/更新方法 + StIvtCheckmstYl checkmstYl = packageMstForm(new StIvtCheckmstYl(), form); + this.save(checkmstYl); + + //调用明细表 插入方法 + checkdtlYlService.create(rows, checkmstYl); + + } + + @Override + public List getCheckDtl(JSONObject map) { + return checkdtlYlService.getCheckDtl(map); + } + + @Override + public void update(JSONObject form) { + Assert.notNull(new Object[]{form, form.get("check_id")}, "请求参数不能为空"); + StIvtCheckmstYl mst = form.toJavaObject(StIvtCheckmstYl.class); + this.updateById(mst); + + JSONArray rows = form.getJSONArray("tableData"); + if (ObjectUtil.isEmpty(rows)) throw new BadRequestException("请求参数不能为空"); + // 调用明细表 插入/更新方法 + checkdtlYlService.create(rows, mst); + } + + @Override + public void saveCheck(JSONObject whereJson) { + JSONObject form = whereJson.getJSONObject("row"); + JSONArray rows = whereJson.getJSONArray("rows"); + + StIvtCheckmstYl jo_mst = this.getOne(new QueryWrapper().eq("check_id", form.getString("check_id")).in("status", new String[]{"10", "30"})); + if (jo_mst == null) { + throw new BadRequestException("盘点单状态异常！"); + } + checkdtlYlService.remove(new QueryWrapper().eq("check_id", form.getString("check_id")).in("status", new String[]{"01", "04"})); + for (int i = 0; i < rows.size(); i++) { + JSONObject jo = rows.getJSONObject(i); + String status = jo.getString("status"); + StIvtCheckdtlYl dtl = jo.toJavaObject(StIvtCheckdtlYl.class); + double base_qty = jo.getDoubleValue("base_qty"); + dtl.setSeq_no(BigDecimal.valueOf(i + 1)); + //已盘点过的明细不再处理 + if ("05,06,07,99".contains(status)) { + checkdtlYlService.updateById(dtl); + continue; + } + dtl.setStatus(CHECKEnum.DTL_STATUS.code("盘点中")); + dtl.setCheck_optid(SecurityUtils.getCurrentUserId()); + dtl.setCheck_optname(SecurityUtils.getCurrentNickName()); + dtl.setCheck_time(DateUtil.now()); + double fac_qty = jo.getDoubleValue("fac_qty"); + //判断盈亏 + if (fac_qty > base_qty) { + dtl.setCheck_result("2"); + } else if (fac_qty < base_qty) { + dtl.setCheck_result("1"); + } else { + dtl.setCheck_result("0"); + } + if (StrUtil.isEmpty(jo.getString("checkdtl_id"))) { + jo.put("checkdtl_id", IdUtil.getStringId()); + } + checkdtlYlService.save(dtl); + } + jo_mst.setDtl_num(BigDecimal.valueOf(rows.size())); + jo_mst.setStatus(CHECKEnum.BILL_STATUS.code("盘点中")); + jo_mst.setIs_nok(false); + List dtl_list = checkdtlYlService.list(new QueryWrapper().eq("check_id", form.getString("check_id")).ne("check_result", "0")); + if (dtl_list.size() != 0) { + jo_mst.setIs_nok(true); + } + this.updateById(jo_mst); + } + + @Override + public void confirm(JSONObject whereJson) { + + JSONObject form = whereJson.getJSONObject("row"); + JSONArray rows = whereJson.getJSONArray("rows"); + + StIvtCheckmstYl jo_mst = this.getOne(new QueryWrapper().eq("check_id", form.getString("check_id")).in("status", new String[]{"10", "30"})); + if (jo_mst == null) { + throw new BadRequestException("盘点单状态异常！"); + } + checkdtlYlService.remove(new QueryWrapper().eq("check_id", form.getString("check_id")).in("status", new String[]{"01", "04"})); + //定义需要需要更新的的点位集合 + HashSet set = new HashSet<>(); + for (int i = 0; i < rows.size(); i++) { + JSONObject jo = rows.getJSONObject(i); + String status = jo.getString("status"); + StIvtCheckdtlYl dtl = jo.toJavaObject(StIvtCheckdtlYl.class); + double base_qty = jo.getDoubleValue("base_qty"); + dtl.setSeq_no(BigDecimal.valueOf(i + 1)); + //已盘点过的明细不再处理 + if ("05,06,07,99".contains(status)) { + checkdtlYlService.updateById(dtl); + continue; + } + dtl.setStatus(CHECKEnum.DTL_STATUS.code("已盘点")); + dtl.setCheck_optid(SecurityUtils.getCurrentUserId()); + dtl.setCheck_optname(SecurityUtils.getCurrentNickName()); + dtl.setCheck_time(DateUtil.now()); + double fac_qty = jo.getDoubleValue("fac_qty"); + //判断盈亏 + if (fac_qty > base_qty) { + dtl.setCheck_result("2"); + } else if (fac_qty < base_qty) { + dtl.setCheck_result("1"); + } else { + dtl.setCheck_result("0"); + dtl.setStatus(CHECKEnum.DTL_STATUS.code("确认完成")); + } + if (StrUtil.isEmpty(jo.getString("checkdtl_id"))) { + jo.put("checkdtl_id", IdUtil.getStringId()); + } + checkdtlYlService.save(dtl); + set.add(dtl.getStruct_id()); + } + jo_mst.setDtl_num(BigDecimal.valueOf(rows.size())); + + jo_mst.setIs_nok(false); + List dtl_list = checkdtlYlService.list(new QueryWrapper().eq("check_id", form.getString("check_id")).ne("check_result", "0")); + if (dtl_list.size() != 0) { + jo_mst.setIs_nok(true); + } + List finish_list = checkdtlYlService.list(new QueryWrapper().eq("check_id", form.getString("check_id")).in("status", new String[]{"99", "07"})); + //说明全部确认 + if (finish_list.size() == jo_mst.getDtl_num().intValue()) { + checkdtlYlService.update(new UpdateWrapper().set("status", "99").eq("check_id", form.getString("check_id"))); + + jo_mst.setStatus(CHECKEnum.BILL_STATUS.code("完成")); + jo_mst.setConfirm_optid(SecurityUtils.getCurrentUserId()); + jo_mst.setConfirm_optname(SecurityUtils.getCurrentNickName()); + jo_mst.setConfirm_time(DateUtil.now()); + //锁定起点点位、仓位 + set.forEach(struct_id -> structattrService.update(new UpdateWrapper().set("lock_type", "0").set("inv_code", "").eq("struct_id", struct_id))); + } + this.updateById(jo_mst); + } + + @Override + public void process0(JSONObject whereJson) { + JSONObject form = whereJson.getJSONObject("form"); + JSONObject row = whereJson.getJSONObject("row"); + + StIvtCheckmstYl jo_mst = this.getOne(new QueryWrapper().eq("check_id", form.getString("check_id")).ne("status", "99")); + if (jo_mst == null) { + throw new BadRequestException("盘点单状态异常！"); + } + StIvtCheckdtlYl dtl = row.toJavaObject(StIvtCheckdtlYl.class); + dtl.setStatus(CHECKEnum.DTL_STATUS.code("确认完成")); + dtl.setProcess_optid(SecurityUtils.getCurrentUserId()); + dtl.setProcess_time(DateUtil.now()); + dtl.setProcess_type(CHECKEnum.PROCESS_TYPE.code("账务为准")); + dtl.setIs_process(true); + checkdtlYlService.updateById(dtl); + List finish_list = checkdtlYlService.list(new QueryWrapper().eq("check_id", form.getString("check_id")).in("status", new String[]{"99", "07"})); + //说明全部确认 + if (finish_list.size() == jo_mst.getDtl_num().intValue()) { + checkdtlYlService.update(new UpdateWrapper().set("status", "99").eq("check_id", form.getString("check_id"))); + + jo_mst.setStatus(CHECKEnum.BILL_STATUS.code("完成")); + jo_mst.setConfirm_optid(SecurityUtils.getCurrentUserId()); + jo_mst.setConfirm_optname(SecurityUtils.getCurrentNickName()); + jo_mst.setConfirm_time(DateUtil.now()); + //解锁起点点位、仓位 + finish_list.stream() + .map(finish -> finish.getStruct_id()) + .distinct() + .forEach(struct_id -> structattrService.update(new UpdateWrapper().set("inv_code", "").set("lock_type", "0").eq("struct_id", struct_id))); + } + this.updateById(jo_mst); + } + + @Override + public void process1(JSONObject jo) { + + } + + @Override + public void delete(Long[] ids) { + for (Long id : ids) { + StIvtCheckmstYl dao = this.getOne(new QueryWrapper().eq("check_id", id)); + dao.setIs_delete(true); + + //获取所有明细下的仓位解锁 + List dtl_list = checkdtlYlService.list(new QueryWrapper().eq("check_id", id)); + dtl_list.stream() + .map(dtl -> dtl.getStruct_id()) + .distinct() + .forEach(struct_id -> structattrService.update(new UpdateWrapper().set("inv_code", "").set("lock_type", "0").eq("struct_id", struct_id))); + this.updateById(dao); + } + } + + @NotNull + private StIvtCheckmstYl packageMstForm(StIvtCheckmstYl checkmstYl, JSONObject whereJson) { + JSONArray rows = whereJson.getJSONArray("tableData"); + // 新增 + checkmstYl.setCheck_id(IdUtil.getStringId()); + checkmstYl.setCheck_code(CodeUtil.getNewCode("PD_CODE")); + checkmstYl.setBuss_type(whereJson.getString("check_type")); + checkmstYl.setCheck_type(checkmstYl.getBuss_type()); + + // 获取仓库信息 + 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("仓库不存在或未启用！"); + + checkmstYl.setStor_id(bsrealDao.getStor_id()); + checkmstYl.setStor_name(bsrealDao.getStor_name()); + checkmstYl.setDtl_num(BigDecimal.valueOf(rows.size())); + checkmstYl.setCreate_mode(CHECKEnum.CREATE_MODE.code("PC产生")); + checkmstYl.setStatus(CHECKEnum.BILL_STATUS.code("生成")); + checkmstYl.setCreate_id(SecurityUtils.getCurrentUserId()); + checkmstYl.setCreate_name(SecurityUtils.getCurrentNickName()); + checkmstYl.setCreate_time(DateUtil.now()); + checkmstYl.setIs_delete(false); + checkmstYl.setIs_upload(true); + // TODO 暂时写死 + checkmstYl.setSysdeptid("111"); + checkmstYl.setSyscompanyid("111"); + + checkmstYl.setRemark(whereJson.getString("remark")); + checkmstYl.setWorkshop_id(whereJson.getString("workshop_id")); + + return checkmstYl; + } } 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 index 00f92d90..033696b6 100644 --- 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 @@ -1,7 +1,9 @@ package org.nl.wms.storage_manage.rawmanage.service.iostorInv.impl; import cn.hutool.core.date.DateUtil; +import cn.hutool.core.util.NumberUtil; import cn.hutool.core.util.ObjectUtil; +import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -19,7 +21,9 @@ import org.nl.modules.system.util.CodeUtil; import org.nl.wms.masterdata_manage.service.material.IMdMeMaterialbaseService; import org.nl.wms.masterdata_manage.service.material.dao.MdMeMaterialbase; import org.nl.wms.masterdata_manage.storage.service.storage.IStIvtBsrealstorattrService; +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.StIvtStructattr; 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; @@ -41,6 +45,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import javax.transaction.Transactional; +import java.math.BigDecimal; import java.util.List; import java.util.Map; @@ -74,10 +79,10 @@ public class StIvtIostorinvOutYlServiceImpl extends ServiceImpl 0){ + if (need_qty > 0) { double canuse_qty = ivt.getCanuse_qty().doubleValue(); - if (canuse_qty >= need_qty){ - //插入分配表 + //插入分配表 + String s = JSON.toJSONString(dtl); + JSONObject dis = JSONObject.parseObject(s); + StIvtStructattr structattr = structattrService.getOne(new QueryWrapper().eq("struct_id", ivt.getStruct_id())); + dis.put("struct_id", structattr.getStruct_id()); + dis.put("struct_code", structattr.getStruct_code()); + dis.put("struct_name", structattr.getStruct_name()); + dis.put("sect_id", structattr.getSect_id()); + dis.put("sect_code", structattr.getSect_code()); + dis.put("sect_name", structattr.getSect_name()); + if (canuse_qty > need_qty) { + dis.put("plan_qty", need_qty); + dis.put("real_qty", need_qty); + //减去库存 + double sub = NumberUtil.sub(canuse_qty, need_qty); + ivt.setCanuse_qty(BigDecimal.valueOf(sub)); + ivt.setIvt_qty(BigDecimal.valueOf(sub)); + structivtYlService.updateById(ivt); - //维护库存 + need_qty = 0; + } else { + dis.put("plan_qty", canuse_qty); + dis.put("real_qty", canuse_qty); + structivtYlService.remove(new QueryWrapper().eq("stockrecord_id", ivt.getStockrecord_id())); + + need_qty = NumberUtil.sub(need_qty - canuse_qty).doubleValue(); } - }else { + JSONObject mst_jo = new JSONObject(); + mst_jo.put("mst_id", dtl.getIostorinv_id()); + mst_jo.put("dtl_id", dtl.getIostorinv_id()); + iostorinvdisYlService.create(dis, mst_jo); + //维护库存 + } else { break; } } - if (need_qty > 0){ - throw new BadRequestException("物料:"+mater.getMaterial_name()+"库存不足，缺少："+need_qty+"KG"); + if (need_qty > 0) { + throw new BadRequestException("物料:" + mater.getMaterial_name() + "库存不足，缺少：" + need_qty + "KG"); } }); + List dis_list = iostorinvdisYlService.list(new QueryWrapper().eq("iostorinv_id", iostorinv_id)); + + //修改分配状态 + dis_list.forEach(dis -> { + dis.setWork_status(IOSEnum.WORK_STATUS.code("完成")); + iostorinvdisYlService.updateById(dis); + }); + } @NotNull 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 1e8bd5f4..dc325a86 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 @@ -20,10 +20,7 @@ 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; @@ -35,7 +32,6 @@ import org.nl.wms.storage_manage.rawmanage.service.iostorInv.dao.mapper.StIvtIos 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; diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/iostorInv/impl/StIvtIostorinvdisYlServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/iostorInv/impl/StIvtIostorinvdisYlServiceImpl.java index 496fb70c..f3ea5007 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/iostorInv/impl/StIvtIostorinvdisYlServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/iostorInv/impl/StIvtIostorinvdisYlServiceImpl.java @@ -56,6 +56,27 @@ public class StIvtIostorinvdisYlServiceImpl 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 89cffbb9..4c3cda74 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 @@ -6,6 +6,9 @@ import org.nl.wms.storage_manage.rawmanage.service.structIvt.dao.StIvtStructivtY import com.baomidou.mybatisplus.extension.service.IService; import org.nl.wms.storage_manage.rawmanage.service.structIvt.dto.StructIvtYLQuery; +import java.util.List; +import java.util.Map; + /** *

* 仓位库存表 服务类 @@ -23,4 +26,6 @@ public interface IStIvtStructivtYlService extends IService { * @return JSONObject */ Object getRawIvt(StructIvtYLQuery query, PageQuery page); + + List getStructIvt(StructIvtYLQuery query); } 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 908770df..74c92292 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 @@ -21,4 +21,6 @@ import java.util.Map; public interface StIvtStructivtYlMapper extends BaseMapper { List getRawIvt(@Param("query") StructIvtYLQuery query, @Param("pageQuery") PageQuery pageQuery); + + List getStructIvt(@Param("query") StructIvtYLQuery query); } 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 19b90380..1b88c84d 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 @@ -23,7 +23,8 @@ LEFT JOIN md_pb_classstandard class ON class.class_id = mb.material_type_id ivt.canuse_qty > 0 - + AND + sa.lock_type = '0' and (mb.material_code = #{query.material_search} OR mb.material_name = #{query.material_search}) @@ -35,4 +36,39 @@ + + 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 65aaa8b0..72e0a5ec 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 @@ -37,4 +37,9 @@ public class StIvtStructivtYlServiceImpl extends ServiceImpl getStructIvt(StructIvtYLQuery query) { + return structivtYlMapper.getStructIvt(query); + } } diff --git a/mes/qd/src/views/wms/old_manage/old_package/index.vue b/mes/qd/src/views/wms/old_manage/old_package/index.vue index c0eaea9b..bd013985 100644 --- a/mes/qd/src/views/wms/old_manage/old_package/index.vue +++ b/mes/qd/src/views/wms/old_manage/old_package/index.vue @@ -101,12 +101,11 @@ slot="right" class="filter-item" type="success" - icon="el-icon-position" size="mini" - :disabled="confirm_flag" - @click="startWork()" + icon="el-icon-check" + @click="save" > - 开工 + 保存 打印 + + 开工 + @@ -402,7 +412,7 @@ export default { query: { workorder_status: '2', product_area: 'A2', - workprocedure_code: 'BZ', + workprocedure_code: 'A1_BZ', is_error: '0' }, url: 'api/produceWorkorder', @@ -431,46 +441,7 @@ export default { roadList: ['1', '2', '3', '4', '5', '6', '7'], confirm_flag: true, permission: {}, - rules: { - struct_id: [ - {required: true, message: '仓位标识不能为空', trigger: 'blur'} - ], - struct_code: [ - {required: true, message: '仓位编码不能为空', trigger: 'blur'} - ], - struct_name: [ - {required: true, message: '仓位名称不能为空', trigger: 'blur'} - ], - sect_id: [ - {required: true, message: '库区标识不能为空', trigger: 'blur'} - ], - stor_id: [ - {required: true, message: '仓库标识不能为空', trigger: 'blur'} - ], - capacity: [ - {required: false, message: '不能为空', trigger: 'blur'}, - {validator: numberOne} - ], - weight: [ - {required: false, message: '不能为空', trigger: 'blur'}, - {validator: numberOne} - ], - width: [ - {required: false, message: '不能为空', trigger: 'blur'}, - {validator: numberOne} - ], - height: [ - {required: false, message: '不能为空', trigger: 'blur'}, - {validator: numberOne} - ], - zdepth: [ - {required: false, message: '不能为空', trigger: 'blur'}, - {validator: numberOne} - ], - material_height_type: [ - {required: true, message: '物料高度类型不能为空', trigger: 'blur'} - ] - } + rules: {} } }, created() { @@ -542,10 +513,10 @@ export default { this.currentRow.extra_map.package_qty = Math.ceil(this.currentRow.plan_qty / this.currentRow.extra_map.one_package_qty) this.currentRow.extra_map.box_num = Math.ceil(this.currentRow.extra_map.package_qty / this.currentRow.extra_map.one_box_package_qty) orderExt.add(this.currentRow).then(res => { - this.notify('操作成功', 'success') }) crudProduceshiftorder.openStart(this.currentRow).then(res => { }) + this.crud.notify('下发成功', CRUD.NOTIFICATION_TYPE.SUCCESS) }, sectQueryChange(val) { if (val.length === 1) { @@ -562,12 +533,35 @@ export default { } this.crud.toQuery() }, + save() { + if (!this.crud.query.one_box_package_qty || !this.crud.query.one_package_qty || !this.crud.query.box_type || + !this.crud.query.target_roadway || !this.crud.query.is_flip || + !this.crud.query.tray_full_num) { + this.crud.notify('缺少开工必要参数，保证输入框内不能为空！', CRUD.NOTIFICATION_TYPE.INFO) + return + } + if (!this.currentRow.workorder_code) { + this.crud.notify('请选择一条工单记录进行保存', CRUD.NOTIFICATION_TYPE.INFO) + return + } + this.currentRow.extra_map = this.crud.query + this.currentRow.extra_map.package_qty = Math.ceil(this.currentRow.plan_qty / this.currentRow.extra_map.one_package_qty) + this.currentRow.extra_map.box_num = Math.ceil(this.currentRow.extra_map.package_qty / this.currentRow.extra_map.one_box_package_qty) + orderExt.add(this.currentRow).then(res => { + this.crud.notify('保存成功', CRUD.NOTIFICATION_TYPE.SUCCESS) + }) + }, print() { - if (!this.currentRow) { + debugger + if (!this.currentRow.workorder_code) { this.crud.notify('请选择一条工单记录进行打印', CRUD.NOTIFICATION_TYPE.INFO) + return } orderExt.getExtList(this.currentRow).then(res => { - debugger + if (res.length == 0 || !res) { + this.crud.notify('该工单需要打印的箱数为0', CRUD.NOTIFICATION_TYPE.INFO) + return + } res.forEach((item) => { const LODOP = getLodop() LODOP.SET_SHOW_MODE('HIDE_DISBUTTIN_SETUP', 1)// 隐藏那些无效按钮 diff --git a/mes/qd/src/views/wms/product_manage/workorder/index.vue b/mes/qd/src/views/wms/product_manage/workorder/index.vue index ed16aa18..3cb7ca57 100644 --- a/mes/qd/src/views/wms/product_manage/workorder/index.vue +++ b/mes/qd/src/views/wms/product_manage/workorder/index.vue @@ -165,6 +165,16 @@ > 导入 + + 打印 + 1) { + this.$message('请选择一条工单进行打印！') + return + } + let a = this.crud.selections[0] + orderExt.getExtList(a).then(res => { + if (res.length == 0 || !res) { + this.crud.notify('该工单需要打印的箱数为0', CRUD.NOTIFICATION_TYPE.INFO) + return + } + res.forEach((item) => { + const LODOP = getLodop() + LODOP.SET_SHOW_MODE('HIDE_DISBUTTIN_SETUP', 1)// 隐藏那些无效按钮 + // 打印纸张大小设置https://www.it610.com/article/2094844.html + LODOP.SET_PRINT_PAGESIZE(1, '80mm', '50mm', '') + // LODOP.ADD_PRINT_RECT('0mm', '0mm', '48mm', '28mm', 0, 1) + LODOP.ADD_PRINT_BARCODE('10mm', '12mm', '60mm', '25mm', '128Auto', item.bar_code) + LODOP.SET_PRINT_STYLEA(0, 'ShowBarText', 0) + LODOP.ADD_PRINT_TEXT('35mm', '22mm', '40mm', '20mm', item.bar_code.substring(0, 9)) + LODOP.SET_PRINT_STYLEA(0, 'FontSize', 20) + LODOP.ADD_PRINT_TEXT('42mm', '25mm', '40mm', '20mm', item.bar_code.substring(9, 16)) + console.log(item.barcode) + LODOP.SET_PRINT_STYLEA(0, 'FontSize', 20) + LODOP.PRINT()// 打印 + // LODOP.PREVIEW() + }) + this.crud.notify('打印成功', CRUD.NOTIFICATION_TYPE.SUCCESS) + }) + this.crud.toQuery() + }, queryClassId() { const param = { 'class_idStr': this.class_idStr 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 3365b7d6..69d75809 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 @@ -234,7 +234,7 @@ import CRUD, {crud, form} from '@crud/crud' import MaterDtl from '@/views/wms/pub/MaterDialog' import BillDtl from '@/views/wms/storage_manage/rawproduct/rawProductIn/AddDtl' -import crudStorattr from "@/api/wms/basedata/st/storattr"; +import crudStorattr from "@/views/wms/storage_manage/basedata/basedata"; import crudProductIn from '@/views/wms/storage_manage/rawproduct/rawProductIn/rawproductin' import crudStructattr from "@/api/wms/basedata/st/structattr"; @@ -303,7 +303,7 @@ export default { }, methods: { open() { - crudStorattr.queryStor({"stor_type": "3"}).then(res => { + crudStorattr.getStor({"stor_type": "3"}).then(res => { this.storlist = res.content }) }, diff --git a/mes/qd/src/views/wms/storage_manage/rawproduct/rawProductOut/index.vue b/mes/qd/src/views/wms/storage_manage/rawproduct/rawProductOut/index.vue index 30b822d1..986bf9f9 100644 --- a/mes/qd/src/views/wms/storage_manage/rawproduct/rawProductOut/index.vue +++ b/mes/qd/src/views/wms/storage_manage/rawproduct/rawProductOut/index.vue @@ -317,7 +317,7 @@ export default { this.crud.notify('请选择一条单据', CRUD.NOTIFICATION_TYPE.INFO) return } - crudProductIn.confirm(this.currentRow).then(res => { + crudProductOut.confirm(this.currentRow).then(res => { this.crud.notify('单据确认成功！', CRUD.NOTIFICATION_TYPE.SUCCESS) this.crud.toQuery() }) diff --git a/mes/qd/src/views/wms/storage_manage/rawproduct/rawProductOut/rawproductout.js b/mes/qd/src/views/wms/storage_manage/rawproduct/rawProductOut/rawproductout.js index a8beb641..1c9e78b4 100644 --- a/mes/qd/src/views/wms/storage_manage/rawproduct/rawProductOut/rawproductout.js +++ b/mes/qd/src/views/wms/storage_manage/rawproduct/rawProductOut/rawproductout.js @@ -40,187 +40,187 @@ export function getIODis(data) { } export function getOutBillDisDtl(params) { return request({ - url: '//api/out/stIvtIostorinvYl/getOutBillDisDtl', + url: '/api/out/stIvtIostorinvYl/getOutBillDisDtl', method: 'get', params }) } export function getOutBillTask(params) { return request({ - url: '//api/out/stIvtIostorinvYl/getOutBillTask', + url: '/api/out/stIvtIostorinvYl/getOutBillTask', method: 'get', params }) } export function getInvTypes() { return request({ - url: '//api/out/stIvtIostorinvYl/getInvTypes', + url: '/api/out/stIvtIostorinvYl/getInvTypes', method: 'get' }) } export function insertDtl(data) { return request({ - url: '//api/out/stIvtIostorinvYl/insertDtl', + url: '/api/out/stIvtIostorinvYl/insertDtl', method: 'post', data }) } export function allDiv(data) { return request({ - url: '//api/out/stIvtIostorinvYl/allDiv', + url: '/api/out/stIvtIostorinvYl/allDiv', method: 'post', data }) } export function allDivOne(data) { return request({ - url: '//api/out/stIvtIostorinvYl/allDivOne', + url: '/api/out/stIvtIostorinvYl/allDivOne', method: 'post', data }) } export function allCancel(data) { return request({ - url: '//api/out/stIvtIostorinvYl/allCancel', + url: '/api/out/stIvtIostorinvYl/allCancel', method: 'post', data }) } export function oneCancel(data) { return request({ - url: '//api/out/stIvtIostorinvYl/oneCancel', + url: '/api/out/stIvtIostorinvYl/oneCancel', method: 'post', data }) } export function setPoint(data) { return request({ - url: '//api/out/stIvtIostorinvYl/setPoint', + url: '/api/out/stIvtIostorinvYl/setPoint', method: 'post', data }) } export function oneSetPoint(data) { return request({ - url: '//api/out/stIvtIostorinvYl/oneSetPoint', + url: '/api/out/stIvtIostorinvYl/oneSetPoint', method: 'post', data }) } export function getStructIvt(params) { return request({ - url: '//api/out/stIvtIostorinvYl/getStructIvt', + url: '/api/out/stIvtIostorinvYl/getStructIvt', method: 'get', params }) } export function manualDiv(data) { return request({ - url: '//api/out/stIvtIostorinvYl/manualDiv', + url: '/api/out/stIvtIostorinvYl/manualDiv', method: 'post', data }) } export function confirm(data) { return request({ - url: '//api/out/stIvtIostorinvYl/confirm', + url: '/api/out/stIvtIostorinvYl/confirm', method: 'post', data }) } export function issueTask(data) { return request({ - url: '//api/out/stIvtIostorinvYl/issueTask', + url: '/api/out/stIvtIostorinvYl/issueTask', method: 'post', data }) } export function finishTask(data) { return request({ - url: '//api/out/stIvtIostorinvYl/finishTask', + url: '/api/out/stIvtIostorinvYl/finishTask', method: 'post', data }) } export function cancleTaskfinish(data) { return request({ - url: '//api/out/stIvtIostorinvYl/cancleTaskfinish', + url: '/api/out/stIvtIostorinvYl/cancleTaskfinish', method: 'post', data }) } export function paramByCodeType(data) { return request({ - url: '//api/out/stIvtIostorinvYl/paramByCodeType', + url: '/api/out/stIvtIostorinvYl/paramByCodeType', method: 'post', data }) } export function schAreaType(data) { return request({ - url: '//api/out/stIvtIostorinvYl/schAreaType', + url: '/api/out/stIvtIostorinvYl/schAreaType', method: 'post', data }) } export function backConfirm(data) { return request({ - url: '//api/out/stIvtIostorinvYl/backConfirm', + url: '/api/out/stIvtIostorinvYl/backConfirm', method: 'post', data }) } export function getType() { return request({ - url: '//api/out/stIvtIostorinvYl/getType', + url: '/api/out/stIvtIostorinvYl/getType', method: 'get' }) } export function moneySubmit(data) { return request({ - url: '//api/out/stIvtIostorinvYl/moneySubmit', + url: '/api/out/stIvtIostorinvYl/moneySubmit', method: 'post', data }) } export function getDisNum(data) { return request({ - url: '//api/out/stIvtIostorinvYl/getDisNum', + url: '/api/out/stIvtIostorinvYl/getDisNum', method: 'post', data }) } export function queryBox(data) { return request({ - url: '//api/out/stIvtIostorinvYl/queryBox', + url: '/api/out/stIvtIostorinvYl/queryBox', method: 'post', data }) } export function getOutBillTask2(data) { return request({ - url: '//api/out/stIvtIostorinvYl/getOutBillTask2', + url: '/api/out/stIvtIostorinvYl/getOutBillTask2', method: 'post', data }) } export function cancelTask(data) { return request({ - url: '//api/out/stIvtIostorinvYl/cancelTask', + url: '/api/out/stIvtIostorinvYl/cancelTask', method: 'post', data }) } export function allSetPoint(data) { return request({ - url: '//api/out/stIvtIostorinvYl/allSetPoint', + url: '/api/out/stIvtIostorinvYl/allSetPoint', method: 'post', data }) } export function oneSetPoint2(data) { return request({ - url: '//api/out/stIvtIostorinvYl/oneSetPoint2', + url: '/api/out/stIvtIostorinvYl/oneSetPoint2', method: 'post', data }) diff --git a/mes/qd/src/views/wms/storage_manage/rawproduct/rawproductCheck/AddDialog.vue b/mes/qd/src/views/wms/storage_manage/rawproduct/rawproductCheck/AddDialog.vue index 4e684fa5..588399aa 100644 --- a/mes/qd/src/views/wms/storage_manage/rawproduct/rawproductCheck/AddDialog.vue +++ b/mes/qd/src/views/wms/storage_manage/rawproduct/rawproductCheck/AddDialog.vue @@ -11,22 +11,42 @@ > - + - 保存 + 保存 关闭 - - - + + + - + + + + + + + @@ -57,7 +77,7 @@ :disabled="crud.status.view > 0" > - + - +

@@ -93,7 +114,7 @@ - + - - - - - - - - - - + + + + + + + + - + + diff --git a/mes/qd/src/views/wms/storage_manage/rawproduct/rawproductCheck/check.js b/mes/qd/src/views/wms/storage_manage/rawproduct/rawproductCheck/check.js index 57ee1267..303a9368 100644 --- a/mes/qd/src/views/wms/storage_manage/rawproduct/rawproductCheck/check.js +++ b/mes/qd/src/views/wms/storage_manage/rawproduct/rawproductCheck/check.js @@ -10,27 +10,28 @@ export function add(data) { export function del(ids) { return request({ - url: 'api/check/', - method: 'delete', + url: 'api/check/delete', + method: 'post', data: ids }) } export function edit(data) { return request({ - url: 'api/check', - method: 'put', + url: 'api/check/update', + method: 'post', data }) } -export function getOutBillDtl(params) { +export function getCheckDtl(data) { return request({ - url: '/api/check/getOutBillDtl', - method: 'get', - params + url: '/api/check/getCheckDtl', + method: 'post', + data }) } + export function getOutBillDtl2(params) { return request({ url: '/api/check/getOutBillDtl2', @@ -38,6 +39,7 @@ export function getOutBillDtl2(params) { params }) } + export function getOutBillDis(params) { return request({ url: '/api/check/getOutBillDis', @@ -45,12 +47,14 @@ export function getOutBillDis(params) { params }) } + export function getInvTypes() { return request({ url: '/api/check/getInvTypes', method: 'get' }) } + export function insertDtl(data) { return request({ url: '/api/check/insertDtl', @@ -58,6 +62,7 @@ export function insertDtl(data) { data }) } + export function getStructIvt(params) { return request({ url: '/api/check/getStructIvt', @@ -73,6 +78,7 @@ export function confirm(data) { data }) } + export function handdown(data) { return request({ url: '/api/check/handdown', @@ -80,6 +86,7 @@ export function handdown(data) { data }) } + export function saveCheck(data) { return request({ url: '/api/check/saveCheck', @@ -87,6 +94,7 @@ export function saveCheck(data) { data }) } + export function process0(data) { return request({ url: '/api/check/process0', @@ -94,6 +102,7 @@ export function process0(data) { data }) } + export function process1(data) { return request({ url: '/api/check/process1', @@ -101,4 +110,18 @@ export function process1(data) { data }) } -export default { add, edit, del, getOutBillDtl, getStructIvt, getOutBillDtl2, confirm, getInvTypes, saveCheck, process0, getOutBillDis, process1 } + +export default { + add, + edit, + del, + getCheckDtl, + getStructIvt, + getOutBillDtl2, + confirm, + getInvTypes, + saveCheck, + process0, + getOutBillDis, + process1 +} diff --git a/mes/qd/src/views/wms/storage_manage/rawproduct/rawproductCheck/index.vue b/mes/qd/src/views/wms/storage_manage/rawproduct/rawproductCheck/index.vue index c64b94fd..b4c36c7b 100644 --- a/mes/qd/src/views/wms/storage_manage/rawproduct/rawproductCheck/index.vue +++ b/mes/qd/src/views/wms/storage_manage/rawproduct/rawproductCheck/index.vue @@ -78,7 +78,7 @@ @change="crud.toQuery" > - +
@@ -173,32 +173,32 @@ /> - - + + - - - - - - - + + + + + + + - + - - - + + +