From 004dea36946c4f0fa6d77eeeceb4fea58b28a9a4 Mon Sep 17 00:00:00 2001 From: wj <1285151836@qq.com> Date: Fri, 5 May 2023 18:02:54 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E6=8B=89=E5=8F=96=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=89=B9=E6=AE=8A=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/glxp/api/service/sync/HeartService.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/main/java/com/glxp/api/service/sync/HeartService.java b/src/main/java/com/glxp/api/service/sync/HeartService.java index 641330c91..a5d89483d 100644 --- a/src/main/java/com/glxp/api/service/sync/HeartService.java +++ b/src/main/java/com/glxp/api/service/sync/HeartService.java @@ -1527,6 +1527,11 @@ public class HeartService { */ @Transactional(rollbackFor = Exception.class) public void pullData(BasicExportTypeEnum exportType) { + switch (exportType){ + case IO_ORDER: + case COUNTRY_DI_DATA: + return; + } Date startTime = new Date(); String data = spGetHttp.pullData(exportType); From 1e55b3ea9706ed4e3dc6688f1658747f3e74f75b Mon Sep 17 00:00:00 2001 From: wj <1285151836@qq.com> Date: Fri, 5 May 2023 18:35:19 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E5=9C=B0=E5=9D=80?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/glxp/api/http/sync/SpGetHttpClient.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/glxp/api/http/sync/SpGetHttpClient.java b/src/main/java/com/glxp/api/http/sync/SpGetHttpClient.java index fb99cc82e..fe7654fd8 100644 --- a/src/main/java/com/glxp/api/http/sync/SpGetHttpClient.java +++ b/src/main/java/com/glxp/api/http/sync/SpGetHttpClient.java @@ -244,7 +244,7 @@ public class SpGetHttpClient { } public BaseResponse testConnect() { - String response = okHttpCli.doGet(getIpUrl() + "/sps/sync/connect/test"); + String response = okHttpCli.doGet(getIpUrl() + "udispsync/sync/testConnection"); try { BaseResponse data = JSONObject.parseObject(response, new TypeReference>() { From 79c64f15f147e009e9c64222e77261a82187ca1e Mon Sep 17 00:00:00 2001 From: wj <1285151836@qq.com> Date: Fri, 5 May 2023 19:12:51 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E5=9C=B0=E5=9D=80?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/glxp/api/http/sync/SpGetHttpClient.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/glxp/api/http/sync/SpGetHttpClient.java b/src/main/java/com/glxp/api/http/sync/SpGetHttpClient.java index fe7654fd8..f85f07bda 100644 --- a/src/main/java/com/glxp/api/http/sync/SpGetHttpClient.java +++ b/src/main/java/com/glxp/api/http/sync/SpGetHttpClient.java @@ -244,7 +244,7 @@ public class SpGetHttpClient { } public BaseResponse testConnect() { - String response = okHttpCli.doGet(getIpUrl() + "udispsync/sync/testConnection"); + String response = okHttpCli.doGet(getIpUrl() + "/udispsync/sync/testConnection"); try { BaseResponse data = JSONObject.parseObject(response, new TypeReference>() { From 75077b05a4250521e3749686b73cdc809e9a04d8 Mon Sep 17 00:00:00 2001 From: anthonywj Date: Fri, 5 May 2023 19:47:38 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9=E3=80=82=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E9=80=89=E5=85=A5=E7=89=A9=E8=B5=84=E5=AD=97=E5=85=B8=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/constant/BasicExportTypeEnum.java | 7 + .../inout/IoOrderInvoiceController.java | 1 - .../inout/IoOrderReviewController.java | 29 +- .../sync/SyncDataSetController.java | 6 +- .../api/entity/basic/UdiProductEntity.java | 2 +- .../glxp/api/entity/inout/IoOrderEntity.java | 2 + .../glxp/api/http/sync/SpGetHttpClient.java | 14 + .../CompanyProductRelevanceResponse.java | 2 +- .../CompanyProductRelevanceServiceImpl.java | 3 + .../basic/impl/UdiProductServiceImpl.java | 4 + .../service/inout/IoCheckInoutService.java | 14 +- .../service/sync/SyncDataBustypeService.java | 2 + .../sync/impl/SyncDataBustypeServiceImpl.java | 8 +- src/main/java/com/glxp/api/util/DateUtil.java | 2 +- .../com/glxp/api/util/udi/UdiInfoUtil.java | 4 + .../basic/CompanyProductRelevanceDao.xml | 4 +- .../mybatis/mapper/basic/UdiProductDao.xml | 366 +++++++++--------- .../mapper/system/SyncDataBustypeDao.xml | 2 +- .../mybatis/mapper/system/SyncDataSetDao.xml | 4 +- src/main/resources/schemas/schema_v2.1.sql | 5 + 20 files changed, 282 insertions(+), 199 deletions(-) diff --git a/src/main/java/com/glxp/api/constant/BasicExportTypeEnum.java b/src/main/java/com/glxp/api/constant/BasicExportTypeEnum.java index 1eaf23981..34258cd70 100644 --- a/src/main/java/com/glxp/api/constant/BasicExportTypeEnum.java +++ b/src/main/java/com/glxp/api/constant/BasicExportTypeEnum.java @@ -47,6 +47,13 @@ public enum BasicExportTypeEnum { */ IO_ORDER("io_order", "单据信息"), + + /** + * 发票信息 + */ + ORDER_INVOICE("io_order_invoice", "扫码单据发票信息"), + + // // NEW_ALL_ORDER("all_order", "出入库扫码单据"), // ALL_BUS_ORDER("all_bus_order", "业务单据"), diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderInvoiceController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderInvoiceController.java index 22e5c62bc..71ee8ba3a 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderInvoiceController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderInvoiceController.java @@ -52,7 +52,6 @@ public class IoOrderInvoiceController { fileService.download(syncFiles); } } - return ResultVOUtils.success("更新成功！"); } else return baseResponse; diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderReviewController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderReviewController.java index c4288e722..44c66948d 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderReviewController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderReviewController.java @@ -137,6 +137,9 @@ public class IoOrderReviewController extends BaseController { transferOrder(orderEntity, entrustReceEntity); } } + + if (orderEntity.getFromType() == ConstantStatus.FROM_UDISP) + spGetHttp.reviewOrder(updateExportStatusRequest); return updateReview(getUser(), orderEntity); } else if (orderEntity.getStatus() == ConstantStatus.ORDER_STATUS_CHECK_SUCCESS) { return thirdUpdateReview(getUser(), orderEntity); @@ -452,7 +455,6 @@ public class IoOrderReviewController extends BaseController { String errMsg = checkReviewAuth(billNo, userId + ""); EntrustReceEntity entrustReceEntity; if (StrUtil.isNotEmpty(errMsg)) { - if (errMsg.equals("委托验收")) { IoOrderEntity orderEntity = orderService.findByBillNo(billNo); entrustReceEntity = entrustReceService.findByUnique(orderEntity.getAction(), userId); @@ -493,12 +495,19 @@ public class IoOrderReviewController extends BaseController { orderEntity = orderEntities.get(0); orderEntity.setUpdateTime(null); orderEntity.setFromType(ConstantStatus.FROM_UDISP); + orderEntity.setReviewSp(true); orderEntity.setStatus(ConstantStatus.ORDER_STATUS_PROCESS); IoOrderEntity temp = orderService.findByBillNo(orderEntity.getBillNo()); if (temp == null) { orderEntity.setId(null); orderService.insertOrder(orderEntity); heartService.insetOrderDb(spsSyncOrderResponse, orderEntity); + orderEntity = orderService.findByBillNo(orderEntity.getBillNo()); + addInoutService.dealProcess(orderEntity); + orderEntity = orderService.findByBillNo(orderEntity.getBillNo()); + if (orderEntity.getStatus() != ConstantStatus.ORDER_STATS_ERROR && !ioCheckInoutService.checkManual(orderEntity.getBillNo())) { + ioCheckInoutService.check(orderEntity.getBillNo()); + } } FilterOrderDetailResultRequest tempRequest = new FilterOrderDetailResultRequest(); tempRequest.setOrderIdFk(billNo); @@ -518,12 +527,30 @@ public class IoOrderReviewController extends BaseController { return ResultVOUtils.success(acceptOrderEntity); } + @Resource + IoAddInoutService addInoutService; + @Resource InvBusUserService invBusUserService; //校验用户是否验收权限 private String checkReviewAuth(String orderId, String userId) { IoOrderEntity orderEntity = orderService.findByBillNo(orderId); + + + if (orderEntity == null) { + ReviewSpmsRequest reviewSpmsRequest = new ReviewSpmsRequest(); + reviewSpmsRequest.setBillNo(orderId); + BaseResponse response = spGetHttp.getSimpleOrder(reviewSpmsRequest, userId); + if (response.getCode() == 20000 && response.getData() != null) { + orderEntity = response.getData(); + } else { + return "单据不存在！"; + } + + } + + if (orderEntity.getStatus() != ConstantStatus.ORDER_STATUS_CHECK_REW && orderEntity.getStatus() != ConstantStatus.ORDER_STATUS_CHECK_SUCCESS) { return "单据非未验收状态,无法审核！"; } diff --git a/src/main/java/com/glxp/api/controller/sync/SyncDataSetController.java b/src/main/java/com/glxp/api/controller/sync/SyncDataSetController.java index 99d832116..dbf15d44c 100644 --- a/src/main/java/com/glxp/api/controller/sync/SyncDataSetController.java +++ b/src/main/java/com/glxp/api/controller/sync/SyncDataSetController.java @@ -66,13 +66,15 @@ public class SyncDataSetController { syncDataSetEntity.setId(1); List busTypes = syncDataSetResponse.getBusTypes(); syncDataBustypeService.deleteAll(1); - if (CollUtil.isNotEmpty(busTypes)) + if (CollUtil.isNotEmpty(busTypes)) { syncDataBustypeService.inserts(busTypes); + } List toInBusTypes = syncDataSetResponse.getToInBusTypes(); syncDataBustypeService.deleteAll(2); - if (CollUtil.isNotEmpty(toInBusTypes)) + if (CollUtil.isNotEmpty(toInBusTypes)) { syncDataBustypeService.inserts(toInBusTypes); + } if (CollUtil.isNotEmpty(syncDataSetResponse.getChangeBusTypes())) { diff --git a/src/main/java/com/glxp/api/entity/basic/UdiProductEntity.java b/src/main/java/com/glxp/api/entity/basic/UdiProductEntity.java index 24c02c935..cfc6a11fb 100644 --- a/src/main/java/com/glxp/api/entity/basic/UdiProductEntity.java +++ b/src/main/java/com/glxp/api/entity/basic/UdiProductEntity.java @@ -79,7 +79,7 @@ public class UdiProductEntity { private String supId; - private Integer relSupId; + private Long relSupId; public Boolean getAllowNoBatch() { diff --git a/src/main/java/com/glxp/api/entity/inout/IoOrderEntity.java b/src/main/java/com/glxp/api/entity/inout/IoOrderEntity.java index a288d1b72..b5eaaf711 100644 --- a/src/main/java/com/glxp/api/entity/inout/IoOrderEntity.java +++ b/src/main/java/com/glxp/api/entity/inout/IoOrderEntity.java @@ -195,6 +195,8 @@ public class IoOrderEntity { @TableField(value = "entrustEnd") private boolean entrustEnd; + @TableField(value = "reviewSp") + private boolean reviewSp; //是否验收外网单据时，需忽略流转更改为待审核 /** diff --git a/src/main/java/com/glxp/api/http/sync/SpGetHttpClient.java b/src/main/java/com/glxp/api/http/sync/SpGetHttpClient.java index f85f07bda..3fb84dd79 100644 --- a/src/main/java/com/glxp/api/http/sync/SpGetHttpClient.java +++ b/src/main/java/com/glxp/api/http/sync/SpGetHttpClient.java @@ -10,6 +10,7 @@ import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.constant.BasicExportTypeEnum; import com.glxp.api.entity.basic.ProductInfoEntity; +import com.glxp.api.entity.inout.IoOrderEntity; import com.glxp.api.entity.inout.IoOrderInvoiceEntity; import com.glxp.api.entity.sync.BasicExportStatusEntity; import com.glxp.api.entity.sync.IOOrderStatusEntity; @@ -125,6 +126,19 @@ public class SpGetHttpClient { } + public BaseResponse getSimpleOrder(ReviewSpmsRequest reviewSpmsRequest, String userId) { + String json = JSONUtil.toJsonStr(reviewSpmsRequest); + List header = (List) Convert.toList(buildHeader()); + header.add("ADMIN_ID"); + header.add(userId); + String result = okHttpCli.doPostJson(getIpUrl() + "/directToSpms" + "/udiwms/order/getSimpleOrder", json, Convert.toStrArray(header)); + BaseResponse response = + JSONObject.parseObject(result, new TypeReference>() { + }); + return response; + } + + public BaseResponse> getIoOrderInvoices(RefreshInoiceRequest refreshInoiceRequest) { String json = JSONUtil.toJsonStr(refreshInoiceRequest); String result = okHttpCli.doPostJson(getIpUrl() + "/directToSpms" + "/udiwms/inout/order/refrshInvoice", json, buildHeader()); diff --git a/src/main/java/com/glxp/api/res/basic/CompanyProductRelevanceResponse.java b/src/main/java/com/glxp/api/res/basic/CompanyProductRelevanceResponse.java index c123629d1..f9f051b79 100644 --- a/src/main/java/com/glxp/api/res/basic/CompanyProductRelevanceResponse.java +++ b/src/main/java/com/glxp/api/res/basic/CompanyProductRelevanceResponse.java @@ -5,7 +5,7 @@ import lombok.Data; @Data public class CompanyProductRelevanceResponse { - private int id; + private Long id; private Integer rlId; private String thirdId; private String thirdName; diff --git a/src/main/java/com/glxp/api/service/basic/impl/CompanyProductRelevanceServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/CompanyProductRelevanceServiceImpl.java index e5a3192d6..238cfe694 100644 --- a/src/main/java/com/glxp/api/service/basic/impl/CompanyProductRelevanceServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/CompanyProductRelevanceServiceImpl.java @@ -1,6 +1,7 @@ package com.glxp.api.service.basic.impl; +import cn.hutool.core.util.IdUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.pagehelper.PageHelper; @@ -39,6 +40,8 @@ public class CompanyProductRelevanceServiceImpl extends ServiceImpl void inserts(List syncDataBustypeEntities); + boolean isExits(List syncDataBustypeEntities, Integer direct); + } diff --git a/src/main/java/com/glxp/api/service/sync/impl/SyncDataBustypeServiceImpl.java b/src/main/java/com/glxp/api/service/sync/impl/SyncDataBustypeServiceImpl.java index 9843187b8..3425932d1 100644 --- a/src/main/java/com/glxp/api/service/sync/impl/SyncDataBustypeServiceImpl.java +++ b/src/main/java/com/glxp/api/service/sync/impl/SyncDataBustypeServiceImpl.java @@ -13,7 +13,7 @@ import java.util.List; @Service @Transactional(rollbackFor = Exception.class) -public class SyncDataBustypeServiceImpl extends ServiceImpl implements SyncDataBustypeService { +public class SyncDataBustypeServiceImpl extends ServiceImpl implements SyncDataBustypeService { @Resource SyncDataBustypeDao syncDataBustypeDao; @@ -32,4 +32,10 @@ public class SyncDataBustypeServiceImpl extends ServiceImpl syncDataBustypeEntities) { syncDataBustypeDao.inserts(syncDataBustypeEntities); } + + @Override + public boolean isExits(List syncDataBustypeEntities, Integer direct) { +// + return false; + } } diff --git a/src/main/java/com/glxp/api/util/DateUtil.java b/src/main/java/com/glxp/api/util/DateUtil.java index 7025d2498..252b66bd6 100644 --- a/src/main/java/com/glxp/api/util/DateUtil.java +++ b/src/main/java/com/glxp/api/util/DateUtil.java @@ -61,7 +61,7 @@ public class DateUtil extends DateUtils { * 得到日期时间字符串，转换格式（yyyy-MM-dd HH:mm:ss） */ public static String formatDateTime(Date date) { - Date currentTime = new Date(); + Date currentTime = date; SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); String dateString = formatter.format(currentTime); return dateString; diff --git a/src/main/java/com/glxp/api/util/udi/UdiInfoUtil.java b/src/main/java/com/glxp/api/util/udi/UdiInfoUtil.java index 5a10803e6..edc68538c 100644 --- a/src/main/java/com/glxp/api/util/udi/UdiInfoUtil.java +++ b/src/main/java/com/glxp/api/util/udi/UdiInfoUtil.java @@ -1,6 +1,7 @@ package com.glxp.api.util.udi; import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.StrUtil; import com.glxp.api.constant.ConstantStatus; import com.glxp.api.entity.basic.UdiProductEntity; @@ -26,6 +27,9 @@ public class UdiInfoUtil { public static List initUdiInfoEntitys(List udiProductEntities) { if (CollUtil.isNotEmpty(udiProductEntities)) { for (UdiProductEntity udiProductEntity : udiProductEntities) { + if (udiProductEntity.getId() == null) { + udiProductEntity.setId(IdUtil.getSnowflakeNextId()); + } udiProductEntity.setProductType(ConstantStatus.PRODUCT_TYPE_UDI); if (StrUtil.isNotEmpty(udiProductEntity.getScbssfbhph()) && "否".equals(udiProductEntity.getScbssfbhph())) { udiProductEntity.setAllowNoBatch(true); diff --git a/src/main/resources/mybatis/mapper/basic/CompanyProductRelevanceDao.xml b/src/main/resources/mybatis/mapper/basic/CompanyProductRelevanceDao.xml index 8004250ef..ec4bb3113 100644 --- a/src/main/resources/mybatis/mapper/basic/CompanyProductRelevanceDao.xml +++ b/src/main/resources/mybatis/mapper/basic/CompanyProductRelevanceDao.xml @@ -5,10 +5,10 @@ replace - INTO company_product_relevance(customerId, productId, enterpriseId, registrationId, + INTO company_product_relevance(id, customerId, productId, enterpriseId, registrationId, createTime, updateTime, auditStatus, productUuid, udiRlIdFk, unitFk, price) - values (#{customerId}, + values (#{id}, #{customerId}, #{productId}, #{enterpriseId}, #{registrationId}, diff --git a/src/main/resources/mybatis/mapper/basic/UdiProductDao.xml b/src/main/resources/mybatis/mapper/basic/UdiProductDao.xml index 8a2886cfb..1b8aa14f5 100644 --- a/src/main/resources/mybatis/mapper/basic/UdiProductDao.xml +++ b/src/main/resources/mybatis/mapper/basic/UdiProductDao.xml @@ -31,66 +31,66 @@ @@ -165,134 +164,134 @@ replace - INTO basic_products - (uuid, originUuid, nameCode, deviceRecordKey, packRatio, packLevel, packUnit, bhxjsl, bhzxxsbzsl, - zxxsbzbhsydysl, bhxjcpbm, bzcj, cpmctymc, cplb, flbm, ggxh, qxlb, tyshxydm, - ylqxzcrbarmc, zczbhhzbapzbh, ylqxzcrbarywmc, sydycpbs, sjcpbm, versionNumber, diType, ybbm, sptm, - manufactory, measname, productType, scbssfbhph, scbssfbhxlh, scbssfbhscrq, scbssfbhsxrq, cpms, - allowNoBatch, allowNoExpire, - allowNoProduct, allowNoSerial, spmc, cplx, hchzsb, cpdls, price, basicPrductRemak1, basicPrductRemak2, - basicPrductRemak3, basicPrductRemak4, basicPrductRemak5, basicPrductRemak6, basicPrductRemak7, - basicPrductRemak8) - values (#{uuid}, - #{originUuid}, - #{nameCode}, - #{deviceRecordKey}, - #{packRatio}, - #{packLevel}, - #{packUnit}, - #{bhxjsl}, - #{bhzxxsbzsl }, - #{zxxsbzbhsydysl}, - #{bhxjcpbm}, - #{bzcj}, - #{cpmctymc}, - #{cplb}, - #{flbm}, - #{ggxh}, - #{qxlb}, - #{tyshxydm}, - #{ylqxzcrbarmc}, - #{zczbhhzbapzbh}, - #{ylqxzcrbarywmc}, - #{sydycpbs}, - #{sjcpbm}, - #{versionNumber}, - #{diType}, - #{ybbm}, - #{sptm}, - #{manufactory}, - #{measname}, - #{productType}, - #{scbssfbhph}, - #{scbssfbhxlh}, - #{scbssfbhscrq}, - #{scbssfbhsxrq}, - #{cpms}, - #{allowNoBatch}, - #{allowNoExpire}, - #{allowNoProduct}, #{allowNoSerial}, - #{spmc}, - #{cplx}, - #{hchzsb}, - #{cpdls}, - #{price}, - #{basicPrductRemak1}, - #{basicPrductRemak2}, - #{basicPrductRemak3}, - #{basicPrductRemak4}, - #{basicPrductRemak5}, - #{basicPrductRemak6}, - #{basicPrductRemak7}, - #{basicPrductRemak8}) + INTO basic_products + (id, uuid, originUuid, nameCode, deviceRecordKey, packRatio, packLevel, packUnit, bhxjsl, bhzxxsbzsl, + zxxsbzbhsydysl, bhxjcpbm, bzcj, cpmctymc, cplb, flbm, ggxh, qxlb, tyshxydm, + ylqxzcrbarmc, zczbhhzbapzbh, ylqxzcrbarywmc, sydycpbs, sjcpbm, versionNumber, diType, ybbm, sptm, + manufactory, measname, productType, scbssfbhph, scbssfbhxlh, scbssfbhscrq, scbssfbhsxrq, cpms, + allowNoBatch, allowNoExpire, + allowNoProduct, allowNoSerial, spmc, cplx, hchzsb, cpdls, price, basicPrductRemak1, basicPrductRemak2, + basicPrductRemak3, basicPrductRemak4, basicPrductRemak5, basicPrductRemak6, basicPrductRemak7, + basicPrductRemak8) + values (#{id}, #{uuid}, + #{originUuid}, + #{nameCode}, + #{deviceRecordKey}, + #{packRatio}, + #{packLevel}, + #{packUnit}, + #{bhxjsl}, + #{bhzxxsbzsl }, + #{zxxsbzbhsydysl}, + #{bhxjcpbm}, + #{bzcj}, + #{cpmctymc}, + #{cplb}, + #{flbm}, + #{ggxh}, + #{qxlb}, + #{tyshxydm}, + #{ylqxzcrbarmc}, + #{zczbhhzbapzbh}, + #{ylqxzcrbarywmc}, + #{sydycpbs}, + #{sjcpbm}, + #{versionNumber}, + #{diType}, + #{ybbm}, + #{sptm}, + #{manufactory}, + #{measname}, + #{productType}, + #{scbssfbhph}, + #{scbssfbhxlh}, + #{scbssfbhscrq}, + #{scbssfbhsxrq}, + #{cpms}, + #{allowNoBatch}, + #{allowNoExpire}, + #{allowNoProduct}, #{allowNoSerial}, + #{spmc}, + #{cplx}, + #{hchzsb}, + #{cpdls}, + #{price}, + #{basicPrductRemak1}, + #{basicPrductRemak2}, + #{basicPrductRemak3}, + #{basicPrductRemak4}, + #{basicPrductRemak5}, + #{basicPrductRemak6}, + #{basicPrductRemak7}, + #{basicPrductRemak8}) replace INTO basic_products - (id,uuid, originUuid, nameCode, deviceRecordKey, packRatio, packLevel, packUnit, bhxjsl, bhzxxsbzsl, - zxxsbzbhsydysl, bhxjcpbm, bzcj, cpmctymc, cplb, flbm, ggxh, qxlb, tyshxydm, - ylqxzcrbarmc, zczbhhzbapzbh, ylqxzcrbarywmc, sydycpbs, sjcpbm, versionNumber, diType, ybbm, sptm, - manufactory, measname, productType, scbssfbhph, scbssfbhxlh, scbssfbhscrq, scbssfbhsxrq, cpms, - allowNoBatch, allowNoExpire, - allowNoProduct, allowNoSerial, spmc, cplx, hchzsb, cpdls, price, basicPrductRemak1, basicPrductRemak2, - basicPrductRemak3, basicPrductRemak4, basicPrductRemak5, basicPrductRemak6, basicPrductRemak7, - basicPrductRemak8) - values + (id, uuid, originUuid, nameCode, deviceRecordKey, packRatio, packLevel, packUnit, bhxjsl, bhzxxsbzsl, + zxxsbzbhsydysl, bhxjcpbm, bzcj, cpmctymc, cplb, flbm, ggxh, qxlb, tyshxydm, + ylqxzcrbarmc, zczbhhzbapzbh, ylqxzcrbarywmc, sydycpbs, sjcpbm, versionNumber, diType, ybbm, sptm, + manufactory, measname, productType, scbssfbhph, scbssfbhxlh, scbssfbhscrq, scbssfbhsxrq, cpms, + allowNoBatch, allowNoExpire, + allowNoProduct, allowNoSerial, spmc, cplx, hchzsb, cpdls, price, basicPrductRemak1, basicPrductRemak2, + basicPrductRemak3, basicPrductRemak4, basicPrductRemak5, basicPrductRemak6, basicPrductRemak7, + basicPrductRemak8) + values (#{item.id}, #{item.uuid}, - #{item.originUuid}, - #{item.nameCode}, - #{item.deviceRecordKey}, - #{item.packRatio}, - #{item.packLevel}, - #{item.packUnit}, - #{item.bhxjsl}, - #{item.bhzxxsbzsl}, - #{item.zxxsbzbhsydysl}, - #{item.bhxjcpbm}, - #{item.bzcj}, - #{item.cpmctymc}, - #{item.cplb}, - #{item.flbm}, - #{item.ggxh}, - #{item.qxlb}, - #{item.tyshxydm}, - #{item.ylqxzcrbarmc}, - #{item.zczbhhzbapzbh}, - #{item.ylqxzcrbarywmc}, - #{item.sydycpbs}, - #{item.sjcpbm}, - #{item.versionNumber}, - #{item.diType}, - #{item.ybbm}, - #{item.sptm}, - #{item.manufactory}, - #{item.measname}, - #{item.productType}, - #{item.scbssfbhph}, - #{item.scbssfbhxlh}, - #{item.scbssfbhscrq}, - #{item.scbssfbhsxrq}, - #{item.cpms}, - #{item.allowNoBatch}, - #{item.allowNoExpire}, - #{item.allowNoProduct}, #{item.allowNoSerial}, - #{item.spmc}, - #{item.cplx}, - #{item.hchzsb}, - #{item.cpdls}, - #{item.price}, - #{item.basicPrductRemak1}, - #{item.basicPrductRemak2}, - #{item.basicPrductRemak3}, - #{item.basicPrductRemak4}, - #{item.basicPrductRemak5}, - #{item.basicPrductRemak6}, - #{item.basicPrductRemak7}, - #{item.basicPrductRemak8}) + #{item.originUuid}, + #{item.nameCode}, + #{item.deviceRecordKey}, + #{item.packRatio}, + #{item.packLevel}, + #{item.packUnit}, + #{item.bhxjsl}, + #{item.bhzxxsbzsl}, + #{item.zxxsbzbhsydysl}, + #{item.bhxjcpbm}, + #{item.bzcj}, + #{item.cpmctymc}, + #{item.cplb}, + #{item.flbm}, + #{item.ggxh}, + #{item.qxlb}, + #{item.tyshxydm}, + #{item.ylqxzcrbarmc}, + #{item.zczbhhzbapzbh}, + #{item.ylqxzcrbarywmc}, + #{item.sydycpbs}, + #{item.sjcpbm}, + #{item.versionNumber}, + #{item.diType}, + #{item.ybbm}, + #{item.sptm}, + #{item.manufactory}, + #{item.measname}, + #{item.productType}, + #{item.scbssfbhph}, + #{item.scbssfbhxlh}, + #{item.scbssfbhscrq}, + #{item.scbssfbhsxrq}, + #{item.cpms}, + #{item.allowNoBatch}, + #{item.allowNoExpire}, + #{item.allowNoProduct}, #{item.allowNoSerial}, + #{item.spmc}, + #{item.cplx}, + #{item.hchzsb}, + #{item.cpdls}, + #{item.price}, + #{item.basicPrductRemak1}, + #{item.basicPrductRemak2}, + #{item.basicPrductRemak3}, + #{item.basicPrductRemak4}, + #{item.basicPrductRemak5}, + #{item.basicPrductRemak6}, + #{item.basicPrductRemak7}, + #{item.basicPrductRemak8}) @@ -468,7 +467,7 @@ WHERE nameCode = #{nameCode} - and uuid = #{uuid} + and uuid = #{uuid} @@ -818,7 +817,7 @@ @@ -957,6 +956,9 @@ diff --git a/src/main/resources/mybatis/mapper/system/SyncDataBustypeDao.xml b/src/main/resources/mybatis/mapper/system/SyncDataBustypeDao.xml index c1e129562..f24f9cc8d 100644 --- a/src/main/resources/mybatis/mapper/system/SyncDataBustypeDao.xml +++ b/src/main/resources/mybatis/mapper/system/SyncDataBustypeDao.xml @@ -10,7 +10,7 @@ - insert INTO sync_data_bustypes + replace INTO sync_data_bustypes (id, `action`, `name`, outChange, orderStatus, direct) values diff --git a/src/main/resources/mybatis/mapper/system/SyncDataSetDao.xml b/src/main/resources/mybatis/mapper/system/SyncDataSetDao.xml index 3f0674600..bf4cc4f77 100644 --- a/src/main/resources/mybatis/mapper/system/SyncDataSetDao.xml +++ b/src/main/resources/mybatis/mapper/system/SyncDataSetDao.xml @@ -22,7 +22,7 @@ , unCheckCert, checkedCert, companyCert, manufacturerCert, productCert, basicDept , systemConfig , printConfig, scanChangeConfig, supCert, dbDiCompany, busChangeConfig - , udiCodeLost, udiCodeRel, orderInvoice) + , udiCodeLost, udiCodeRel, orderInvoice, orderToInSyncTime, orderSyncDlTime) values (#{id}, #{typeBus}, #{typeScan}, @@ -51,6 +51,6 @@ #{unCheckCert}, #{checkedCert}, #{companyCert}, #{manufacturerCert}, #{productCert}, #{basicDept}, #{systemConfig}, #{printConfig}, #{scanChangeConfig}, #{supCert}, #{dbDiCompany}, #{busChangeConfig}, - #{udiCodeLost}, #{udiCodeRel}, #{orderInvoice}) + #{udiCodeLost}, #{udiCodeRel}, #{orderInvoice}, #{orderToInSyncTime}, #{orderSyncDlTime}) diff --git a/src/main/resources/schemas/schema_v2.1.sql b/src/main/resources/schemas/schema_v2.1.sql index 5aac2b887..6e83a6fcb 100644 --- a/src/main/resources/schemas/schema_v2.1.sql +++ b/src/main/resources/schemas/schema_v2.1.sql @@ -393,3 +393,8 @@ CALL Pro_Temp_ColumnWork('sup_cert', 'filePath', 'text', 2); CALL Pro_Temp_ColumnWork('sync_data_bustypes', 'id', 'bigint', 2); CALL Pro_Temp_ColumnWork('io_order_invoice', 'id', 'bigint ', 2); CALL Pro_Temp_ColumnWork('sync_data_set', 'orderInvoice', 'tinyint', 1); + +CALL Pro_Temp_ColumnWork('io_order', 'regStatus', 'tinyint', 1); +CALL Pro_Temp_ColumnWork('io_order', 'reviewSp', 'tinyint', 1); + +CALL Pro_Temp_ColumnWork('io_order_detail_biz', 'regStatus', 'tinyint', 1); From 9ac295028b98e51d3a6f3ea851611aa6f05a7109 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com> Date: Fri, 5 May 2023 20:31:04 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E7=89=A9=E8=B4=A8=E6=91=86=E6=94=BE?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/inv/InvPlaceController.java | 43 ++- .../api/dao/inv/InvPlaceOrderDetailDao.java | 7 + .../api/dao/inv/InvPreInProductDetailDao.java | 2 + .../api/dao/inv/InvPreProductDetailDao.java | 2 + .../glxp/api/dao/inv/InvProductDetailDao.java | 2 + .../entity/inv/InvPlaceOrderDetailEntity.java | 4 +- .../api/entity/inv/InvPlaceOrderEntity.java | 4 +- .../res/inv/InvPlaceOrderDetailResponse.java | 2 + .../api/service/inv/InvPlaceOrderService.java | 10 + .../glxp/api/service/inv/InvPlaceService.java | 8 +- .../inv/impl/InvPlaceOrderServiceImpl.java | 82 +++++ .../service/inv/impl/InvPlaceServiceImpl.java | 314 ++++++++++++++---- .../mapper/inv/InvPlaceOrderDetailDao.xml | 29 ++ .../mapper/inv/InvPreInProductDetailDao.xml | 12 + .../mapper/inv/InvPreProductDetailDao.xml | 11 + .../mapper/inv/invProductDetailDao.xml | 11 + 16 files changed, 462 insertions(+), 81 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/inv/InvPlaceController.java b/src/main/java/com/glxp/api/controller/inv/InvPlaceController.java index d801f9bb6..a904b35ca 100644 --- a/src/main/java/com/glxp/api/controller/inv/InvPlaceController.java +++ b/src/main/java/com/glxp/api/controller/inv/InvPlaceController.java @@ -6,10 +6,15 @@ import com.github.pagehelper.PageInfo; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; +import com.glxp.api.dao.inv.InvPlaceOrderDetailDao; +import com.glxp.api.entity.inv.InvPlaceOrderDetailEntity; +import com.glxp.api.req.inv.FilterInvPlaceOrderRequest; import com.glxp.api.req.inv.FilterInvPlaceRequest; import com.glxp.api.res.inout.IoOrderResponse; import com.glxp.api.res.inv.BindInvSpaceRequest; import com.glxp.api.res.inv.InvPlaceDetailResponse; +import com.glxp.api.res.inv.InvPlaceOrderDetailResponse; +import com.glxp.api.service.inv.InvPlaceOrderService; import com.glxp.api.service.inv.InvPlaceService; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; @@ -18,6 +23,7 @@ import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; import javax.validation.Valid; +import java.util.ArrayList; import java.util.List; /** @@ -28,6 +34,10 @@ public class InvPlaceController { @Resource private InvPlaceService invPlaceService; + @Resource + private InvPlaceOrderService invPlaceOrderService; + + /** * 查询库存摆放记录 @@ -48,7 +58,7 @@ public class InvPlaceController { * @return */ @PostMapping("/spms/inv/product/bindInvSpace") - public BaseResponse bindInvSpace(@RequestBody @Valid BindInvSpaceRequest bindInvSpaceRequest) { + public BaseResponse bindInvSpace(@RequestBody BindInvSpaceRequest bindInvSpaceRequest) { if (null == bindInvSpaceRequest) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); } @@ -87,15 +97,21 @@ public class InvPlaceController { /** * 查询库存产品信息 * - * @param filterInvPlaceRequest + * @param bindInvSpaceRequest * @return */ @GetMapping("/spms/inv/product/getInvProductInfo") - private BaseResponse getInvProductInfo(FilterInvPlaceRequest filterInvPlaceRequest) { - List list = invPlaceService.getInvProductInfo(filterInvPlaceRequest); - if (CollUtil.isEmpty(list)) - return ResultVOUtils.error(500, "库存未找到产品信息！"); - return ResultVOUtils.success(list); + private BaseResponse getInvProductInfo(BindInvSpaceRequest bindInvSpaceRequest) { + List list = new ArrayList<>(); + //判断有没有库存 + String msg=invPlaceService.checkCount(bindInvSpaceRequest); + if(StrUtil.isEmpty(msg)){ + //有库存做插入货位号 + return invPlaceOrderService.bindInvSpaceOne(bindInvSpaceRequest); + }else{ + return ResultVOUtils.error(500, msg); + } + } /** @@ -114,4 +130,17 @@ public class InvPlaceController { return ResultVOUtils.page(pageInfo); } + /** + * 查询货架详情 + * + * @return + */ + @GetMapping("/spms/inv/product/getInvPlaceOrderDetailList") + public BaseResponse getInvPlaceOrderDetailList(FilterInvPlaceOrderRequest filterInvPlaceOrderRequest) { + List list = invPlaceOrderService.filterInvPlaceOrderDetailList(filterInvPlaceOrderRequest); + PageInfo pageInfo = new PageInfo<>(list); + return ResultVOUtils.page(pageInfo); + } + + } diff --git a/src/main/java/com/glxp/api/dao/inv/InvPlaceOrderDetailDao.java b/src/main/java/com/glxp/api/dao/inv/InvPlaceOrderDetailDao.java index cd680d171..73fbd679d 100644 --- a/src/main/java/com/glxp/api/dao/inv/InvPlaceOrderDetailDao.java +++ b/src/main/java/com/glxp/api/dao/inv/InvPlaceOrderDetailDao.java @@ -2,7 +2,14 @@ package com.glxp.api.dao.inv; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.glxp.api.entity.inv.InvPlaceOrderDetailEntity; +import com.glxp.api.res.inout.IoOrderResponse; +import com.glxp.api.res.inv.InvPlaceOrderDetailResponse; +import org.apache.ibatis.annotations.Param; + +import java.util.List; public interface InvPlaceOrderDetailDao extends BaseMapper { + List selectDetailList(@Param("recordId") String recordId); + } \ No newline at end of file diff --git a/src/main/java/com/glxp/api/dao/inv/InvPreInProductDetailDao.java b/src/main/java/com/glxp/api/dao/inv/InvPreInProductDetailDao.java index 042a9fecd..d4f1859d0 100644 --- a/src/main/java/com/glxp/api/dao/inv/InvPreInProductDetailDao.java +++ b/src/main/java/com/glxp/api/dao/inv/InvPreInProductDetailDao.java @@ -44,4 +44,6 @@ public interface InvPreInProductDetailDao extends BaseMapperPlus getInvPlaceOrderList(FilterInvPlaceRequest filterInvPlaceRequest); + Integer getInventoryQuantity(@Param("code") String code); + } diff --git a/src/main/java/com/glxp/api/dao/inv/InvPreProductDetailDao.java b/src/main/java/com/glxp/api/dao/inv/InvPreProductDetailDao.java index 3821caa7c..15972bf6b 100644 --- a/src/main/java/com/glxp/api/dao/inv/InvPreProductDetailDao.java +++ b/src/main/java/com/glxp/api/dao/inv/InvPreProductDetailDao.java @@ -43,4 +43,6 @@ public interface InvPreProductDetailDao extends BaseMapperPlus ids, @Param("invSpaceCode") String invSpaceCode); List getInvPlaceOrderList(FilterInvPlaceRequest filterInvPlaceRequest); + + Integer getInventoryQuantity(@Param("code") String code); } diff --git a/src/main/java/com/glxp/api/dao/inv/InvProductDetailDao.java b/src/main/java/com/glxp/api/dao/inv/InvProductDetailDao.java index 56ed96199..789eee944 100644 --- a/src/main/java/com/glxp/api/dao/inv/InvProductDetailDao.java +++ b/src/main/java/com/glxp/api/dao/inv/InvProductDetailDao.java @@ -96,4 +96,6 @@ public interface InvProductDetailDao extends BaseMapperPlus getInvPlaceOrderList(FilterInvPlaceRequest filterInvPlaceRequest); + + Integer getInventoryQuantity(@Param("code") String code); } diff --git a/src/main/java/com/glxp/api/entity/inv/InvPlaceOrderDetailEntity.java b/src/main/java/com/glxp/api/entity/inv/InvPlaceOrderDetailEntity.java index 25790de33..72771ce39 100644 --- a/src/main/java/com/glxp/api/entity/inv/InvPlaceOrderDetailEntity.java +++ b/src/main/java/com/glxp/api/entity/inv/InvPlaceOrderDetailEntity.java @@ -10,8 +10,8 @@ import lombok.Data; @TableName(value = "inv_place_order_detail") public class InvPlaceOrderDetailEntity { - @TableId(value = "id", type = IdType.AUTO) - private Integer id; + + private Long id; /** * 上架记录号 diff --git a/src/main/java/com/glxp/api/entity/inv/InvPlaceOrderEntity.java b/src/main/java/com/glxp/api/entity/inv/InvPlaceOrderEntity.java index 19d811dd7..c8d3cf1e7 100644 --- a/src/main/java/com/glxp/api/entity/inv/InvPlaceOrderEntity.java +++ b/src/main/java/com/glxp/api/entity/inv/InvPlaceOrderEntity.java @@ -15,8 +15,8 @@ import java.util.Date; @TableName(value = "inv_place_order") public class InvPlaceOrderEntity { - @TableId(value = "id", type = IdType.AUTO) - private Integer id; + + private Long id; /** * 上架记录号 diff --git a/src/main/java/com/glxp/api/res/inv/InvPlaceOrderDetailResponse.java b/src/main/java/com/glxp/api/res/inv/InvPlaceOrderDetailResponse.java index c7170626a..b4a956549 100644 --- a/src/main/java/com/glxp/api/res/inv/InvPlaceOrderDetailResponse.java +++ b/src/main/java/com/glxp/api/res/inv/InvPlaceOrderDetailResponse.java @@ -68,6 +68,8 @@ public class InvPlaceOrderDetailResponse { */ private String invSpaceCode; + private String invSpaceName; + /** * 供应商名称 */ diff --git a/src/main/java/com/glxp/api/service/inv/InvPlaceOrderService.java b/src/main/java/com/glxp/api/service/inv/InvPlaceOrderService.java index 7f2b98cd9..85b645161 100644 --- a/src/main/java/com/glxp/api/service/inv/InvPlaceOrderService.java +++ b/src/main/java/com/glxp/api/service/inv/InvPlaceOrderService.java @@ -1,8 +1,13 @@ package com.glxp.api.service.inv; import com.glxp.api.common.res.BaseResponse; +import com.glxp.api.entity.inv.InvPlaceOrderDetailEntity; import com.glxp.api.req.inv.AddInvPlaceOrderRequest; import com.glxp.api.req.inv.FilterInvPlaceOrderRequest; +import com.glxp.api.req.inv.FilterInvPlaceRequest; +import com.glxp.api.res.inout.IoOrderResponse; +import com.glxp.api.res.inv.BindInvSpaceRequest; +import com.glxp.api.res.inv.InvPlaceOrderDetailResponse; import com.glxp.api.res.inv.InvPlaceOrderResponse; import java.util.List; @@ -16,4 +21,9 @@ public interface InvPlaceOrderService { BaseResponse addInvPlaceOrder(AddInvPlaceOrderRequest addInvPlaceOrderRequest); + //单条绑定货位 + BaseResponse bindInvSpaceOne(BindInvSpaceRequest bindInvSpaceRequest); + + + List filterInvPlaceOrderDetailList(FilterInvPlaceOrderRequest filterInvPlaceOrderRequest); } diff --git a/src/main/java/com/glxp/api/service/inv/InvPlaceService.java b/src/main/java/com/glxp/api/service/inv/InvPlaceService.java index e7009dcf7..e42751e78 100644 --- a/src/main/java/com/glxp/api/service/inv/InvPlaceService.java +++ b/src/main/java/com/glxp/api/service/inv/InvPlaceService.java @@ -47,10 +47,10 @@ public interface InvPlaceService { BaseResponse checkCodeSpace(BindInvSpaceRequest bindInvSpaceRequest); /** - * @param filterInvPlaceRequest + * @param bindInvSpaceRequest * @return */ - List getInvProductInfo(FilterInvPlaceRequest filterInvPlaceRequest); + List getInvProductInfo(BindInvSpaceRequest bindInvSpaceRequest); /** * 从库存详情查询单据列表 @@ -59,4 +59,8 @@ public interface InvPlaceService { * @return */ List getInvPlaceOrderList(FilterInvPlaceRequest filterInvPlaceRequest); + + //判断有没有库存 + String checkCount(BindInvSpaceRequest bindInvSpaceRequest); + } diff --git a/src/main/java/com/glxp/api/service/inv/impl/InvPlaceOrderServiceImpl.java b/src/main/java/com/glxp/api/service/inv/impl/InvPlaceOrderServiceImpl.java index 87f803670..59d132a84 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/InvPlaceOrderServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inv/impl/InvPlaceOrderServiceImpl.java @@ -1,7 +1,9 @@ package com.glxp.api.service.inv.impl; import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.PageHelper; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; @@ -12,6 +14,10 @@ import com.glxp.api.entity.inv.InvPlaceOrderDetailEntity; import com.glxp.api.entity.inv.InvPlaceOrderEntity; import com.glxp.api.req.inv.AddInvPlaceOrderRequest; import com.glxp.api.req.inv.FilterInvPlaceOrderRequest; +import com.glxp.api.req.inv.FilterInvPlaceRequest; +import com.glxp.api.res.inout.IoOrderResponse; +import com.glxp.api.res.inv.BindInvSpaceRequest; +import com.glxp.api.res.inv.InvPlaceOrderDetailResponse; import com.glxp.api.res.inv.InvPlaceOrderResponse; import com.glxp.api.service.auth.CustomerService; import com.glxp.api.service.inv.InvPlaceOrderService; @@ -90,4 +96,80 @@ public class InvPlaceOrderServiceImpl implements InvPlaceOrderService { invPlaceOrderDao.insert(orderEntity); return ResultVOUtils.success(); } + + + @Override + public BaseResponse bindInvSpaceOne(BindInvSpaceRequest bindInvSpaceRequest) { + +// QueryWrapper ew=new QueryWrapper(); +// ew.eq("code",filterInvPlaceRequest.getCode()); +// ew.isNull("invSpaceCode"); +// ew. +// invPreInProductDetailDao.selectOne() + + //判断是不是第一次进行添加 是就插入一条主表 + String recordId = ""; + if(StrUtil.isEmpty(bindInvSpaceRequest.getOrderId())){ + InvPlaceOrderEntity invPlaceOrderEntity=new InvPlaceOrderEntity(); + //操作人ID + String userId = customerService.getUserIdStr(); + + recordId = gennerOrderUtils.createInvPlaceOrderNo(new OrderNoTypeBean(Constant.INV_PLACE_ORDER, "yyyyMMdd")); + InvPlaceOrderEntity orderEntity = new InvPlaceOrderEntity(); + orderEntity.setId(IdUtil.getSnowflakeNextId()); + orderEntity.setRecordId(recordId); + orderEntity.setType(1); +// orderEntity.setOrderId(addInvPlaceOrderRequest.getOrderId()); + orderEntity.setCreateUser(userId); + orderEntity.setCreateTime(new Date()); + orderEntity.setUpdateTime(new Date()); + invPlaceOrderDao.insert(orderEntity); + + //插入附表 + InvPlaceOrderDetailEntity invPlaceOrderDetailEntity=new InvPlaceOrderDetailEntity(); + invPlaceOrderDetailEntity.setId(IdUtil.getSnowflakeNextId()); + invPlaceOrderDetailEntity.setRecordId(recordId); + invPlaceOrderDetailEntity.setInvCode(bindInvSpaceRequest.getInvCode()); + invPlaceOrderDetailEntity.setInvSpaceCode(bindInvSpaceRequest.getInvSpaceCode()); + invPlaceOrderDetailEntity.setCode(bindInvSpaceRequest.getCode()); + invPlaceOrderDetailEntity.setCount(1); + invPlaceOrderDetailDao.insert(invPlaceOrderDetailEntity); + }else{ + recordId=bindInvSpaceRequest.getOrderId(); + //查询有没有存在一样的code有就加数量没有新增 + QueryWrapper ew=new QueryWrapper<>(); + ew.eq("recordId",bindInvSpaceRequest.getOrderId()); + ew.eq("code",bindInvSpaceRequest.getCode()); + InvPlaceOrderDetailEntity invPlaceOrderDetailEntity=invPlaceOrderDetailDao.selectOne(ew); + if(invPlaceOrderDetailEntity!=null){ + invPlaceOrderDetailEntity.setCount(invPlaceOrderDetailEntity.getCount()+1); + invPlaceOrderDetailDao.updateById(invPlaceOrderDetailEntity); + }else{ + //插入附表 + invPlaceOrderDetailEntity=new InvPlaceOrderDetailEntity(); + invPlaceOrderDetailEntity.setId(IdUtil.getSnowflakeNextId()); + invPlaceOrderDetailEntity.setRecordId(bindInvSpaceRequest.getOrderId()); + invPlaceOrderDetailEntity.setInvCode(bindInvSpaceRequest.getInvCode()); + invPlaceOrderDetailEntity.setInvSpaceCode(bindInvSpaceRequest.getInvSpaceCode()); + invPlaceOrderDetailEntity.setCode(bindInvSpaceRequest.getCode()); + invPlaceOrderDetailEntity.setCount(1); + invPlaceOrderDetailDao.insert(invPlaceOrderDetailEntity); + } + } + + + + return ResultVOUtils.success(recordId); + } + + @Override + public List filterInvPlaceOrderDetailList(FilterInvPlaceOrderRequest filterInvPlaceOrderRequest) { + if (null == filterInvPlaceOrderRequest) { + return Collections.emptyList(); + } + if (null != filterInvPlaceOrderRequest.getPage() && null != filterInvPlaceOrderRequest.getLimit()) { + PageHelper.offsetPage((filterInvPlaceOrderRequest.getPage() - 1) * filterInvPlaceOrderRequest.getLimit(), filterInvPlaceOrderRequest.getLimit()); + } + return invPlaceOrderDetailDao.selectDetailList(filterInvPlaceOrderRequest.getOrderId()); + } } diff --git a/src/main/java/com/glxp/api/service/inv/impl/InvPlaceServiceImpl.java b/src/main/java/com/glxp/api/service/inv/impl/InvPlaceServiceImpl.java index a6e7cad05..4131ff70c 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/InvPlaceServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inv/impl/InvPlaceServiceImpl.java @@ -1,31 +1,32 @@ package com.glxp.api.service.inv.impl; import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.PageHelper; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; +import com.glxp.api.constant.Constant; import com.glxp.api.constant.ConstantStatus; import com.glxp.api.dao.auth.InvSpaceDao; import com.glxp.api.dao.auth.InvWarehouseDao; -import com.glxp.api.dao.inv.InvPreInProductDetailDao; -import com.glxp.api.dao.inv.InvPreProductDetailDao; -import com.glxp.api.dao.inv.InvProductDetailDao; +import com.glxp.api.dao.inv.*; import com.glxp.api.entity.auth.InvSpace; import com.glxp.api.entity.auth.InvWarehouseEntity; -import com.glxp.api.entity.inv.InvPreInProductDetailEntity; -import com.glxp.api.entity.inv.InvPreProductDetailEntity; -import com.glxp.api.entity.inv.InvProductDetailEntity; +import com.glxp.api.entity.inv.*; import com.glxp.api.req.inv.AddInvPlaceOrderRequest; import com.glxp.api.req.inv.FilterInvPlaceRequest; +import com.glxp.api.res.basic.UdiRelevanceResponse; import com.glxp.api.res.inout.IoOrderResponse; import com.glxp.api.res.inv.BindInvSpaceRequest; import com.glxp.api.res.inv.InvPlaceDetailResponse; +import com.glxp.api.service.basic.UdiRelevanceService; import com.glxp.api.service.inv.InvPlaceOrderService; import com.glxp.api.service.inv.InvPlaceService; import com.glxp.api.util.BeanCopyUtils; +import com.glxp.api.util.OrderNoTypeBean; import io.swagger.models.auth.In; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @@ -34,6 +35,7 @@ import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.ArrayList; import java.util.Collections; +import java.util.Date; import java.util.List; import java.util.stream.Collectors; @@ -54,6 +56,14 @@ public class InvPlaceServiceImpl implements InvPlaceService { private InvSpaceDao invSpaceDao; @Resource private InvPlaceOrderService invPlaceOrderService; + @Resource + private InvPlaceOrderDao invPlaceOrderDao; + @Resource + private InvPlaceOrderDetailDao invPlaceOrderDetailDao; + @Resource + private UdiRelevanceService udiRelevanceService; + + @Override public List getPlaceDetailList(FilterInvPlaceRequest filterInvPlaceRequest) { @@ -75,67 +85,160 @@ public class InvPlaceServiceImpl implements InvPlaceService { List list = new ArrayList<>(); if (invWarehouseEntity.getAdvanceType() == ConstantStatus.ACTION_TYPE_PREIN) { - List invPreInProductDetailEntities = invPreInProductDetailDao.selectList(new QueryWrapper() - .select("id", "code", "relId", "batchNo") - .eq("deptCode", deptCode) - .eq("invCode", bindInvSpaceRequest.getInvCode()) - .in("code", bindInvSpaceRequest.getCodeArray()) - ); - for (InvPreInProductDetailEntity invPreInProductDetailEntity : invPreInProductDetailEntities) { - InvProductDetailEntity invProductDetailEntity = new InvProductDetailEntity(); - BeanCopyUtils.copy(invPreInProductDetailEntity, invProductDetailEntity); - list.add(invProductDetailEntity); + List invPlaceOrderDetailEntityList=invPlaceOrderDetailDao.selectList(new QueryWrapper().eq("recordId",bindInvSpaceRequest.getOrderId())); + for (InvPlaceOrderDetailEntity invPlaceOrderDetailEntity : invPlaceOrderDetailEntityList) { + + for (Integer i = 0; i < invPlaceOrderDetailEntity.getCount(); i++) { + //拆解库存表 + QueryWrapper ew=new QueryWrapper<>(); + ew.eq("code",invPlaceOrderDetailEntity.getCode()); + ew.and(o-> o.isNull("invSpaceCode").or().eq("invSpaceCode","")); + + ew.gt("inCount",0); + ew.last("limit 1"); + InvPreInProductDetailEntity invPreInProductDetailEntity=invPreInProductDetailDao.selectOne(ew); + if(invPreInProductDetailEntity.getInCount()>0){ + invPreInProductDetailEntity.setInCount(invPreInProductDetailEntity.getInCount()-1); + invPreInProductDetailEntity.setCount(invPreInProductDetailEntity.getCount()-1); +// invPreInProductDetailEntity.setReCount(invPreInProductDetailEntity.getReCount()-getActCount(invPlaceOrderDetailEntity.get)); + invPreInProductDetailDao.updateById(invPreInProductDetailEntity); + + + ew.clear(); + ew.eq("code",invPlaceOrderDetailEntity.getCode()); + ew.eq("invSpaceCode",invPlaceOrderDetailEntity.getInvSpaceCode()); + + InvPreInProductDetailEntity invPreInProductDetailEntity1=invPreInProductDetailDao.selectOne(ew); + if(invPreInProductDetailEntity1!=null){ + invPreInProductDetailEntity1.setCount(invPreInProductDetailEntity1.getCount()+1); + invPreInProductDetailEntity1.setInCount(invPreInProductDetailEntity1.getInCount()+1); + invPreInProductDetailDao.updateById(invPreInProductDetailEntity1); + }else{ + invPreInProductDetailEntity.setId(null); + invPreInProductDetailEntity.setInCount(1); + invPreInProductDetailEntity.setCount(1); + invPreInProductDetailEntity.setOutCount(0); + invPreInProductDetailEntity.setInvSpaceCode(invPlaceOrderDetailEntity.getInvSpaceCode()); + invPreInProductDetailDao.insert(invPreInProductDetailEntity); + } + } + } } + + } else if (invWarehouseEntity.getAdvanceType() == ConstantStatus.ACTION_TYPE_ADVANCE) { - List invPreProductDetailEntities = invPreProductDetailDao.selectList(new QueryWrapper() - .select("id", "code", "relId", "batchNo") - .eq("deptCode", deptCode) - .eq("invCode", bindInvSpaceRequest.getInvCode()) - .in("code", bindInvSpaceRequest.getCodeArray()) - ); - for (InvPreProductDetailEntity invPreInProductDetailEntity : invPreProductDetailEntities) { - InvProductDetailEntity invProductDetailEntity = new InvProductDetailEntity(); - BeanCopyUtils.copy(invPreInProductDetailEntity, invProductDetailEntity); - list.add(invProductDetailEntity); + List invPlaceOrderDetailEntityList=invPlaceOrderDetailDao.selectList(new QueryWrapper().eq("recordId",bindInvSpaceRequest.getOrderId())); + for (InvPlaceOrderDetailEntity invPlaceOrderDetailEntity : invPlaceOrderDetailEntityList) { + + for (Integer i = 0; i < invPlaceOrderDetailEntity.getCount(); i++) { + //拆解库存表 + QueryWrapper ew=new QueryWrapper<>(); + ew.eq("code",invPlaceOrderDetailEntity.getCode()); + ew.and(o-> o.isNull("invSpaceCode").or().eq("invSpaceCode","")); + + ew.gt("inCount",0); + ew.last("limit 1"); + InvPreProductDetailEntity invPreInProductDetailEntity=invPreProductDetailDao.selectOne(ew); + if(invPreInProductDetailEntity.getInCount()>0){ + invPreInProductDetailEntity.setInCount(invPreInProductDetailEntity.getInCount()-1); + invPreInProductDetailEntity.setCount(invPreInProductDetailEntity.getCount()-1); +// invPreInProductDetailEntity.setReCount(invPreInProductDetailEntity.getReCount()-getActCount(invPlaceOrderDetailEntity.get)); + invPreProductDetailDao.updateById(invPreInProductDetailEntity); + + + ew.clear(); + ew.eq("code",invPlaceOrderDetailEntity.getCode()); + ew.eq("invSpaceCode",invPlaceOrderDetailEntity.getInvSpaceCode()); + + InvPreProductDetailEntity invPreInProductDetailEntity1=invPreProductDetailDao.selectOne(ew); + if(invPreInProductDetailEntity1!=null){ + invPreInProductDetailEntity1.setCount(invPreInProductDetailEntity1.getCount()+1); + invPreInProductDetailEntity1.setInCount(invPreInProductDetailEntity1.getInCount()+1); + invPreProductDetailDao.updateById(invPreInProductDetailEntity1); + }else{ + invPreInProductDetailEntity.setId(null); + invPreInProductDetailEntity.setInCount(1); + invPreInProductDetailEntity.setCount(1); + invPreInProductDetailEntity.setOutCount(0); + invPreInProductDetailEntity.setInvSpaceCode(invPlaceOrderDetailEntity.getInvSpaceCode()); + invPreProductDetailDao.insert(invPreInProductDetailEntity); + } + } + } } } else { - list = invProductDetailDao.selectList(new QueryWrapper() - .select("id", "code", "relId", "batchNo") - .eq("deptCode", deptCode) - .eq("invCode", bindInvSpaceRequest.getInvCode()) - .in("code", bindInvSpaceRequest.getCodeArray()) - ); - } - - if (CollUtil.isNotEmpty(list)) { - List ids = list.stream().map(InvProductDetailEntity::getId).collect(Collectors.toList()); - log.info("本次绑定货位的库存详情数量为：{} 条", ids.size()); - - - if (invWarehouseEntity.getAdvanceType() == ConstantStatus.ACTION_TYPE_PREIN) { - invPreInProductDetailDao.batchBindSpace(ids, bindInvSpaceRequest.getInvSpaceCode()); - } else if (invWarehouseEntity.getAdvanceType() == ConstantStatus.ACTION_TYPE_ADVANCE) { - invPreProductDetailDao.batchBindSpace(ids, bindInvSpaceRequest.getInvSpaceCode()); - } else { - invProductDetailDao.batchBindSpace(ids, bindInvSpaceRequest.getInvSpaceCode()); + List invPlaceOrderDetailEntityList=invPlaceOrderDetailDao.selectList(new QueryWrapper().eq("recordId",bindInvSpaceRequest.getOrderId())); + for (InvPlaceOrderDetailEntity invPlaceOrderDetailEntity : invPlaceOrderDetailEntityList) { + + for (Integer i = 0; i < invPlaceOrderDetailEntity.getCount(); i++) { + //拆解库存表 + QueryWrapper ew=new QueryWrapper<>(); + ew.eq("code",invPlaceOrderDetailEntity.getCode()); + ew.and(o-> o.isNull("invSpaceCode").or().eq("invSpaceCode","")); + + ew.gt("inCount",0); + ew.last("limit 1"); + InvProductDetailEntity invPreInProductDetailEntity=invProductDetailDao.selectOne(ew); + if(invPreInProductDetailEntity.getInCount()>0){ + invPreInProductDetailEntity.setInCount(invPreInProductDetailEntity.getInCount()-1); + invPreInProductDetailEntity.setCount(invPreInProductDetailEntity.getCount()-1); +// invPreInProductDetailEntity.setReCount(invPreInProductDetailEntity.getReCount()-getActCount(invPlaceOrderDetailEntity.get)); + invProductDetailDao.updateById(invPreInProductDetailEntity); + + + ew.clear(); + ew.eq("code",invPlaceOrderDetailEntity.getCode()); + ew.eq("invSpaceCode",invPlaceOrderDetailEntity.getInvSpaceCode()); + + InvProductDetailEntity invPreInProductDetailEntity1=invProductDetailDao.selectOne(ew); + if(invPreInProductDetailEntity1!=null){ + invPreInProductDetailEntity1.setCount(invPreInProductDetailEntity1.getCount()+1); + invPreInProductDetailEntity1.setInCount(invPreInProductDetailEntity1.getInCount()+1); + invProductDetailDao.updateById(invPreInProductDetailEntity1); + }else{ + invPreInProductDetailEntity.setId(null); + invPreInProductDetailEntity.setInCount(1); + invPreInProductDetailEntity.setCount(1); + invPreInProductDetailEntity.setOutCount(0); + invPreInProductDetailEntity.setInvSpaceCode(invPlaceOrderDetailEntity.getInvSpaceCode()); + invProductDetailDao.insert(invPreInProductDetailEntity); + } + } + } } - - //添加物资上架记录 - AddInvPlaceOrderRequest addInvPlaceOrderRequest = new AddInvPlaceOrderRequest(); - addInvPlaceOrderRequest.setType(bindInvSpaceRequest.getType()); - addInvPlaceOrderRequest.setOrderId(bindInvSpaceRequest.getOrderId()); - addInvPlaceOrderRequest.setCodeList(list); - addInvPlaceOrderRequest.setInvCode(bindInvSpaceRequest.getInvCode()); - addInvPlaceOrderRequest.setInvSpaceCode(bindInvSpaceRequest.getInvSpaceCode()); - invPlaceOrderService.addInvPlaceOrder(addInvPlaceOrderRequest); - return ResultVOUtils.success("绑定成功！本次绑定货位的库存详情数量为：" + ids.size() + "条"); - } else { - log.info("绑定货位列表查询无数据"); - return ResultVOUtils.error(500, "绑定货位列表查询无数据"); } + +// if (CollUtil.isNotEmpty(list)) { +// List ids = list.stream().map(InvProductDetailEntity::getId).collect(Collectors.toList()); +// log.info("本次绑定货位的库存详情数量为：{} 条", ids.size()); +// +// +// if (invWarehouseEntity.getAdvanceType() == ConstantStatus.ACTION_TYPE_PREIN) { +// invPreInProductDetailDao.batchBindSpace(ids, bindInvSpaceRequest.getInvSpaceCode()); +// } else if (invWarehouseEntity.getAdvanceType() == ConstantStatus.ACTION_TYPE_ADVANCE) { +// invPreProductDetailDao.batchBindSpace(ids, bindInvSpaceRequest.getInvSpaceCode()); +// } else { +// invProductDetailDao.batchBindSpace(ids, bindInvSpaceRequest.getInvSpaceCode()); +// } +// +// +// //添加物资上架记录 +// AddInvPlaceOrderRequest addInvPlaceOrderRequest = new AddInvPlaceOrderRequest(); +// addInvPlaceOrderRequest.setType(bindInvSpaceRequest.getType()); +// addInvPlaceOrderRequest.setOrderId(bindInvSpaceRequest.getOrderId()); +// addInvPlaceOrderRequest.setCodeList(list); +// addInvPlaceOrderRequest.setInvCode(bindInvSpaceRequest.getInvCode()); +// addInvPlaceOrderRequest.setInvSpaceCode(bindInvSpaceRequest.getInvSpaceCode()); +// invPlaceOrderService.addInvPlaceOrder(addInvPlaceOrderRequest); +// return ResultVOUtils.success("绑定成功！本次绑定货位的库存详情数量为：" + ids.size() + "条"); +// } else { +// log.info("绑定货位列表查询无数据"); +// return ResultVOUtils.error(500, "绑定货位列表查询无数据"); +// } + return ResultVOUtils.success(); } @Override @@ -229,16 +332,16 @@ public class InvPlaceServiceImpl implements InvPlaceService { } @Override - public List getInvProductInfo(FilterInvPlaceRequest filterInvPlaceRequest) { - - InvWarehouseEntity invWarehouseEntity = invWarehouseDao.selectOne(new QueryWrapper().eq("code", filterInvPlaceRequest.getInvCode())); - if (invWarehouseEntity.getAdvanceType() == ConstantStatus.ACTION_TYPE_PREIN) { - return invPreInProductDetailDao.getInvProductInfo(filterInvPlaceRequest); - } else if (invWarehouseEntity.getAdvanceType() == ConstantStatus.ACTION_TYPE_ADVANCE) { - return invPreProductDetailDao.getInvProductInfo(filterInvPlaceRequest); - } else - return invProductDetailDao.getInvProductInfo(filterInvPlaceRequest); - + public List getInvProductInfo(BindInvSpaceRequest bindInvSpaceRequest) { + return null; +// +// InvWarehouseEntity invWarehouseEntity = invWarehouseDao.selectOne(new QueryWrapper().eq("code", filterInvPlaceRequest.getInvCode())); +// if (invWarehouseEntity.getAdvanceType() == ConstantStatus.ACTION_TYPE_PREIN) { +// return invPreInProductDetailDao.getInvProductInfo(filterInvPlaceRequest); +// } else if (invWarehouseEntity.getAdvanceType() == ConstantStatus.ACTION_TYPE_ADVANCE) { +// return invPreProductDetailDao.getInvProductInfo(filterInvPlaceRequest); +// } else +// return invProductDetailDao.getInvProductInfo(filterInvPlaceRequest); } @Override @@ -261,4 +364,79 @@ public class InvPlaceServiceImpl implements InvPlaceService { } + + @Override + public String checkCount(BindInvSpaceRequest bindInvSpaceRequest) { + InvWarehouseEntity invWarehouseEntity = invWarehouseDao.selectOne(new QueryWrapper().eq("code", bindInvSpaceRequest.getInvCode())); + if (invWarehouseEntity.getAdvanceType() == ConstantStatus.ACTION_TYPE_PREIN) { + Integer count = invPreInProductDetailDao.getInventoryQuantity(bindInvSpaceRequest.getCode()); + if(count==null || count<=0){ + return "该产品库存不足！"; + } + if(StrUtil.isNotBlank(bindInvSpaceRequest.getOrderId())){ + QueryWrapper ew=new QueryWrapper(); + ew.eq("recordId",bindInvSpaceRequest.getOrderId()); + ew.eq("code",bindInvSpaceRequest.getCode()); + InvPlaceOrderDetailEntity invPlaceOrderDetailEntity =invPlaceOrderDetailDao.selectOne(ew); + if(invPlaceOrderDetailEntity.getCount()>=count){ + return "该产品库存不足！"; + } + } + } else if (invWarehouseEntity.getAdvanceType() == ConstantStatus.ACTION_TYPE_ADVANCE) { + Integer count = invPreProductDetailDao.getInventoryQuantity(bindInvSpaceRequest.getCode()); + if(count==null || count<=0){ + return "该产品库存不足！"; + } + if(StrUtil.isNotBlank(bindInvSpaceRequest.getOrderId())){ + QueryWrapper ew=new QueryWrapper(); + ew.eq("recordId",bindInvSpaceRequest.getOrderId()); + ew.eq("code",bindInvSpaceRequest.getCode()); + InvPlaceOrderDetailEntity invPlaceOrderDetailEntity =invPlaceOrderDetailDao.selectOne(ew); + if(invPlaceOrderDetailEntity.getCount()>=count){ + return "该产品库存不足！"; + } + } + } else if (invWarehouseEntity.getAdvanceType() == ConstantStatus.ACTION_TYPE_NORMAL){ + Integer count = invProductDetailDao.getInventoryQuantity(bindInvSpaceRequest.getCode()); + if(count==null || count<=0){ + return "该产品库存不足！"; + } + if(StrUtil.isNotBlank(bindInvSpaceRequest.getOrderId())){ + QueryWrapper ew=new QueryWrapper(); + ew.eq("recordId",bindInvSpaceRequest.getOrderId()); + ew.eq("code",bindInvSpaceRequest.getCode()); + InvPlaceOrderDetailEntity invPlaceOrderDetailEntity =invPlaceOrderDetailDao.selectOne(ew); + if(invPlaceOrderDetailEntity.getCount()>=count){ + return "该产品库存不足！"; + } + } + } + return ""; + } + + public int getActCount(String nameCode) { + UdiRelevanceResponse udiRelevanceResponse = udiRelevanceService.selectByNameCode(nameCode); + int count = getActCount(udiRelevanceResponse); + return count; + } + public int getActCount(UdiRelevanceResponse udiRelevanceResponse) { + int actCount; + if (!udiRelevanceResponse.getUseDy() && (udiRelevanceResponse.getDiType() == null || udiRelevanceResponse.getDiType() != 2)) { + if (udiRelevanceResponse.getBhzxxsbzsl() == 0) { + actCount = udiRelevanceResponse.getZxxsbzbhsydysl(); + } else { + if (udiRelevanceResponse.getBhzxxsbzsl() == 0) { + udiRelevanceResponse.setBhzxxsbzsl(1); + } + if (udiRelevanceResponse.getZxxsbzbhsydysl() == null || udiRelevanceResponse.getZxxsbzbhsydysl() == 0) { + udiRelevanceResponse.setZxxsbzbhsydysl(1); + } + actCount = udiRelevanceResponse.getBhzxxsbzsl() * udiRelevanceResponse.getZxxsbzbhsydysl(); + } + } else { + actCount = udiRelevanceResponse.getBhzxxsbzsl(); + } + + return actCount; + } } diff --git a/src/main/resources/mybatis/mapper/inv/InvPlaceOrderDetailDao.xml b/src/main/resources/mybatis/mapper/inv/InvPlaceOrderDetailDao.xml index 806ddfb91..94f90ec68 100644 --- a/src/main/resources/mybatis/mapper/inv/InvPlaceOrderDetailDao.xml +++ b/src/main/resources/mybatis/mapper/inv/InvPlaceOrderDetailDao.xml @@ -1,4 +1,33 @@ + + + + + \ No newline at end of file diff --git a/src/main/resources/mybatis/mapper/inv/InvPreInProductDetailDao.xml b/src/main/resources/mybatis/mapper/inv/InvPreInProductDetailDao.xml index 0b1a11fe9..e09f24a2e 100644 --- a/src/main/resources/mybatis/mapper/inv/InvPreInProductDetailDao.xml +++ b/src/main/resources/mybatis/mapper/inv/InvPreInProductDetailDao.xml @@ -221,4 +221,16 @@ group by ipd.orderId + + + diff --git a/src/main/resources/mybatis/mapper/inv/InvPreProductDetailDao.xml b/src/main/resources/mybatis/mapper/inv/InvPreProductDetailDao.xml index 8f5b04a9f..f23a222d4 100644 --- a/src/main/resources/mybatis/mapper/inv/InvPreProductDetailDao.xml +++ b/src/main/resources/mybatis/mapper/inv/InvPreProductDetailDao.xml @@ -221,4 +221,15 @@ group by ipd.orderId + + diff --git a/src/main/resources/mybatis/mapper/inv/invProductDetailDao.xml b/src/main/resources/mybatis/mapper/inv/invProductDetailDao.xml index af68d03ce..f2c474299 100644 --- a/src/main/resources/mybatis/mapper/inv/invProductDetailDao.xml +++ b/src/main/resources/mybatis/mapper/inv/invProductDetailDao.xml @@ -303,4 +303,15 @@ group by ipd.orderId + + From b125b3e76c3b562b589dd30f9d151c5de956c5e8 Mon Sep 17 00:00:00 2001 From: wj <1285151836@qq.com> Date: Sat, 6 May 2023 09:46:59 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E9=BB=98=E8=AE=A4dev?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/application.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index bfbb93cff..788a2796b 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -1,6 +1,6 @@ spring: profiles: - active: test + active: dev jmx: enabled: false servlet: