From 6f7cb9124e2e58eb359be40643c4258141b33416 Mon Sep 17 00:00:00 2001 From: anthonywj Date: Tue, 21 Feb 2023 10:27:49 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug=EF=BC=8C=E4=BF=AE?= =?UTF-8?q?=E6=94=B9Integer=20=E4=B8=BAint?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inout/IoOrderDetailBizController.java | 51 +++++++++++++------ .../entity/inout/IoOrderDetailBizEntity.java | 4 +- .../entity/inout/IoOrderDetailCodeEntity.java | 8 +-- .../api/entity/inv/InvPreProductEntity.java | 8 +-- .../api/req/inout/AddBizProductReqeust.java | 9 ++++ .../res/inout/IoOrderDetailBizResponse.java | 4 +- .../inout/IoOrderDetailResultResponse.java | 4 +- .../glxp/api/res/inv/InvProductResponse.java | 6 +-- src/main/resources/application-dev.yml | 4 +- 9 files changed, 63 insertions(+), 35 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java index afcdf5ccd..d655f2500 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java @@ -1,6 +1,7 @@ package com.glxp.api.controller.inout; +import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageInfo; import com.glxp.api.annotation.AuthRuleAnnotation; @@ -34,6 +35,7 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; +import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -75,7 +77,7 @@ public class IoOrderDetailBizController extends BaseController { public BaseResponse addBizProduct(@RequestBody AddBizProductReqeust addBizProductReqeust) { AuthAdmin authAdmin = getUser(); - if (addBizProductReqeust.getRelId() == null) + if (addBizProductReqeust.getRelId() == null && CollUtil.isEmpty(addBizProductReqeust.getDatas())) return ResultVOUtils.error(500, "未选择产品信息"); if (addBizProductReqeust.getOrderEntity() == null) return ResultVOUtils.error(500, "未指定订单"); @@ -88,6 +90,10 @@ public class IoOrderDetailBizController extends BaseController { orderEntity.setCreateUser(authAdmin.getId() + ""); orderEntity.setCreateTime(new Date()); orderEntity.setMainAction(bussinessTypeEntity.getMainAction()); + if (StrUtil.isNotEmpty(orderEntity.getFromInvCode())) { + InvWarehouseEntity fromEntity = invWarehouseService.findByInvSubByCode(orderEntity.getInvCode()); + orderEntity.setFromDeptCode(fromEntity.getParentId()); + } orderEntity.setFromType(ConstantStatus.FROM_WEBNEW); orderEntity.setStatus(ConstantStatus.ORDER_STATUS_TEMP_SAVE); orderEntity.setDealStatus(ConstantStatus.ORDER_DEAL_DRAFT); @@ -100,21 +106,34 @@ public class IoOrderDetailBizController extends BaseController { orderEntity.setInvCode(orderEntity.getInvCode()); orderService.insertOrder(orderEntity); } - UdiRelevanceResponse udiRelevanceResponse = udiRelevanceService.selectGroupById(addBizProductReqeust.getRelId()); - IoOrderDetailBizEntity ioOrderDetailBizEntity = new IoOrderDetailBizEntity(); - ioOrderDetailBizEntity.setOrderIdFk(orderEntity.getBillNo()); - ioOrderDetailBizEntity.setBindRlFk(udiRelevanceResponse.getId()); - ioOrderDetailBizEntity.setUuidFk(udiRelevanceResponse.getUuid()); - ioOrderDetailBizEntity.setNameCode(udiRelevanceResponse.getNameCode()); - ioOrderDetailBizEntity.setCoName(udiRelevanceResponse.getCpmctymc()); - ioOrderDetailBizEntity.setCertCode(udiRelevanceResponse.getZczbhhzbapzbh()); - ioOrderDetailBizEntity.setYlqxzcrbarmc(udiRelevanceResponse.getYlqxzcrbarmc()); - ioOrderDetailBizEntity.setManufacturer(udiRelevanceResponse.getManufactory()); - ioOrderDetailBizEntity.setMeasname(udiRelevanceResponse.getMeasname()); - ioOrderDetailBizEntity.setSpec(udiRelevanceResponse.getGgxh()); - ioOrderDetailBizEntity.setPrice(udiRelevanceResponse.getPrice()); - ioOrderDetailBizEntity.setSupId(addBizProductReqeust.getSupId()); - orderDetailBizService.insert(ioOrderDetailBizEntity); + + List datas = new ArrayList<>(); + if (CollUtil.isNotEmpty(addBizProductReqeust.getDatas())) { + datas.addAll(addBizProductReqeust.getDatas()); + } else { + datas.add(addBizProductReqeust); + } + for (AddBizProductReqeust item : datas) { + UdiRelevanceResponse udiRelevanceResponse = udiRelevanceService.selectGroupById(item.getRelId()); + IoOrderDetailBizEntity ioOrderDetailBizEntity = new IoOrderDetailBizEntity(); + ioOrderDetailBizEntity.setOrderIdFk(orderEntity.getBillNo()); + ioOrderDetailBizEntity.setBindRlFk(udiRelevanceResponse.getId()); + ioOrderDetailBizEntity.setUuidFk(udiRelevanceResponse.getUuid()); + ioOrderDetailBizEntity.setNameCode(udiRelevanceResponse.getNameCode()); + ioOrderDetailBizEntity.setCoName(udiRelevanceResponse.getCpmctymc()); + ioOrderDetailBizEntity.setCertCode(udiRelevanceResponse.getZczbhhzbapzbh()); + ioOrderDetailBizEntity.setYlqxzcrbarmc(udiRelevanceResponse.getYlqxzcrbarmc()); + ioOrderDetailBizEntity.setManufacturer(udiRelevanceResponse.getManufactory()); + ioOrderDetailBizEntity.setMeasname(udiRelevanceResponse.getMeasname()); + ioOrderDetailBizEntity.setSpec(udiRelevanceResponse.getGgxh()); + ioOrderDetailBizEntity.setPrice(udiRelevanceResponse.getPrice()); + ioOrderDetailBizEntity.setProductDate(item.getProductDate()); + ioOrderDetailBizEntity.setExpireDate(item.getExpireDate()); + ioOrderDetailBizEntity.setBatchNo(item.getBatchNo()); + ioOrderDetailBizEntity.setSupId(item.getSupId()); + orderDetailBizService.insert(ioOrderDetailBizEntity); + } + orderEntity.setUpdateTime(new Date()); orderEntity.setUpdateUser(authAdmin.getId() + ""); orderService.update(orderEntity); diff --git a/src/main/java/com/glxp/api/entity/inout/IoOrderDetailBizEntity.java b/src/main/java/com/glxp/api/entity/inout/IoOrderDetailBizEntity.java index 559201c2f..2098f1dfb 100644 --- a/src/main/java/com/glxp/api/entity/inout/IoOrderDetailBizEntity.java +++ b/src/main/java/com/glxp/api/entity/inout/IoOrderDetailBizEntity.java @@ -138,7 +138,7 @@ public class IoOrderDetailBizEntity { * 单据数量 */ @TableField(value = "`count`") - private Integer count; + private int count; /** * 备注 @@ -183,4 +183,4 @@ public class IoOrderDetailBizEntity { @TableField(exist = false) private Integer scanCount; -} \ No newline at end of file +} diff --git a/src/main/java/com/glxp/api/entity/inout/IoOrderDetailCodeEntity.java b/src/main/java/com/glxp/api/entity/inout/IoOrderDetailCodeEntity.java index 56a68778c..f1c24b7b4 100644 --- a/src/main/java/com/glxp/api/entity/inout/IoOrderDetailCodeEntity.java +++ b/src/main/java/com/glxp/api/entity/inout/IoOrderDetailCodeEntity.java @@ -138,13 +138,13 @@ public class IoOrderDetailCodeEntity { * 单据数量 */ @TableField(value = "`count`") - private Integer count; + private int count; /** * 扫码数量 */ @TableField(value = "reCount") - private Integer reCount; + private int reCount; /** * 备注 @@ -186,6 +186,6 @@ public class IoOrderDetailCodeEntity { private boolean checkSuccess; @TableField(exist = false) - private Integer orderCount; + private int orderCount; -} \ No newline at end of file +} diff --git a/src/main/java/com/glxp/api/entity/inv/InvPreProductEntity.java b/src/main/java/com/glxp/api/entity/inv/InvPreProductEntity.java index 70ad2b7bf..84d5dcd09 100644 --- a/src/main/java/com/glxp/api/entity/inv/InvPreProductEntity.java +++ b/src/main/java/com/glxp/api/entity/inv/InvPreProductEntity.java @@ -51,19 +51,19 @@ public class InvPreProductEntity { * 入库数量 */ @TableField(value = "inCount") - private Integer inCount; + private int inCount; /** * 出库数量 */ @TableField(value = "outCount") - private Integer outCount; + private int outCount; /** * 实际数量 */ @TableField(value = "reCount") - private String reCount; + private int reCount; /** * 客户ID @@ -130,4 +130,4 @@ public class InvPreProductEntity { public static final String COL_CREATETIME = "createTime"; public static final String COL_UPDATETIME = "updateTime"; -} \ No newline at end of file +} diff --git a/src/main/java/com/glxp/api/req/inout/AddBizProductReqeust.java b/src/main/java/com/glxp/api/req/inout/AddBizProductReqeust.java index 1dbec15b2..af2d1112d 100644 --- a/src/main/java/com/glxp/api/req/inout/AddBizProductReqeust.java +++ b/src/main/java/com/glxp/api/req/inout/AddBizProductReqeust.java @@ -3,12 +3,21 @@ package com.glxp.api.req.inout; import com.glxp.api.entity.inout.IoOrderEntity; import lombok.Data; +import java.util.List; + @Data public class AddBizProductReqeust { private IoOrderEntity orderEntity; + + //单选添加 private Long relId; private String zczbhhzbapzbh; private String supId; + private String batchNo; + private String productDate; + private String expireDate; + + List datas; //多选添加 } diff --git a/src/main/java/com/glxp/api/res/inout/IoOrderDetailBizResponse.java b/src/main/java/com/glxp/api/res/inout/IoOrderDetailBizResponse.java index 1dd3a3ed1..967640e88 100644 --- a/src/main/java/com/glxp/api/res/inout/IoOrderDetailBizResponse.java +++ b/src/main/java/com/glxp/api/res/inout/IoOrderDetailBizResponse.java @@ -115,12 +115,12 @@ public class IoOrderDetailBizResponse { /** * 单据数量 */ - private Integer count; + private int count; /** * 实际数量 */ - private Integer reCount; + private int reCount; /** * 备注 diff --git a/src/main/java/com/glxp/api/res/inout/IoOrderDetailResultResponse.java b/src/main/java/com/glxp/api/res/inout/IoOrderDetailResultResponse.java index 0d37582df..a48c1bb2f 100644 --- a/src/main/java/com/glxp/api/res/inout/IoOrderDetailResultResponse.java +++ b/src/main/java/com/glxp/api/res/inout/IoOrderDetailResultResponse.java @@ -115,12 +115,12 @@ public class IoOrderDetailResultResponse { /** * 单据数量 */ - private Integer count; + private int count; /** * 扫码数量 */ - private Integer reCount; + private int reCount; /** * 备注 diff --git a/src/main/java/com/glxp/api/res/inv/InvProductResponse.java b/src/main/java/com/glxp/api/res/inv/InvProductResponse.java index 45c5019c3..968c39f27 100644 --- a/src/main/java/com/glxp/api/res/inv/InvProductResponse.java +++ b/src/main/java/com/glxp/api/res/inv/InvProductResponse.java @@ -58,17 +58,17 @@ public class InvProductResponse { /** * 入库数量 */ - private Integer inCount; + private int inCount; /** * 出库数量 */ - private Integer outCount; + private int outCount; /** * 实际数量 */ - private Integer reCount; + private int reCount; /** * 客户ID diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 973044518..880c9196a 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -4,9 +4,9 @@ server: spring: datasource: driver-class-name: com.p6spy.engine.spy.P6SpyDriver - jdbc-url: jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true + jdbc-url: jdbc:p6spy:mysql://192.168.0.66:3364/udi_wms_wmd?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true username: root - password: 123456 + password: Glxp@6066 hikari: connection-timeout: 60000 maximum-pool-size: 60