From 17e03fb9a39011908647bc64a24abea4b20fda5b Mon Sep 17 00:00:00 2001 From: wj <1285151836@qq.com> Date: Mon, 10 Jul 2023 18:08:30 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/service/inout/IoAddInoutService.java | 26 +++++++++---------- .../service/inout/IoOrderUtilsService.java | 25 +++++------------- 2 files changed, 20 insertions(+), 31 deletions(-) diff --git a/src/main/java/com/glxp/api/service/inout/IoAddInoutService.java b/src/main/java/com/glxp/api/service/inout/IoAddInoutService.java index bd698209..8262b9d4 100644 --- a/src/main/java/com/glxp/api/service/inout/IoAddInoutService.java +++ b/src/main/java/com/glxp/api/service/inout/IoAddInoutService.java @@ -148,10 +148,10 @@ public class IoAddInoutService { List insertList = new ArrayList<>(); for (int j = 0; j < filterList.size(); j++) { - IoCodeTempEntity warehouseEntity = filterList.get(j); - String result = checkOrderRepeatCode(warehouseEntity, filterList); + IoCodeTempEntity ioCodeTempEntity = filterList.get(j); + String result = checkOrderRepeatCode(ioCodeTempEntity, filterList); if (result == null) { - insertList.add(warehouseEntity); + insertList.add(ioCodeTempEntity); } else { orderEntity.setStatus(ConstantStatus.ORDER_STATS_ERROR); orderEntity.setUpdateTime(new Date()); @@ -162,7 +162,7 @@ public class IoAddInoutService { if (bussinessTypeEntity.isCodeFillCheck()) { //三期校验 - String checkOriginMsg = checkOriginCode(warehouseEntity); + String checkOriginMsg = checkOriginCode(ioCodeTempEntity); if (StrUtil.isNotEmpty(checkOriginMsg)) { orderEntity.setErrMsg(checkOriginMsg); orderEntity.setStatus(ConstantStatus.ORDER_STATS_ERROR); @@ -175,48 +175,48 @@ public class IoAddInoutService { //产品是否已维护已关联 - if ((warehouseEntity.getRelId() == null)) { + if ((ioCodeTempEntity.getRelId() == null)) { orderEntity.setStatus(ConstantStatus.ORDER_STATS_ERROR); orderEntity.setUpdateTime(new Date()); - orderEntity.setErrMsg("udi码：" + warehouseEntity.getCode() + "上传时对照数据丢失,请选择对！"); + orderEntity.setErrMsg("udi码：" + ioCodeTempEntity.getCode() + "上传时对照数据丢失,请选择对！"); orderService.update(orderEntity); return; } //产品是否指定供应商 - if (StrUtil.isEmpty(warehouseEntity.getSupId())) { + if (StrUtil.isEmpty(ioCodeTempEntity.getSupId())) { orderEntity.setStatus(ConstantStatus.ORDER_STATS_ERROR); orderEntity.setUpdateTime(new Date()); - orderEntity.setErrMsg("udi码：" + warehouseEntity.getCode() + "未指定供应商！"); + orderEntity.setErrMsg("udi码：" + ioCodeTempEntity.getCode() + "未指定供应商！"); orderService.update(orderEntity); return; } //校验是否是当前供应商 if (bussinessTypeEntity.getCorpType() == ConstantStatus.CORP_TYPE_OUT) { - UdiRlSupEntity udiRlSupEntity = udiRlSupService.findByUdiRlIdUnitFk(warehouseEntity.getRelId() + "", orderEntity.getFromCorp()); + UdiRlSupEntity udiRlSupEntity = udiRlSupService.findByUdiRlIdUnitFk(ioCodeTempEntity.getRelId() + "", orderEntity.getFromCorp()); if (udiRlSupEntity == null) { orderEntity.setStatus(ConstantStatus.ORDER_STATS_ERROR); orderEntity.setUpdateTime(new Date()); - orderEntity.setErrMsg("udi码：" + warehouseEntity.getCode() + "当前供应商不存在此配送产品"); + orderEntity.setErrMsg("udi码：" + ioCodeTempEntity.getCode() + "当前供应商不存在此配送产品"); orderService.update(orderEntity); return; } } //产品是否可以以使用单元入库 - UdiRelevanceResponse udiRelevanceResponse = udiRelevanceService.selectGroupById(warehouseEntity.getRelId()); + UdiRelevanceResponse udiRelevanceResponse = udiRelevanceService.selectGroupById(ioCodeTempEntity.getRelId()); if (udiRelevanceResponse == null) { orderEntity.setStatus(ConstantStatus.ORDER_STATS_ERROR); orderEntity.setUpdateTime(new Date()); - orderEntity.setErrMsg("udi码：" + warehouseEntity.getCode() + "该产品信息未维护"); + orderEntity.setErrMsg("udi码：" + ioCodeTempEntity.getCode() + "该产品信息未维护"); orderService.update(orderEntity); return; } else if (!udiRelevanceResponse.getUseDy() && udiRelevanceResponse.getDiType() == ConstantStatus.DITYPE_SYDY) { orderEntity.setStatus(ConstantStatus.ORDER_STATS_ERROR); orderEntity.setUpdateTime(new Date()); - orderEntity.setErrMsg("udi码：" + warehouseEntity.getCode() + "该产品不允许以使用单元入库"); + orderEntity.setErrMsg("udi码：" + ioCodeTempEntity.getCode() + "该产品不允许以使用单元入库"); orderService.update(orderEntity); return; } diff --git a/src/main/java/com/glxp/api/service/inout/IoOrderUtilsService.java b/src/main/java/com/glxp/api/service/inout/IoOrderUtilsService.java index 4fa0cccf..4d765e11 100644 --- a/src/main/java/com/glxp/api/service/inout/IoOrderUtilsService.java +++ b/src/main/java/com/glxp/api/service/inout/IoOrderUtilsService.java @@ -1,36 +1,24 @@ package com.glxp.api.service.inout; +import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.net.URLDecoder; import cn.hutool.core.util.IdUtil; -import com.alibaba.fastjson.JSON; -import com.glxp.api.common.res.BaseResponse; -import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.constant.Constant; import com.glxp.api.dao.auth.AuthAdminDao; import com.glxp.api.dao.basic.UdiRlSupDao; import com.glxp.api.dao.inout.*; import com.glxp.api.entity.auth.AuthAdmin; -import com.glxp.api.entity.basic.UdiRlSupEntity; import com.glxp.api.entity.inout.*; -import com.glxp.api.idc.utils.IDCUtils; import com.glxp.api.req.basic.FilterCompanyProductRelevanceRequest; import com.glxp.api.req.inout.ioOrderUploadRequest; import com.glxp.api.res.inout.PlatformLinkResponse; import com.glxp.api.res.inout.ioUploadOrderResponse; -import com.glxp.api.util.BeanCopyUtils; -import com.glxp.api.util.FileUtils; import com.glxp.api.util.GennerOrderUtils; import com.glxp.api.util.OrderNoTypeBean; -import org.apache.catalina.User; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; -import java.io.IOException; import java.nio.charset.StandardCharsets; import java.util.*; @@ -88,15 +76,17 @@ public class IoOrderUtilsService { filterCompanyProductRelevanceRequest.setCustomerId(Long.valueOf(platformLinkRespons.getCustomerId())); filterCompanyProductRelevanceRequest.setNameCode(ioCodeTempEntity.getNameCode()); List udiRlSupEntityList = udiRlSupDao.filterCompanyProduct(filterCompanyProductRelevanceRequest); - if (udiRlSupEntityList != null && udiRlSupEntityList.size() == 0 || udiRlSupEntityList.size() > 1) { + if (CollectionUtil.isNotEmpty(udiRlSupEntityList) && udiRlSupEntityList.size() > 1) { ioCodeTempEntity1.setRelId(null); checkUdi = true; } else { - ioCodeTempEntity1.setRelId(udiRlSupEntityList.get(0).getId()); - map.put(ioCodeTempEntity.getRelId(), udiRlSupEntityList.get(0)); + if(CollectionUtil.isNotEmpty(udiRlSupEntityList)) { + ioCodeTempEntity1.setRelId(udiRlSupEntityList.get(0).getId()); + map.put(ioCodeTempEntity.getRelId(), udiRlSupEntityList.get(0)); + } ioCodeTempEntity1.setOrderId(billNO); - String code=URLDecoder.decode(ioCodeTempEntity.getCode(), StandardCharsets.UTF_8); + String code = URLDecoder.decode(ioCodeTempEntity.getCode(), StandardCharsets.UTF_8); ioCodeTempEntity1.setCode(code); ioCodeTempEntity1.setMainAction(ioCodeTempEntity.getMainAction()); ioCodeTempEntity1.setAction(platformLinkRespons.getTargetAction()); @@ -266,7 +256,6 @@ public class IoOrderUtilsService { ioOrderEntity1.setMainAction(ioOrderEntity.getMainAction()); ioOrderEntity1.setAction(platformLinkRespons.getTargetAction()); ioOrderEntity1.setFromCorp(ioOrderEntity.getFromCorp()); - ioOrderEntity1.setFromCorp(ioOrderEntity.getFromCorp()); ioOrderEntity1.setFromDeptCode(ioOrderEntity.getFromDeptCode()); ioOrderEntity1.setFromInvCode(ioOrderEntity.getFromInvCode()); ioOrderEntity1.setOrderType(3); From 8c885991b341420b7d4f54fc26fb5b6613c5b382 Mon Sep 17 00:00:00 2001 From: anthonywj Date: Mon, 10 Jul 2023 18:35:14 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E8=BF=87=E6=BB=A4=E8=BF=BD=E6=BA=AF?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=8D=95=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/controller/auth/LoginController.java | 1 - .../inout/IoOrderDetailResultController.java | 46 +++++++++---------- .../api/res/inout/CptTraceOrderResponse.java | 1 + .../mapper/inout/IoOrderDetailResultDao.xml | 3 +- 4 files changed, 26 insertions(+), 25 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/auth/LoginController.java b/src/main/java/com/glxp/api/controller/auth/LoginController.java index c7c68227..e10cf8c1 100644 --- a/src/main/java/com/glxp/api/controller/auth/LoginController.java +++ b/src/main/java/com/glxp/api/controller/auth/LoginController.java @@ -391,7 +391,6 @@ public class LoginController extends BaseController { @PostMapping("/spms/sub/inv/warehouse/addOrder") public BaseResponse addOrder(@RequestBody ioUploadOrderResponse ioUploadOrderRespons) { - ioOrderUtilsService.getIoder(ioUploadOrderRespons); return ResultVOUtils.success(); } diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailResultController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailResultController.java index cfa87eb8..8d1b671c 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailResultController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailResultController.java @@ -273,31 +273,31 @@ public class IoOrderDetailResultController extends BaseController { List cptTraceResultResponses = new ArrayList<>(); if (CollUtil.isNotEmpty(cptTraceOrderResponses)) { for (CptTraceOrderResponse cptTraceOrderResponse : cptTraceOrderResponses) { + if (cptTraceOrderResponse.getCorpType() == 1 || cptTraceOrderResponse.getCorpType() == 2) { + CptTraceResultResponse cptTraceResultResponse = new CptTraceResultResponse(); + cptTraceResultResponse.setBillNo(cptTraceOrderResponse.getBillNo()); + cptTraceResultResponse.setBillDate(DateUtil.formatDate(cptTraceOrderResponse.getCreateTime())); + cptTraceResultResponse.setBillType(cptTraceOrderResponse.getBillType()); + if (cptTraceOrderResponse.getMainAction().equals(ConstantType.TYPE_OUT)) { + if (StrUtil.isNotEmpty(cptTraceOrderResponse.getFromInvCode())) + continue; + cptTraceResultResponse.setInOutType(2); + cptTraceResultResponse.setFromCorp(authCompany.getName()); + cptTraceResultResponse.setFromCorpCreditNum(authCompany.getCreditCode()); - CptTraceResultResponse cptTraceResultResponse = new CptTraceResultResponse(); - cptTraceResultResponse.setBillNo(cptTraceOrderResponse.getBillNo()); - cptTraceResultResponse.setBillDate(DateUtil.formatDate(cptTraceOrderResponse.getCreateTime())); - cptTraceResultResponse.setBillType(cptTraceOrderResponse.getBillType()); - - if (cptTraceOrderResponse.getMainAction().equals(ConstantType.TYPE_OUT)) { - if (StrUtil.isNotEmpty(cptTraceOrderResponse.getFromInvCode())) - continue; - cptTraceResultResponse.setInOutType(2); - cptTraceResultResponse.setFromCorp(authCompany.getName()); - cptTraceResultResponse.setFromCorpCreditNum(authCompany.getCreditCode()); - - } else { - cptTraceResultResponse.setInOutType(1); - cptTraceResultResponse.setFromCorp(cptTraceOrderResponse.getFromCorpName()); - cptTraceResultResponse.setFromCorpCreditNum(cptTraceOrderResponse.getCreditNo()); - cptTraceResultResponse.setToCorp(authCompany.getName()); - cptTraceResultResponse.setToCorpCreditNum(authCompany.getCreditCode()); - } - if (StrUtil.isEmpty(cptTraceOrderResponse.getFromCorpName()) && cptTraceOrderResponse.getMainAction().equals(ConstantType.TYPE_OUT)) { - cptTraceResultResponse.setBillType("使用出库"); - cptTraceResultResponse.setToUserInfo("患者使用出库"); + } else { + cptTraceResultResponse.setInOutType(1); + cptTraceResultResponse.setFromCorp(cptTraceOrderResponse.getFromCorpName()); + cptTraceResultResponse.setFromCorpCreditNum(cptTraceOrderResponse.getCreditNo()); + cptTraceResultResponse.setToCorp(authCompany.getName()); + cptTraceResultResponse.setToCorpCreditNum(authCompany.getCreditCode()); + } + if (StrUtil.isEmpty(cptTraceOrderResponse.getFromCorpName()) && cptTraceOrderResponse.getMainAction().equals(ConstantType.TYPE_OUT)) { + cptTraceResultResponse.setBillType("使用出库"); + cptTraceResultResponse.setToUserInfo("患者使用出库"); + } + cptTraceResultResponses.add(cptTraceResultResponse); } - cptTraceResultResponses.add(cptTraceResultResponse); } } diff --git a/src/main/java/com/glxp/api/res/inout/CptTraceOrderResponse.java b/src/main/java/com/glxp/api/res/inout/CptTraceOrderResponse.java index 216c71f4..5f447ad1 100644 --- a/src/main/java/com/glxp/api/res/inout/CptTraceOrderResponse.java +++ b/src/main/java/com/glxp/api/res/inout/CptTraceOrderResponse.java @@ -16,4 +16,5 @@ public class CptTraceOrderResponse { private String action; private String fromInvCode; private Integer count; + private int corpType; } diff --git a/src/main/resources/mybatis/mapper/inout/IoOrderDetailResultDao.xml b/src/main/resources/mybatis/mapper/inout/IoOrderDetailResultDao.xml index a833da3d..8920fc30 100644 --- a/src/main/resources/mybatis/mapper/inout/IoOrderDetailResultDao.xml +++ b/src/main/resources/mybatis/mapper/inout/IoOrderDetailResultDao.xml @@ -85,7 +85,8 @@ basic_corp.`name` fromCorpName, basic_corp.creditNo, io.action, - io.fromInvCode + io.fromInvCode, + bbt.corpType from io_order_detail_result iodr INNER JOIN io_order io on iodr.orderIdFk = io.billNo left join basic_corp on io.fromCorp = basic_corp.erpId From 56347b42d55a493765bca7e437b6bbc4ad6bfc1f Mon Sep 17 00:00:00 2001 From: wj <1285151836@qq.com> Date: Mon, 10 Jul 2023 19:12:35 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/inout/IoOrderUtilsService.java | 63 ++++++++++--------- 1 file changed, 33 insertions(+), 30 deletions(-) diff --git a/src/main/java/com/glxp/api/service/inout/IoOrderUtilsService.java b/src/main/java/com/glxp/api/service/inout/IoOrderUtilsService.java index 4d765e11..5fd24c54 100644 --- a/src/main/java/com/glxp/api/service/inout/IoOrderUtilsService.java +++ b/src/main/java/com/glxp/api/service/inout/IoOrderUtilsService.java @@ -80,7 +80,7 @@ public class IoOrderUtilsService { ioCodeTempEntity1.setRelId(null); checkUdi = true; } else { - if(CollectionUtil.isNotEmpty(udiRlSupEntityList)) { + if (CollectionUtil.isNotEmpty(udiRlSupEntityList)) { ioCodeTempEntity1.setRelId(udiRlSupEntityList.get(0).getId()); map.put(ioCodeTempEntity.getRelId(), udiRlSupEntityList.get(0)); } @@ -110,41 +110,44 @@ public class IoOrderUtilsService { //扫码单据生成 IoOrderDetailCodeEntity ioOrderDetailCodeEntity1 = new IoOrderDetailCodeEntity(); List ioOrderDetailCodeEntities = new ArrayList<>(); - for (IoOrderDetailCodeEntity ioOrderDetailCodeEntity : ioOrderDetailCodeEntityList) { - ioOrderDetailCodeEntity1.setOrderIdFk(billNO); + if (CollectionUtil.isNotEmpty(ioOrderDetailCodeEntityList)) { + for (IoOrderDetailCodeEntity ioOrderDetailCodeEntity : ioOrderDetailCodeEntityList) { + ioOrderDetailCodeEntity1.setOrderIdFk(billNO); - ioOrderUploadRequest udiRlSupEntity = map.get(ioOrderDetailCodeEntity.getBindRlFk()); - if (udiRlSupEntity != null) { - ioOrderDetailCodeEntity1.setBindRlFk(udiRlSupEntity.getId()); - ioOrderDetailCodeEntity1.setUuidFk(udiRlSupEntity.getUdiRlIdFk() + ""); - } else { - ioOrderDetailCodeEntity1.setBindRlFk(null); - ioOrderDetailCodeEntity1.setUuidFk(null); + ioOrderUploadRequest udiRlSupEntity = map.get(ioOrderDetailCodeEntity.getBindRlFk()); + if (udiRlSupEntity != null) { + ioOrderDetailCodeEntity1.setBindRlFk(udiRlSupEntity.getId()); + ioOrderDetailCodeEntity1.setUuidFk(udiRlSupEntity.getUdiRlIdFk() + ""); + } else { + ioOrderDetailCodeEntity1.setBindRlFk(null); + ioOrderDetailCodeEntity1.setUuidFk(null); + } + ioOrderDetailCodeEntity1.setId(IdUtil.getSnowflakeNextId()); + ioOrderDetailCodeEntity1.setNameCode(ioOrderDetailCodeEntity.getNameCode()); + ioOrderDetailCodeEntity1.setBatchNo(ioOrderDetailCodeEntity.getBatchNo()); + ioOrderDetailCodeEntity1.setProductDate(ioOrderDetailCodeEntity.getProductDate()); + ioOrderDetailCodeEntity1.setExpireDate(ioOrderDetailCodeEntity.getExpireDate()); + ioOrderDetailCodeEntity1.setCoName(ioOrderDetailCodeEntity.getCoName()); + ioOrderDetailCodeEntity1.setCertCode(ioOrderDetailCodeEntity.getCertCode()); + ioOrderDetailCodeEntity1.setYlqxzcrbarmc(ioOrderDetailCodeEntity.getYlqxzcrbarmc()); + ioOrderDetailCodeEntity1.setManufacturer(ioOrderDetailCodeEntity.getManufacturer()); + ioOrderDetailCodeEntity1.setMeasname(ioOrderDetailCodeEntity.getMeasname()); + ioOrderDetailCodeEntity1.setPrice(ioOrderDetailCodeEntity.getPrice()); + ioOrderDetailCodeEntity1.setSpec(ioOrderDetailCodeEntity.getSpec()); + ioOrderDetailCodeEntity1.setCertCode(ioOrderDetailCodeEntity.getCertCode()); + ioOrderDetailCodeEntity1.setSupId(ioOrderDetailCodeEntity.getSupId()); + ioOrderDetailCodeEntity1.setBindSupStatus(ioOrderDetailCodeEntity.getBindSupStatus()); + ioOrderDetailCodeEntity1.setCount(ioOrderDetailCodeEntity.getCount()); + ioOrderDetailCodeEntity1.setReCount(ioOrderDetailCodeEntity.getReCount()); + ioOrderDetailCodeEntity1.setUpdateTime(new Date()); + ioOrderDetailCodeEntities.add(ioOrderDetailCodeEntity1); } - ioOrderDetailCodeEntity1.setId(IdUtil.getSnowflakeNextId()); - ioOrderDetailCodeEntity1.setNameCode(ioOrderDetailCodeEntity.getNameCode()); - ioOrderDetailCodeEntity1.setBatchNo(ioOrderDetailCodeEntity.getBatchNo()); - ioOrderDetailCodeEntity1.setProductDate(ioOrderDetailCodeEntity.getProductDate()); - ioOrderDetailCodeEntity1.setExpireDate(ioOrderDetailCodeEntity.getExpireDate()); - ioOrderDetailCodeEntity1.setCoName(ioOrderDetailCodeEntity.getCoName()); - ioOrderDetailCodeEntity1.setCertCode(ioOrderDetailCodeEntity.getCertCode()); - ioOrderDetailCodeEntity1.setYlqxzcrbarmc(ioOrderDetailCodeEntity.getYlqxzcrbarmc()); - ioOrderDetailCodeEntity1.setManufacturer(ioOrderDetailCodeEntity.getManufacturer()); - ioOrderDetailCodeEntity1.setMeasname(ioOrderDetailCodeEntity.getMeasname()); - ioOrderDetailCodeEntity1.setPrice(ioOrderDetailCodeEntity.getPrice()); - ioOrderDetailCodeEntity1.setSpec(ioOrderDetailCodeEntity.getSpec()); - ioOrderDetailCodeEntity1.setCertCode(ioOrderDetailCodeEntity.getCertCode()); - ioOrderDetailCodeEntity1.setSupId(ioOrderDetailCodeEntity.getSupId()); - ioOrderDetailCodeEntity1.setBindSupStatus(ioOrderDetailCodeEntity.getBindSupStatus()); - ioOrderDetailCodeEntity1.setCount(ioOrderDetailCodeEntity.getCount()); - ioOrderDetailCodeEntity1.setReCount(ioOrderDetailCodeEntity.getReCount()); - ioOrderDetailCodeEntity1.setUpdateTime(new Date()); - ioOrderDetailCodeEntities.add(ioOrderDetailCodeEntity1); } + //业务单生成 List ioOrderDetailBizEntities = new ArrayList<>(); - if (ioOrderDetailBizEntityList != null && ioOrderDetailBizEntityList.size() > 0) { + if (CollectionUtil.isNotEmpty(ioOrderDetailBizEntityList)) { for (IoOrderDetailBizEntity ioOrderDetailBizEntity : ioOrderDetailBizEntityList) { IoOrderDetailBizEntity ioOrderDetailBizEntity1 = new IoOrderDetailBizEntity(); ioOrderDetailBizEntity1.setOrderIdFk(billNO);