From 6ce5cdc9c1a1e2292b6008691e77991ba7f58191 Mon Sep 17 00:00:00 2001 From: yewj Date: Thu, 7 Nov 2024 08:57:01 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=AB=E7=A0=81=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../collect/RelCodeBatchController.java | 20 +- .../inout/IoCodeTempController.java | 2 +- .../api/res/inout/IoCodeTempResponse.java | 3 +- .../mybatis/mapper/basic/UdiRelevanceDao.xml | 583 +++++++++--------- 4 files changed, 315 insertions(+), 293 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/collect/RelCodeBatchController.java b/src/main/java/com/glxp/api/controller/collect/RelCodeBatchController.java index 84938cb7..d88aac2b 100644 --- a/src/main/java/com/glxp/api/controller/collect/RelCodeBatchController.java +++ b/src/main/java/com/glxp/api/controller/collect/RelCodeBatchController.java @@ -33,6 +33,7 @@ public class RelCodeBatchController extends BaseController { /** * 上传文件保存 + * * @param uuid * @param file * @return @@ -40,31 +41,33 @@ public class RelCodeBatchController extends BaseController { @RepeatSubmit() @CusRedissonAnnotation(cacheName = RedissonCacheKey.XML_UPLOAD, key = {"#uuid"}, timeOutMsg = "系统正在处理，请勿重复上传") @PostMapping("/udiwms/relCode/batch/xmlUpload") - public BaseResponse xmlUpload(@RequestParam("uuid") String uuid,@RequestParam("file") MultipartFile file) { + public BaseResponse xmlUpload(@RequestParam("uuid") String uuid, @RequestParam("file") MultipartFile file) { relCodeBatchService.xmlUpload(file); return ResultVOUtils.successMsg("上传成功！"); } /** * 手动添加 + * * @param relCodeBatchRequest * @return */ @RepeatSubmit() @PostMapping("/udiwms/relCode/batch/add") - public BaseResponse add(@RequestBody @Valid RelCodeBatchRequest relCodeBatchRequest,BindingResult bindingResult) { + public BaseResponse add(@RequestBody @Valid RelCodeBatchRequest relCodeBatchRequest, BindingResult bindingResult) { relCodeBatchService.add(relCodeBatchRequest); return ResultVOUtils.successMsg("添加成功！"); } /** * 添加拼箱 + * * @param relCodeBatchRequest * @return */ @RepeatSubmit() @PostMapping("/udiwms/relCode/batch/addRelCodeSpellBox") - public BaseResponse addRelCodeSpellBox(@RequestBody @Valid List relCodeBatchRequest,BindingResult bindingResult) { + public BaseResponse addRelCodeSpellBox(@RequestBody @Valid List relCodeBatchRequest, BindingResult bindingResult) { relCodeBatchService.addRelCodeSpellBox(relCodeBatchRequest); return ResultVOUtils.successMsg("添加成功！"); } @@ -99,7 +102,6 @@ public class RelCodeBatchController extends BaseController { } - @GetMapping("/udiwms/relCode/batch/deleteDetail") public BaseResponse deleteDetail(@RequestParam("curCode") String curCode) { relCodeBatchService.deleteDetail(curCode); @@ -116,32 +118,34 @@ public class RelCodeBatchController extends BaseController { /** * 获取本地是否存在该层级码 + * * @param parentCode * @return */ @GetMapping("/udiwms/relCode/batch/exist") public BaseResponse batchExist(@RequestParam("parentCode") String parentCode) { - if (StrUtil.isBlank(parentCode)) return ResultVOUtils.error(500,"层级编码格式错误!"); + if (StrUtil.isBlank(parentCode)) return ResultVOUtils.error(500, "层级编码格式错误!"); return ResultVOUtils.success(relCodeBatchService.batchExist(parentCode)); } @GetMapping("/udiwms/relCode/detailByParentCode") public BaseResponse detailByParentCode(@RequestParam("parentCode") String parentCode) { - if (StrUtil.isBlank(parentCode)) return ResultVOUtils.error(500,"层级编码格式错误!"); - List list = relCodeBatchService.detailByParentCodeSpms(parentCode,1); + if (StrUtil.isBlank(parentCode)) return ResultVOUtils.error(500, "层级编码格式错误!"); + List list = relCodeBatchService.detailByParentCodeSpms(parentCode, 1); return ResultVOUtils.success(list); } /** * 更新明细 + * * @param parentCode * @return */ @GetMapping("/udiwms/relCode/updateIoCodeTempEntity") public BaseResponse threadUpdateIoCodeTempEntity(@RequestParam("parentCode") String parentCode) { - if (StrUtil.isBlank(parentCode)) return ResultVOUtils.error(500,"层级编码格式错误!"); + if (StrUtil.isBlank(parentCode)) return ResultVOUtils.error(500, "层级编码格式错误!"); relCodeBatchService.threadUpdateIoCodeTempEntity(parentCode); return ResultVOUtils.success(); } diff --git a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java index 63449a99..97ef1981 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java @@ -1406,7 +1406,7 @@ public class IoCodeTempController extends BaseController { // return ResultVOUtils.error(500, "当前库存不足，不允许0库存出库"); // } } else { - int count = invProductDetailService.vailStockCount(codeTempEntity.getRelId(), codeTempEntity.getBatchNo(), codeTempEntity.getSupId(), codeTempEntity.getDeptCode(), codeTempEntity.getInvCode(), null,false); + int count = invProductDetailService.vailStockCount(codeTempEntity.getRelId(), codeTempEntity.getBatchNo(), codeTempEntity.getSupId(), codeTempEntity.getDeptCode(), codeTempEntity.getInvCode(), null, false); if (count <= 0) { if (count == -1) { diff --git a/src/main/java/com/glxp/api/res/inout/IoCodeTempResponse.java b/src/main/java/com/glxp/api/res/inout/IoCodeTempResponse.java index 43a5526f..921d2d84 100644 --- a/src/main/java/com/glxp/api/res/inout/IoCodeTempResponse.java +++ b/src/main/java/com/glxp/api/res/inout/IoCodeTempResponse.java @@ -1,6 +1,7 @@ package com.glxp.api.res.inout; import com.baomidou.mybatisplus.annotation.TableField; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.Date; @@ -10,7 +11,7 @@ import java.util.Date; */ @Data public class IoCodeTempResponse { - + @ApiModelProperty(value = "单据ID主键") private Integer id; /** diff --git a/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml b/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml index 2c8e90a5..4515a7a3 100644 --- a/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml +++ b/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml @@ -67,10 +67,12 @@ basic_products.mjfs, basic_products.categoryName, basic_products.cphhhbh, + basic_products.bhltcjsl, + basic_products.bhsycjsl, basic_products.bzgg FROM basic_udirel - inner JOIN basic_products - ON basic_products.uuid = basic_udirel.uuid + inner JOIN basic_products + ON basic_products.uuid = basic_udirel.uuid AND ylqxzcrbarmc LIKE concat('%', #{ylqxzcrbarmc}, '%') @@ -135,8 +137,8 @@ resultType="java.lang.String"> select basic_products.packLevel FROM basic_udirel - inner JOIN basic_products - ON basic_products.uuid = basic_udirel.uuid + inner JOIN basic_products + ON basic_products.uuid = basic_udirel.uuid AND basic_products.nameCode = #{nameCode} @@ -192,6 +194,8 @@ basic_products.hchzsb, basic_products.cpdls, basic_products.price, + basic_products.bhltcjsl, + basic_products.bhsycjsl, basic_products.basicPrductRemak1, basic_products.basicPrductRemak2, basic_products.basicPrductRemak3, @@ -201,7 +205,7 @@ basic_products.basicPrductRemak7, basic_products.basicPrductRemak8 FROM basic_udirel - inner JOIN basic_products ON basic_products.uuid = basic_udirel.uuid + inner JOIN basic_products ON basic_products.uuid = basic_udirel.uuid AND ylqxzcrbarmc LIKE concat('%', #{ylqxzcrbarmc}, '%') @@ -328,15 +332,17 @@ basic_products.syqsfxyjxmj, basic_products.mjfs, basic_products.categoryName, + basic_products.bhltcjsl, + basic_products.bhsycjsl, basic_products.cphhhbh, company_product_relevance.unitFk, basic_corp.name companyName FROM basic_udirel - inner JOIN basic_products - ON basic_products.uuid = basic_udirel.uuid - left join company_product_relevance - on basic_udirel.id = company_product_relevance.udiRlIdFk - left JOIN basic_corp on basic_corp.erpId = company_product_relevance.customerId + inner JOIN basic_products + ON basic_products.uuid = basic_udirel.uuid + left join company_product_relevance + on basic_udirel.id = company_product_relevance.udiRlIdFk + left JOIN basic_corp on basic_corp.erpId = company_product_relevance.customerId AND ylqxzcrbarmc LIKE concat('%', #{ylqxzcrbarmc}, '%') @@ -406,91 +412,93 @@ select basic_udirel.*, - basic_products.originUuid, - basic_products.nameCode, - basic_products.deviceRecordKey, - basic_products.packRatio, - basic_products.packUnit, - basic_products.packLevel, - basic_products.bhxjsl, - basic_products.bhzxxsbzsl, - basic_products.zxxsbzbhsydysl, - basic_products.bhxjcpbm, - basic_products.bzcj, - basic_products.cpmctymc, - basic_products.cplb, - basic_products.flbm, - basic_products.ggxh, - basic_products.qxlb, - basic_products.tyshxydm, - basic_products.ylqxzcrbarmc, - basic_products.zczbhhzbapzbh, - basic_products.ylqxzcrbarywmc, - basic_products.sydycpbs, - basic_products.sjcpbm, - basic_products.versionNumber, - basic_products.diType, - basic_products.ybbm, - basic_products.sptm, - basic_products.manufactory, - basic_products.measname, - basic_products.productType, - basic_products.scbssfbhph, - basic_products.scbssfbhxlh, - basic_products.scbssfbhscrq, - basic_products.scbssfbhsxrq, - basic_products.cpms, - basic_products.allowNoBatch, - basic_products.allowNoExpire, - basic_products.allowNoProduct, - basic_products.allowNoSerial, - basic_products.spmc, - basic_products.cplx, - basic_products.hchzsb, - basic_products.cpdls, - basic_products.price, - basic_products.basicPrductRemak1, - basic_products.basicPrductRemak2, - basic_products.basicPrductRemak3, - basic_products.basicPrductRemak4, - basic_products.basicPrductRemak5, - basic_products.basicPrductRemak6, - basic_products.basicPrductRemak7, - basic_products.basicPrductRemak8, - basic_products.sfwblztlcp, - basic_products.cgzmraqxgxx, - basic_products.sfbjwycxsy, - basic_products.zdcfsycs, - basic_products.sfwwjbz, - basic_products.syqsfxyjxmj, - basic_products.mjfs, - basic_products.categoryName, - basic_products.cphhhbh + basic_products.originUuid, + basic_products.nameCode, + basic_products.deviceRecordKey, + basic_products.packRatio, + basic_products.packUnit, + basic_products.packLevel, + basic_products.bhxjsl, + basic_products.bhzxxsbzsl, + basic_products.zxxsbzbhsydysl, + basic_products.bhxjcpbm, + basic_products.bzcj, + basic_products.cpmctymc, + basic_products.cplb, + basic_products.flbm, + basic_products.ggxh, + basic_products.qxlb, + basic_products.tyshxydm, + basic_products.ylqxzcrbarmc, + basic_products.zczbhhzbapzbh, + basic_products.ylqxzcrbarywmc, + basic_products.sydycpbs, + basic_products.sjcpbm, + basic_products.versionNumber, + basic_products.diType, + basic_products.ybbm, + basic_products.sptm, + basic_products.manufactory, + basic_products.measname, + basic_products.productType, + basic_products.scbssfbhph, + basic_products.scbssfbhxlh, + basic_products.scbssfbhscrq, + basic_products.scbssfbhsxrq, + basic_products.cpms, + basic_products.allowNoBatch, + basic_products.allowNoExpire, + basic_products.allowNoProduct, + basic_products.allowNoSerial, + basic_products.spmc, + basic_products.cplx, + basic_products.hchzsb, + basic_products.cpdls, + basic_products.price, + basic_products.basicPrductRemak1, + basic_products.basicPrductRemak2, + basic_products.basicPrductRemak3, + basic_products.basicPrductRemak4, + basic_products.basicPrductRemak5, + basic_products.basicPrductRemak6, + basic_products.basicPrductRemak7, + basic_products.basicPrductRemak8, + basic_products.sfwblztlcp, + basic_products.cgzmraqxgxx, + basic_products.sfbjwycxsy, + basic_products.zdcfsycs, + basic_products.sfwwjbz, + basic_products.syqsfxyjxmj, + basic_products.mjfs, + basic_products.bhltcjsl, + basic_products.bhsycjsl, + basic_products.categoryName, + basic_products.cphhhbh FROM basic_udirel - INNER JOIN basic_products - on basic_udirel.uuid = basic_products.uuid + INNER JOIN basic_products + on basic_udirel.uuid = basic_products.uuid AND nameCode = #{nameCode} @@ -1392,14 +1407,14 @@ update - basic_udirel + basic_udirel set `relCode` = #{item.relCode} where id = #{item.id} @@ -1421,82 +1436,84 @@