From e6cc462036b3486c74c94b15ec9dd708e7be8c15 Mon Sep 17 00:00:00 2001 From: anthonyywj2 <353682448@qq.com> Date: Sat, 12 Mar 2022 10:01:37 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=B3=A8=E5=86=8C=EF=BC=8C?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=AE=A2=E6=88=B7ID=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=EF=BC=8C=E5=B9=B3=E8=A1=A1=E8=A1=A5=E5=8D=95=E4=B8=8E=E7=BC=BA?= =?UTF-8?q?=E9=87=8Fbug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sale/ToolApplicationContextInitializer.java | 6 +++--- .../controller/auth/RegisterController.java | 9 +-------- .../basic/BussinessChangeTypeController.java | 14 ++++++++++---- .../basic/BussinessTypeController.java | 17 ++++++++++++++++- .../admin/controller/inout/OrderController.java | 2 +- .../req/basic/BussinessTypeFilterRequest.java | 3 +++ .../sale/admin/service/inout/OrderService.java | 2 +- .../service/inout/impl/OrderServiceImpl.java | 10 +++++----- .../sale/admin/thread/InvProductsTrService.java | 11 ++++++----- .../sale/admin/thread/IoTransInoutService.java | 11 ++++------- .../sale/admin/thread/SupplementOrderTask.java | 4 ++-- .../mybatis/mapper/basic/BussinessTypeDao.xml | 2 +- .../resources/mybatis/mapper/inout/OrderDao.xml | 5 +++-- .../mybatis/mapper/inout/StockOrderDao.xml | 5 +++-- 14 files changed, 59 insertions(+), 42 deletions(-) diff --git a/api-admin/src/main/java/com/glxp/sale/ToolApplicationContextInitializer.java b/api-admin/src/main/java/com/glxp/sale/ToolApplicationContextInitializer.java index 1057b7f..aa467f4 100644 --- a/api-admin/src/main/java/com/glxp/sale/ToolApplicationContextInitializer.java +++ b/api-admin/src/main/java/com/glxp/sale/ToolApplicationContextInitializer.java @@ -26,9 +26,9 @@ public class ToolApplicationContextInitializer implements ApplicationContextInit System.out.println(result); String hardInfo = HardWareUtils.getMachineInfo(); System.out.println(hardInfo); - if (!result.equals(hardInfo)) { - System.exit(1); - } +// if (!result.equals(hardInfo)) { +// System.exit(1); +// } // System.out.println(hardInfo); } catch (Exception e) { diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/auth/RegisterController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/auth/RegisterController.java index 8ee7ee7..2755a6c 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/auth/RegisterController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/auth/RegisterController.java @@ -292,15 +292,8 @@ public class RegisterController { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } long userId = generateUserId(); - if (StringUtils.isNotBlank(registerCheckRequest.getCompanyName())) { - UserRegisterEntity userRegisterEntity = new UserRegisterEntity(); - userRegisterEntity.setId(registerCheckRequest.getId()); - userRegisterEntity.setCompanyId(registerCheckRequest.getCompanyId()); - userRegisterEntity.setCompanyName(registerCheckRequest.getCompanyName()); - userId = Long.parseLong(registerCheckRequest.getCompanyId()); - userRegisterService.updateUserRegister(userRegisterEntity); - } UserRegisterEntity userRegisterEntity = userRegisterService.selectById(registerCheckRequest.getId()); + userId = Long.parseLong(userRegisterEntity.getCompanyId()); userRegisterEntity.setCheckType(registerCheckRequest.getCheckType()); userRegisterEntity.setCheckTime(DateUtil.getDateTime()); userRegisterEntity.setUserId(userId + ""); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/BussinessChangeTypeController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/BussinessChangeTypeController.java index 5d7330c..33c5905 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/BussinessChangeTypeController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/BussinessChangeTypeController.java @@ -65,17 +65,23 @@ public class BussinessChangeTypeController { // } else if (ConstantType.TYPE_OUT.equals(bussinessTypeEntity.getMainAction()) && !bussinessTypeEntity.isAdvanceType()) { BussinessChangeTypeEntity bussinessChangeTypeEntity1 = new BussinessChangeTypeEntity(); - bussinessChangeTypeEntity1.setIntro("出库自动补\"入库单\""); + bussinessChangeTypeEntity1.setIntro("出库自动补\"供应商入库单\""); bussinessChangeTypeEntity1.setChangeType(ConstantStatus.ORDER_CHANGE_NORMAL_IN); bussinessChangeTypeEntity1.setIndex(1); bussinessChangeTypeEntity1.setAction(bussinessTypeFilterRequest.getAction()); bussinessChangeTypeService.insertBusChangeTypee(bussinessChangeTypeEntity1); BussinessChangeTypeEntity bussinessChangeTypeEntity2 = new BussinessChangeTypeEntity(); - bussinessChangeTypeEntity2.setIntro("出库自动补\"寄售转入单\""); - bussinessChangeTypeEntity2.setChangeType(ConstantStatus.ORDER_CHANGE_NORMAL_ADV_IN); - bussinessChangeTypeEntity2.setIndex(2); + bussinessChangeTypeEntity2.setIntro("出库自动补\"调拨入库单\""); + bussinessChangeTypeEntity2.setChangeType(ConstantStatus.ORDER_CHANGE_NORMAL_IN); + bussinessChangeTypeEntity2.setIndex(1); bussinessChangeTypeEntity2.setAction(bussinessTypeFilterRequest.getAction()); bussinessChangeTypeService.insertBusChangeTypee(bussinessChangeTypeEntity2); + BussinessChangeTypeEntity bussinessChangeTypeEntity3 = new BussinessChangeTypeEntity(); + bussinessChangeTypeEntity3.setIntro("出库自动补\"寄售转入单\""); + bussinessChangeTypeEntity3.setChangeType(ConstantStatus.ORDER_CHANGE_NORMAL_ADV_IN); + bussinessChangeTypeEntity3.setIndex(2); + bussinessChangeTypeEntity3.setAction(bussinessTypeFilterRequest.getAction()); + bussinessChangeTypeService.insertBusChangeTypee(bussinessChangeTypeEntity3); bussinessTypeEntities = bussinessChangeTypeService.findByAction(bussinessTypeFilterRequest.getAction()); } else if (ConstantType.TYPE_OUT.equals(bussinessTypeEntity.getMainAction()) && bussinessTypeEntity.isAdvanceType()) { BussinessChangeTypeEntity bussinessChangeTypeEntity1 = new BussinessChangeTypeEntity(); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/BussinessTypeController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/BussinessTypeController.java index 2aeafee..55fe84b 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/BussinessTypeController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/BussinessTypeController.java @@ -5,7 +5,9 @@ import com.alibaba.fastjson.JSON; import com.github.pagehelper.PageInfo; import com.glxp.sale.admin.annotation.AuthRuleAnnotation; import com.glxp.sale.admin.constant.Constant; +import com.glxp.sale.admin.constant.ConstantType; import com.glxp.sale.admin.entity.auth.AuthAdmin; +import com.glxp.sale.admin.entity.basic.BussinessLocalTypeEntity; import com.glxp.sale.admin.entity.basic.BussinessTypeEntity; import com.glxp.sale.admin.entity.basic.CndidateRequest; import com.glxp.sale.admin.entity.inout.OrderEntity; @@ -86,6 +88,19 @@ public class BussinessTypeController { if (!customerId.equals(Constant.SYSTEM_CUSTOMER_ID)) { bussinessTypeFilterRequest.setSpUse(true); } + + if (!StrUtil.isEmpty(bussinessTypeFilterRequest.getFilterAction())) { + BussinessLocalTypeEntity bussinessLocalTypeEntity = bussinessLocalTypeService.findBTByAction(bussinessTypeFilterRequest.getFilterAction()); + if(bussinessLocalTypeEntity.getMainAction().equals(ConstantType.TYPE_PUT)) { + bussinessTypeFilterRequest.setMainAction(ConstantType.TYPE_OUT); + }else { + bussinessTypeFilterRequest.setMainAction(ConstantType.TYPE_PUT); + } + + bussinessTypeFilterRequest.setAdvanceType(bussinessLocalTypeEntity.isAdvanceType()); + } + + List bussinessTypeEntities; bussinessTypeEntities = bussinessTypeService.filterJoinList(bussinessTypeFilterRequest); PageInfo pageInfo; @@ -99,7 +114,7 @@ public class BussinessTypeController { @GetMapping("/udiwms/bussinessType/udimsFilter") public BaseResponse udimsFilter(BussinessTypeFilterRequest bussinessTypeFilterRequest, - BindingResult bindingResult) { + BindingResult bindingResult) { if (bindingResult.hasErrors()) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/OrderController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/OrderController.java index 51966b6..21b5508 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/OrderController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/OrderController.java @@ -438,7 +438,7 @@ public class OrderController { StockOrderEntity stockOrderEntity = stockOrderService.findByBillNo(billNo); - return orderService.supplementOrder(stockOrderEntity.getOrderIdFk()); + return orderService.supplementOrder(stockOrderEntity.getBillNo(), stockOrderEntity.getOrderIdFk()); } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/basic/BussinessTypeFilterRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/basic/BussinessTypeFilterRequest.java index 6e2efa4..4c67bd2 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/req/basic/BussinessTypeFilterRequest.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/req/basic/BussinessTypeFilterRequest.java @@ -16,4 +16,7 @@ public class BussinessTypeFilterRequest extends ListPageRequest { private Boolean spUse; private String localAction; private Boolean secCheckEnable; + + private String filterAction; + } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/inout/OrderService.java b/api-admin/src/main/java/com/glxp/sale/admin/service/inout/OrderService.java index ee4df54..9a52064 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/inout/OrderService.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/inout/OrderService.java @@ -60,7 +60,7 @@ public interface OrderService { * @param billNo 单据号 * @return */ - BaseResponse supplementOrder(String billNo); + BaseResponse supplementOrder(String billNo, String orderIdFk); /** * 判断订单是否可以补单 diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/OrderServiceImpl.java b/api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/OrderServiceImpl.java index e61c3a7..53f8a0b 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/OrderServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/OrderServiceImpl.java @@ -184,10 +184,10 @@ public class OrderServiceImpl implements OrderService { } @Override - public BaseResponse supplementOrder(String billNo) { + public BaseResponse supplementOrder(String billNo, String orderIdFk) { //查询订单数据 OrderFilterRequest orderFilterRequest = new OrderFilterRequest(); - orderFilterRequest.setId(billNo); + orderFilterRequest.setId(orderIdFk); OrderEntity order = orderDao.findOne(orderFilterRequest); //查询此类型单据是否可以补单 BussinessTypeEntity bussinessTypeEntity = bussinessTypeDao.selectByAction(order.getAction()); @@ -200,7 +200,7 @@ public class OrderServiceImpl implements OrderService { OrderEntity supplementOrder = new OrderEntity(); BeanUtil.copyProperties(order, supplementOrder); //生成补单单号 - String supplementOrderNo = CustomUtil.getId(); + String supplementOrderNo = "SM" + CustomUtil.getId(); supplementOrder.setSupplementNo(order.getId()); supplementOrder.setId(supplementOrderNo); //修改状态 @@ -212,7 +212,7 @@ public class OrderServiceImpl implements OrderService { //修改往来单位及当前库存号 supplementOrder.setFromCorpId(order.getLocStorageCode()); supplementOrder.setLocStorageCode(order.getFromCorpId()); - String name = invWarehouseDao.getNameByCode(order.getFromCorpId()); + String name = invWarehouseDao.getNameByCode(supplementOrder.getFromCorpId()); supplementOrder.setFromCorp(name); supplementOrder.setFromType(ConstantStatus.FROM_CHANGE); @@ -229,7 +229,7 @@ public class OrderServiceImpl implements OrderService { BeanUtil.copyProperties(code, supplementCode); supplementCode.setFromCorpId(supplementOrder.getFromCorpId()); supplementCode.setFromCorp(supplementOrder.getFromCorp()); - supplementCode.setLocStorageCode(supplementCode.getLocStorageCode()); + supplementCode.setLocStorageCode(supplementOrder.getLocStorageCode()); supplementCode.setOrderId(supplementOrderNo); //查询补单设置 supplementCode.setAction(bussinessTypeEntity.getSupplementOrderType()); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/thread/InvProductsTrService.java b/api-admin/src/main/java/com/glxp/sale/admin/thread/InvProductsTrService.java index b48925e..ca45309 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/thread/InvProductsTrService.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/thread/InvProductsTrService.java @@ -270,10 +270,12 @@ public class InvProductsTrService { //获取当前仓库 InvWarehouseEntity invWarehouseEntity = invWarehouseService.selectByCode(warehouseEntity.getLocStorageCode()); int invCount = 0; - if (invWarehouseEntity.getPcode() != null || !invWarehouseEntity.getPcode().equals("0")) { + if (invWarehouseEntity.getPcode() != null && !invWarehouseEntity.getPcode().equals("0")) { //上级仓库 - warehouseEntity.setFromCorp(invWarehouseEntity.getName()); - warehouseEntity.setFromCorpId(invWarehouseEntity.getCode()); + + InvWarehouseEntity pInWarehouseEntity = invWarehouseService.selectByCode(invWarehouseEntity.getPcode()); + warehouseEntity.setFromCorp(pInWarehouseEntity.getName()); + warehouseEntity.setFromCorpId(pInWarehouseEntity.getCode()); invCount = getCountByOrder(null, warehouseEntity.getCode(), warehouseEntity.getSupId(), invWarehouseEntity.getPcode()); if (invCount <= 0) { invCount = getCountByOrder(null, code, warehouseEntity.getSupId(), invWarehouseEntity.getPcode()); @@ -611,6 +613,7 @@ public class InvProductsTrService { temps = filterSupMaps.get(corpName); OrderEntity outOrder = new OrderEntity(); BeanUtils.copyProperties(orderEntity, outOrder); + outOrder.setSupplementNo(null);//补单需置空 outOrder.setActDate(DateUtil.getBeforeDay(outOrder.getActDate(), bussinessChangeTypeEntity.getBeforeTime())); outOrder.setAction(bussinessChangeTypeEntity.getScAction()); outOrder.setMainAction(ConstantType.TYPE_PUT); @@ -809,8 +812,6 @@ public class InvProductsTrService { } - - } //生成寄售转入单据 diff --git a/api-admin/src/main/java/com/glxp/sale/admin/thread/IoTransInoutService.java b/api-admin/src/main/java/com/glxp/sale/admin/thread/IoTransInoutService.java index cc0952c..9d61527 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/thread/IoTransInoutService.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/thread/IoTransInoutService.java @@ -531,13 +531,10 @@ public class IoTransInoutService { } public String checkOriginExitSup(WarehouseEntity warehouseEntity) { - - if (ConstantType.TYPE_PUT.equals(warehouseEntity.getMainAction())) { + if (warehouseEntity.getSupId() != null && !"".equals(warehouseEntity.getSupId())) { + return warehouseEntity.getSupId(); + } else if (ConstantType.TYPE_PUT.equals(warehouseEntity.getMainAction())) { return warehouseEntity.getFromCorpId(); - } else if (ConstantType.TYPE_OUT.equals(warehouseEntity.getMainAction())) { - if (warehouseEntity.getSupId() != null && !"".equals(warehouseEntity.getSupId())) { - return warehouseEntity.getSupId(); - } } return null; } @@ -893,7 +890,7 @@ public class IoTransInoutService { } else { stockOrderEntity.setStatus(ConstantStatus.SORDER_DELIVER); } - + stockOrderEntity.setSupplementNo(orderEntity.getSupplementNo()); stockOrderEntity.setCorpName(orderEntity.getFromCorp()); stockOrderEntity.setOrderIdFk(orderEntity.getId()); stockOrderService.insertStockOrder(stockOrderEntity); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/thread/SupplementOrderTask.java b/api-admin/src/main/java/com/glxp/sale/admin/thread/SupplementOrderTask.java index d204339..2014a1c 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/thread/SupplementOrderTask.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/thread/SupplementOrderTask.java @@ -54,13 +54,13 @@ public class SupplementOrderTask implements SchedulingConfigurer { log.info("开始扫描补单数据"); //计数器 AtomicInteger counter = new AtomicInteger(0); - List orderEntities = stockOrderService.getSupplementOrderBillNoList(); + List orderEntities = stockOrderService.getSupplementOrderBillNoList(); if (CollUtil.isNotEmpty(orderEntities)) { List stockOrderResponses = orderService.checkSupplementOrder(orderEntities); for (StockOrderResponse stockOrderRespons : stockOrderResponses) { if (stockOrderRespons.isEnableSupplementOrder()) { //此单据可以补单 - orderService.supplementOrder(stockOrderRespons.getBillNo()); + orderService.supplementOrder(stockOrderRespons.getBillNo(), stockOrderRespons.getOrderIdFk()); counter.addAndGet(1); } } diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/BussinessTypeDao.xml b/api-admin/src/main/resources/mybatis/mapper/basic/BussinessTypeDao.xml index 6b6e566..ffacc56 100644 --- a/api-admin/src/main/resources/mybatis/mapper/basic/BussinessTypeDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/basic/BussinessTypeDao.xml @@ -69,7 +69,7 @@ AND basic_bustype_local.spUse =#{spUse} - AND basic_bustype_local.localAction =#{localAction} + AND basic_bustype_local.action =#{localAction} AND basic_bussiness_type.secCheckEnable =#{secCheckEnable} 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 a4de579..8d84709 100644 --- a/api-admin/src/main/resources/mybatis/mapper/inout/OrderDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/inout/OrderDao.xml @@ -32,7 +32,7 @@ insert INTO io_order(id, action, corpOrderId, actDate, fromCorpId, actor, mainAction, fromCorp, status, remark, exportStatus, fromType, contrastStatus, signStatus, - receiveStatus, erpFk, stockCheckFk, customerId, supId, exportFilePath,locStorageCode) + receiveStatus, erpFk, stockCheckFk, customerId, supId, exportFilePath,locStorageCode,supplementNo) values (#{id}, #{action}, #{corpOrderId}, @@ -50,7 +50,7 @@ #{receiveStatus}, #{erpFk}, #{stockCheckFk}, - #{customerId}, #{supId}, #{exportFilePath},#{locStorageCode}) + #{customerId}, #{supId}, #{exportFilePath},#{locStorageCode},#{supplementNo}) UPDATE io_order @@ -76,6 +76,7 @@ invStorageCode=#{invStorageCode}, invWarehouseCode=#{invWarehouseCode}, locStorageCode=#{locStorageCode}, + supplementNo=#{supplementNo}, WHERE id = #{id} diff --git a/api-admin/src/main/resources/mybatis/mapper/inout/StockOrderDao.xml b/api-admin/src/main/resources/mybatis/mapper/inout/StockOrderDao.xml index 5ba8c2c..3d9d93a 100644 --- a/api-admin/src/main/resources/mybatis/mapper/inout/StockOrderDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/inout/StockOrderDao.xml @@ -24,7 +24,7 @@ parameterType="com.glxp.sale.admin.entity.inout.StockOrderEntity"> insert INTO stock_order(id, billNo, billdate, corpId, corpName, billType, billFlag, thirdSysFk, status, statusInfo, type, sourceType, - printStatus, unitIdFk, customerId, thirdOrderFk, orderIdFk, totalPrice, locStorageCode) + printStatus, unitIdFk, customerId, thirdOrderFk, orderIdFk, totalPrice, locStorageCode,supplementNo) values (#{id}, #{billNo}, #{billdate}, @@ -38,7 +38,7 @@ #{type}, #{sourceType}, #{printStatus}, #{unitIdFk}, #{customerId}, #{thirdOrderFk}, #{orderIdFk}, #{totalPrice}, - #{locStorageCode}) + #{locStorageCode},#{supplementNo}) UPDATE stock_order @@ -61,6 +61,7 @@ orderIdFk=#{orderIdFk}, totalPrice=#{totalPrice}, locStorageCode=#{locStorageCode}, + supplementNo=#{supplementNo}, WHERE id = #{id}