From 628f3bccee76729af8945f774b52f791931398c2 Mon Sep 17 00:00:00 2001 From: anthonyywj2 <353682448@qq.com> Date: Mon, 8 Aug 2022 14:07:25 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E5=8D=95=E6=8D=AE=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E9=97=AE=E9=A2=98=EF=BC=8C=E6=89=B9=E6=AC=A1=E5=8F=B7=E5=A4=A7?= =?UTF-8?q?=E5=B0=8F=E5=86=99=E4=B8=8D=E5=8C=B9=E9=85=8D=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/admin/controller/inout/WareHouseController.java | 7 ++----- .../glxp/api/admin/dao/basic/BussinessLocalTypeDao.java | 2 +- .../api/admin/service/inout/impl/OrderServiceImpl.java | 5 ++++- api-admin/src/main/resources/application.properties | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/inout/WareHouseController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/inout/WareHouseController.java index 75540bce..5a357dc3 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/inout/WareHouseController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/inout/WareHouseController.java @@ -63,10 +63,7 @@ import org.springframework.web.context.request.ServletRequestAttributes; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.validation.Valid; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.stream.Collectors; @RestController @@ -893,7 +890,7 @@ public class WareHouseController { if (!StrUtil.emptyIfNull(originUdiEntity.getUdi()).equals(StrUtil.emptyIfNull(udiEntity.getUdi()))) { continue; } - if (!StrUtil.emptyIfNull(originUdiEntity.getBatchNo()).equals(StrUtil.emptyIfNull(udiEntity.getBatchNo()))) { + if (!StrUtil.emptyIfNull(originUdiEntity.getBatchNo()).toUpperCase(Locale.ROOT).equals(StrUtil.emptyIfNull(udiEntity.getBatchNo()).toUpperCase(Locale.ROOT))) { continue; } if (!StrUtil.emptyIfNull(originUdiEntity.getProduceDate()).equals(StrUtil.emptyIfNull(udiEntity.getProduceDate()))) { diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/basic/BussinessLocalTypeDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/basic/BussinessLocalTypeDao.java index 31d029f4..861e7546 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/basic/BussinessLocalTypeDao.java +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/basic/BussinessLocalTypeDao.java @@ -44,5 +44,5 @@ public interface BussinessLocalTypeDao { * * @param action */ - boolean selectPreInByOrderType(String action); + Boolean selectPreInByOrderType(String action); } diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inout/impl/OrderServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/inout/impl/OrderServiceImpl.java index 5c05ae22..1ae2732c 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/inout/impl/OrderServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/inout/impl/OrderServiceImpl.java @@ -671,7 +671,10 @@ public class OrderServiceImpl implements OrderService { * @return */ private boolean isPreInOrder(OrderEntity orderEntity) { - return bussinessLocalTypeDao.selectPreInByOrderType(orderEntity.getAction()); + Boolean isTrue = bussinessLocalTypeDao.selectPreInByOrderType(orderEntity.getAction()); + if (isTrue == null) + return false; + return isTrue; } @Override diff --git a/api-admin/src/main/resources/application.properties b/api-admin/src/main/resources/application.properties index e487e916..0f5d7b4c 100644 --- a/api-admin/src/main/resources/application.properties +++ b/api-admin/src/main/resources/application.properties @@ -1,4 +1,4 @@ -spring.profiles.active=dev +spring.profiles.active=pro spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver From dd88f1905a442bec32dc3b4539476d1bcd98c891 Mon Sep 17 00:00:00 2001 From: anthonyywj2 <353682448@qq.com> Date: Mon, 8 Aug 2022 15:34:04 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E9=A2=84=E9=AA=8C=E6=94=B6=E5=8D=95?= =?UTF-8?q?=E6=8D=AE=E5=88=A0=E9=99=A4bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/admin/controller/inout/WareHouseController.java | 5 +++++ .../api/admin/dao/inventory/InvPreProductDetailDao.java | 9 +++++++++ .../mapper/inventory/InvPreInProductDetailDao.xml | 9 +++++++++ .../mybatis/mapper/inventory/InvPreProductDetailDao.xml | 9 +++++++++ 4 files changed, 32 insertions(+) diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/inout/WareHouseController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/inout/WareHouseController.java index 5a357dc3..024a6a78 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/inout/WareHouseController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/inout/WareHouseController.java @@ -574,6 +574,11 @@ public class WareHouseController { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } AddCodeResult addCodeResult = new AddCodeResult(); + + if (addOrderRequest.getAction() == null) { + addOrderRequest.setAction(addOrderRequest.getBillType()); + } + BussinessTypeEntity bussinessTypeEntity = bussinessTypeService.findBTByAction(addOrderRequest.getAction()); String code = addOrderRequest.getCode(); if (StringUtils.isBlank(code)) return ResultVOUtils.error(ResultEnum.DATA_ERROR); diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InvPreProductDetailDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InvPreProductDetailDao.java index fd1950e5..03df4ae9 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InvPreProductDetailDao.java +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InvPreProductDetailDao.java @@ -26,4 +26,13 @@ public interface InvPreProductDetailDao { boolean deleteByProductId(FilterInvProductDetailRequest filterInvProductDetailRequest); int statCount(FilterInvProductDetailRequest filterInvProductDetailRequest); + + + /** + * 根据orderId删除预验收库存详情 + * + * @param orderIdFk 扫码单据ID + */ + boolean deleteByOrderId(String orderIdFk); + } diff --git a/api-admin/src/main/resources/mybatis/mapper/inventory/InvPreInProductDetailDao.xml b/api-admin/src/main/resources/mybatis/mapper/inventory/InvPreInProductDetailDao.xml index 0964a297..d9bd943a 100644 --- a/api-admin/src/main/resources/mybatis/mapper/inventory/InvPreInProductDetailDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/inventory/InvPreInProductDetailDao.xml @@ -289,4 +289,13 @@ + + + delete + from inv_product_detail + where orderIdFk = #{orderIdFk} + + + + \ No newline at end of file diff --git a/api-admin/src/main/resources/mybatis/mapper/inventory/InvPreProductDetailDao.xml b/api-admin/src/main/resources/mybatis/mapper/inventory/InvPreProductDetailDao.xml index a79fdada..b0477125 100644 --- a/api-admin/src/main/resources/mybatis/mapper/inventory/InvPreProductDetailDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/inventory/InvPreProductDetailDao.xml @@ -230,4 +230,13 @@ + + + + delete + from inv_product_detail + where orderIdFk = #{orderIdFk} + + + \ No newline at end of file From 211ba9eef691d596159622ca3fe6c5c98740056a Mon Sep 17 00:00:00 2001 From: anthonyywj2 <353682448@qq.com> Date: Mon, 8 Aug 2022 17:39:50 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E8=87=AA=E5=8A=A9=E5=B9=B3=E5=8F=B0bug?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=90=8C=E6=AD=A5=EF=BC=88=E4=BA=8C=E7=BA=A7?= =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../business/StockOrderController.java | 27 ++++++++++++++++--- .../business/StockOrderDetailService.java | 3 +++ .../impl/StockOrderDetailServiceImpl.java | 24 +++++++++++++++++ 3 files changed, 50 insertions(+), 4 deletions(-) diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/business/StockOrderController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/business/StockOrderController.java index db0e858e..be082523 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/business/StockOrderController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/business/StockOrderController.java @@ -66,10 +66,7 @@ import org.springframework.web.context.request.ServletRequestAttributes; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; -import java.util.ArrayList; -import java.util.Collections; -import java.util.Date; -import java.util.List; +import java.util.*; @RestController public class StockOrderController { @@ -182,6 +179,28 @@ public class StockOrderController { stockOrderEntity.setStatus("202");//已配货 } } + + + if (CollUtil.isNotEmpty(stockOrderPostRequest.getSubErpOrders())) { + boolean verifyResult = stockOrderDetailService.verifyCount(stockOrderPostRequest.getSubErpOrders()); + if (!verifyResult) { + return ResultVOUtils.error(500, "实际数量不能高于订单数量"); + } + List filterList = new ArrayList(); + for (StockOrderDetailEntity stockOrderDetailEntity : stockOrderPostRequest.getSubErpOrders()) { + + filterList.add(StrUtil.trimToEmpty(stockOrderDetailEntity.getRelId()) + StrUtil.trimToEmpty(stockOrderDetailEntity.getBatchNo())); + + } + HashSet set = new HashSet<>(filterList); + Boolean result = set.size() == filterList.size() ? true : false; + if (!result) { + return ResultVOUtils.error(500, "存在相同批次产品，提交失败！"); + } + + } + + if (StringUtils.isBlank(stockOrderEntity.getId())) { BussinessLocalTypeEntity bussinessLocalTypeEntity = bussinessLocalTypeService.findBTByAction(stockOrderEntity.getBillType()); if (StrUtil.isEmpty(stockOrderPostRequest.getBillNo())) { diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/business/StockOrderDetailService.java b/api-admin/src/main/java/com/glxp/api/admin/service/business/StockOrderDetailService.java index fabdeb64..9b867998 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/business/StockOrderDetailService.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/business/StockOrderDetailService.java @@ -25,4 +25,7 @@ public interface StockOrderDetailService { StockOrderDetailEntity findOne(@Param("id") String id); + boolean verifyCount(List subErpOrders); + + } diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/business/impl/StockOrderDetailServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/business/impl/StockOrderDetailServiceImpl.java index 697fa987..7b8a8380 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/business/impl/StockOrderDetailServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/business/impl/StockOrderDetailServiceImpl.java @@ -1,8 +1,11 @@ package com.glxp.api.admin.service.business.impl; +import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageHelper; import com.glxp.api.admin.dao.business.StockOrderDetailDao; +import com.glxp.api.admin.dao.schedule.SystemParamConfigDao; import com.glxp.api.admin.entity.business.StockOrderDetailEntity; +import com.glxp.api.admin.entity.info.SystemParamConfigEntity; import com.glxp.api.admin.req.business.StockOrderDetailFilterRequest; import com.glxp.api.admin.res.business.StockOrderDetailResponse; import com.glxp.api.admin.service.business.StockOrderDetailService; @@ -17,6 +20,8 @@ public class StockOrderDetailServiceImpl implements StockOrderDetailService { @Resource StockOrderDetailDao stockOrderDetailDao; + @Resource + private SystemParamConfigDao systemParamConfigDao; @Override public List filterStockOrderDetail(StockOrderDetailFilterRequest stockOrderDetailFilterRequest) { @@ -61,6 +66,7 @@ public class StockOrderDetailServiceImpl implements StockOrderDetailService { public boolean deleteById(String id) { return stockOrderDetailDao.deleteById(id); } + @Override public boolean deleteByOrderIdFk(String id) { return stockOrderDetailDao.deleteByOrderIdFk(id); @@ -71,4 +77,22 @@ public class StockOrderDetailServiceImpl implements StockOrderDetailService { return stockOrderDetailDao.findOne(id); } + @Override + public boolean verifyCount(List subErpOrders) { + //查询配置的系统运行参数 + SystemParamConfigEntity config = systemParamConfigDao.selectByParamKey("stock_order_detail_count_max"); + if (null != config) { + //0：允许；1：不允许，允许时不做判断 + if ("1".equals(config.getParamValue())) { + for (StockOrderDetailEntity subErpOrder : subErpOrders) { + if (subErpOrder.getReCount() > subErpOrder.getCount()) { + return false; + } + } + } + return true; + } + return true; + } + } From 1577c191d4a0ecb65e4366c66adc894a6aa56a4e Mon Sep 17 00:00:00 2001 From: anthonyywj2 <353682448@qq.com> Date: Tue, 9 Aug 2022 09:05:00 +0800 Subject: [PATCH 4/7] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/basic/BasicThirdSysController.java | 10 +++++++++- .../basic/BussinessOriginTypeController.java | 7 +++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/basic/BasicThirdSysController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/basic/BasicThirdSysController.java index 9530d3de..8b5d31ce 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/basic/BasicThirdSysController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/basic/BasicThirdSysController.java @@ -119,6 +119,9 @@ public class BasicThirdSysController { if (exists) { return ResultVOUtils.error(500, "第三方系统名称重复"); } + + BasicThirdSysEntity temp = basicThirdSysService.selectByThirdId(basicThirdSysEntity.getThirdId()); + if (!basicThirdSysEntity.getEnabled()) { //如操作为禁用第三方系统，则需要判断是否是最后一个启用的第三方系统，需要保留至少启用一个第三方系统 FilterBasicThirdSysRequest filterBasicThirdSysRequest = new FilterBasicThirdSysRequest(); @@ -129,7 +132,12 @@ public class BasicThirdSysController { } } - BasicThirdSysEntity temp = basicThirdSysService.selectByThirdId(basicThirdSysEntity.getThirdId()); + + if (temp.getMainSys() && !temp.getEnabled()) { + return ResultVOUtils.error(500, "主系统必须启用"); + } + + if (!temp.getMainSys().equals(basicThirdSysEntity.getMainSys())) { if (udiRelevanceService.isExit() || unitMaintainService.isExit()) { return ResultVOUtils.error(999, "产品信息已经关联，无法取消主系统！"); diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/basic/BussinessOriginTypeController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/basic/BussinessOriginTypeController.java index 68afba28..61384b53 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/basic/BussinessOriginTypeController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/basic/BussinessOriginTypeController.java @@ -113,6 +113,13 @@ public class BussinessOriginTypeController { } if (bussinessTypeEntity != null) { bussinessTypeEntity.setUpdateTime(new Date()); + + + BussinessOriginTypeEntity bussinessOriginTypeEntity = bussinessOriginTypeService.findByAction(bussinessTypeEntity.getAction()); + if (bussinessOriginTypeEntity != null) { + return ResultVOUtils.error(500, "单据类型已存在！"); + } + bussinessOriginTypeService.insertBusOriginType(bussinessTypeEntity); } else { return ResultVOUtils.error(999, "参数错误"); From fc6f5ff4887b130ee8c38ec7c91a950ee05c8882 Mon Sep 17 00:00:00 2001 From: anthonyywj2 <353682448@qq.com> Date: Tue, 9 Aug 2022 14:53:53 +0800 Subject: [PATCH 5/7] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9,=E5=8D=95=E6=8D=AE?= =?UTF-8?q?=E8=A1=A5=E5=8D=95=E6=9C=AA=E6=B7=BB=E5=8A=A0=E4=BB=93=E5=BA=93?= =?UTF-8?q?=E5=8F=B7=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/admin/controller/inout/OrderController.java | 7 ++----- .../api/admin/controller/inout/UdiTraceController.java | 5 +++++ .../glxp/api/admin/thread/InvProductsTrService.java | 5 ++++- .../main/resources/mybatis/mapper/inout/OrderDao.xml | 8 ++++---- .../mapper/inventory/InvPreInProductDetailDao.xml | 10 ++-------- 5 files changed, 17 insertions(+), 18 deletions(-) diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/inout/OrderController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/inout/OrderController.java index a239a58b..cd3f76bf 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/inout/OrderController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/inout/OrderController.java @@ -260,8 +260,8 @@ public class OrderController { if (stockOrderEntity == null || stockOrderEntity.getOrderIdFk() == null) { - SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey("sps_sync_review_order"); -// if (systemParamConfigEntity.getParamValue().equals("1")) { +// SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey("sps_sync_review_order"); + if (bussinessTypeEntity.isEntrutSpms()) { BaseResponse baseResponse = spsDirectClient.downloadOrder(orderFilterRequest.getOrderId(), userId + "", orderFilterRequest.getAction()); return baseResponse; @@ -271,9 +271,7 @@ public class OrderController { return ResultVOUtils.error(500, "非" + bussinessTypeEntity.getName() + "类型单据！"); } else if (stockOrderEntity.getStatus().equals(ConstantStatus.SORDER_CHECKED)) { if (StrUtil.isNotEmpty(stockOrderEntity.getLocStorageCode())) { - InvWarehouseEntity invWarehouseEntity = invWarehouseService.selectByCode(stockOrderEntity.getLocStorageCode()); List warehouseUserEntities = new ArrayList<>(); - List invWarehouseEntities = new ArrayList<>(); if (StrUtil.isNotEmpty(stockOrderEntity.getInvWarehouseCode())) { FilterInvUserRequest filterInvUserRequest = new FilterInvUserRequest(); filterInvUserRequest.setCode(stockOrderEntity.getInvWarehouseCode()); @@ -283,7 +281,6 @@ public class OrderController { FilterInvWarehouseRequest filterInvWarehouseRequest = new FilterInvWarehouseRequest(); filterInvWarehouseRequest.setCode(stockOrderEntity.getLocStorageCode()); filterInvWarehouseRequest.setUserId(userId); - invWarehouseEntities = invWarehouseService.filterAllByUser(filterInvWarehouseRequest); } diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/inout/UdiTraceController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/inout/UdiTraceController.java index a0e62518..bd8dba34 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/inout/UdiTraceController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/inout/UdiTraceController.java @@ -104,6 +104,11 @@ public class UdiTraceController { udiTraceResponse.setCpmctymc(finalUdiRelevance.getCpmctymc()); udiTraceResponse.setGgxh(finalUdiRelevance.getGgxh()); udiTraceResponse.setOrderId(item.getId()); + InvProductDetailEntity invProductDetailEntity = invProductDetailEntities.get(0); + udiTraceResponse.setBatchNo(invProductDetailEntity.getBatchNo()); + udiTraceResponse.setProduceDate(invProductDetailEntity.getProductionDate()); + udiTraceResponse.setExpireDate(invProductDetailEntity.getExpireDate()); + udiTraceResponse.setCount(invProductDetailEntity.getCount()); } return udiTraceResponse; }).collect(Collectors.toList()); diff --git a/api-admin/src/main/java/com/glxp/api/admin/thread/InvProductsTrService.java b/api-admin/src/main/java/com/glxp/api/admin/thread/InvProductsTrService.java index 3b3bfca9..eb366c92 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/thread/InvProductsTrService.java +++ b/api-admin/src/main/java/com/glxp/api/admin/thread/InvProductsTrService.java @@ -593,6 +593,7 @@ public class InvProductsTrService { outOrder.setFromCorp(basicUnitMaintainEntity.getName()); outOrder.setFromCorpId(corpName); outOrder.setLocStorageCode(orderEntity.getLocStorageCode()); + outOrder.setInvStorageCode(orderEntity.getInvStorageCode()); outOrder.setCorpOrderId(CustomUtil.getId() + "x"); //互填单号 orderEntity.setUllageSupNo(outOrder.getId()); @@ -639,6 +640,7 @@ public class InvProductsTrService { outOrder.setCustomerId(Constant.SYSTEM_CUSTOMER_ID); outOrder.setFromCorpId(null); outOrder.setLocStorageCode(orderEntity.getLocStorageCode()); + outOrder.setInvStorageCode(orderEntity.getInvStorageCode()); //互填单号 orderEntity.setUllageSupNo(outOrder.getId()); @@ -713,7 +715,7 @@ public class InvProductsTrService { outOrder.setCorpOrderId(CustomUtil.getId() + "x"); outOrder.setLocStorageCode(orderEntity.getLocStorageCode()); - + outOrder.setInvStorageCode(orderEntity.getInvStorageCode()); SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey("additional_auto_submit"); if ("1".equals(systemParamConfigEntity.getParamValue())) { @@ -793,6 +795,7 @@ public class InvProductsTrService { outOrder.setFromCorpId(temps.get(0).getFromCorpId()); outOrder.setCorpOrderId(CustomUtil.getId() + "x"); outOrder.setLocStorageCode(orderEntity.getLocStorageCode()); + outOrder.setInvStorageCode(orderEntity.getInvStorageCode()); outOrder.setErpFk(null); outOrder.setFromType(ConstantStatus.FROM_CHANGE); outOrder.setReceiveStatus(0); diff --git a/api-admin/src/main/resources/mybatis/mapper/inout/OrderDao.xml b/api-admin/src/main/resources/mybatis/mapper/inout/OrderDao.xml index e4b9c0c7..40bea93a 100644 --- a/api-admin/src/main/resources/mybatis/mapper/inout/OrderDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/inout/OrderDao.xml @@ -34,7 +34,7 @@ receiveStatus, erpFk, stockCheckFk, thirdBillNo, supId, exportFilePath, locStorageCode, supplementNo, ullageSupNo, createUser, reviewUser, outChangeEnable, originUllageSupNo, preCheck, updateTime, replicateNo, invWarehouseCode, - fromSubInvCode, createTime, originFromType) + fromSubInvCode, createTime, originFromType,invStorageCode) values (#{id}, #{action}, #{corpOrderId}, @@ -54,7 +54,7 @@ #{stockCheckFk}, #{thirdBillNo}, #{supId}, #{exportFilePath}, #{locStorageCode}, #{supplementNo}, #{ullageSupNo}, #{createUser}, #{reviewUser}, #{outChangeEnable}, #{originUllageSupNo}, #{preCheck}, - #{updateTime}, #{replicateNo}, #{invWarehouseCode}, #{fromSubInvCode}, #{createTime}, #{originFromType}) + #{updateTime}, #{replicateNo}, #{invWarehouseCode}, #{fromSubInvCode}, #{createTime}, #{originFromType},#{invStorageCode}) @@ -64,7 +64,7 @@ fromCorp, status, remark, exportStatus, fromType, contrastStatus, signStatus, receiveStatus, erpFk, stockCheckFk, thirdBillNo, supId, exportFilePath, locStorageCode, supplementNo, ullageSupNo, createUser, reviewUser, - outChangeEnable, originUllageSupNo, preCheck,updateTime,replicateNo,invWarehouseCode,fromSubInvCode,createTime,originFromType) + outChangeEnable, originUllageSupNo, preCheck,updateTime,replicateNo,invWarehouseCode,fromSubInvCode,createTime,originFromType,invStorageCode) values ( #{id}, #{action}, @@ -99,7 +99,7 @@ #{invWarehouseCode}, #{fromSubInvCode}, #{createTime}, - #{originFromType} + #{originFromType},#{invStorageCode} ) diff --git a/api-admin/src/main/resources/mybatis/mapper/inventory/InvPreInProductDetailDao.xml b/api-admin/src/main/resources/mybatis/mapper/inventory/InvPreInProductDetailDao.xml index d9bd943a..be263ac9 100644 --- a/api-admin/src/main/resources/mybatis/mapper/inventory/InvPreInProductDetailDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/inventory/InvPreInProductDetailDao.xml @@ -229,7 +229,8 @@ - delete from inv_prein_product_detail + delete + from inv_prein_product_detail where orderIdFk = #{orderIdFk} @@ -290,12 +291,5 @@ - - delete - from inv_product_detail - where orderIdFk = #{orderIdFk} - - - \ No newline at end of file From 8e827f5032ebe59c2748164afe28232636c37dd6 Mon Sep 17 00:00:00 2001 From: anthonyywj2 <353682448@qq.com> Date: Tue, 9 Aug 2022 18:56:10 +0800 Subject: [PATCH 6/7] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/inout/WareHouseController.java | 25 +++++++++++++++++++ .../service/inout/impl/OrderServiceImpl.java | 3 ++- 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/inout/WareHouseController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/inout/WareHouseController.java index 024a6a78..a8473353 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/inout/WareHouseController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/inout/WareHouseController.java @@ -314,6 +314,31 @@ public class WareHouseController { @AuthRuleAnnotation("") @PostMapping("warehouse/inout/saveTempCode") public BaseResponse saveCode(@RequestBody WarehouseEntity warehouseEntity) { + + + if (StrUtil.isNotEmpty(warehouseEntity.getSerialNo()) && warehouseEntity.getSerialNo().length() > 20) { + return ResultVOUtils.error(500, "无效条码！序列号超出最大范围"); + } + + if (StrUtil.isNotEmpty(warehouseEntity.getBatchNo()) && warehouseEntity.getBatchNo().length() > 20) { + return ResultVOUtils.error(500, "无效条码！批次号超出最大范围"); + } + + if (StrUtil.isEmpty(warehouseEntity.getSerialNo()) && StrUtil.isEmpty(warehouseEntity.getBatchNo())) { + return ResultVOUtils.error(500, "批次号不能为空！"); + } + + + if (StrUtil.isNotEmpty(warehouseEntity.getSerialNo())) { + List warehouseEntityList = codesTempService.findByOrderId(warehouseEntity.getOrderId()); + for (WarehouseEntity object : warehouseEntityList) { + if (object.getId() != warehouseEntity.getId() && object.getCode().equals(warehouseEntity.getCode()) && StrUtil.nullToEmpty(object.getCode()).equals(warehouseEntity.getSerialNo())) { + return ResultVOUtils.error(500, "条码重复！"); + } + } + } + + boolean b = codesTempService.update(warehouseEntity); if (b) return ResultVOUtils.success("修改成功"); diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inout/impl/OrderServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/inout/impl/OrderServiceImpl.java index 1ae2732c..f1b70c0a 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/inout/impl/OrderServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/inout/impl/OrderServiceImpl.java @@ -338,7 +338,8 @@ public class OrderServiceImpl implements OrderService { stockOrderEntityList.forEach(stockOrderEntity -> { StockOrderResponse response = new StockOrderResponse(); BeanUtil.copyProperties(stockOrderEntity, response); - if (stockOrderEntity.getStatus().equals(ConstantStatus.SORDER_DELIVER) && checkBusTypeSupplementOrder(stockOrderEntity.getBillNo())) { + if (stockOrderEntity.getStatus().equals(ConstantStatus.SORDER_DELIVER) && checkBusTypeSupplementOrder(stockOrderEntity.getBillNo()) + && StrUtil.isEmpty(stockOrderEntity.getSupplementNo())) { response.setEnableSupplementOrder(true); } result.add(response); From 454180ccbefc595e408b3fe613aebf9b5167bb32 Mon Sep 17 00:00:00 2001 From: anthonyywj2 <353682448@qq.com> Date: Thu, 11 Aug 2022 09:13:38 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E5=A4=87=E4=BB=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/glxp/api/admin/controller/inout/OrderController.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/inout/OrderController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/inout/OrderController.java index cd3f76bf..9b4e8489 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/inout/OrderController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/inout/OrderController.java @@ -75,8 +75,6 @@ public class OrderController { BussinessTypeService bussinessTypeService; @Resource SystemParamConfigService systemParamConfigService; - @Resource - CompanyService companyService; @Value("${file_path}") private String filePath; @Resource