From d175bf1e66c1be70a6fa819c005163e30f692d23 Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Wed, 19 Apr 2023 14:28:35 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E6=81=A2=E5=A4=8D=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../auth/InvWarehouseController.java | 24 +++++++++++++++++++ .../basic/IBasicBusTypePreService.java | 3 +++ .../impl/BasicBusTypePreServiceImpl.java | 4 ++++ 3 files changed, 31 insertions(+) diff --git a/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java b/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java index 9808c352..14b58a24 100644 --- a/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java +++ b/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java @@ -264,9 +264,27 @@ public class InvWarehouseController extends BaseController { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); } + Integer userCount = warehouseUserService.countUserBySubInvCode(invWarehouseEntity.getCode()); + if (userCount > 0) { + return ResultVOUtils.error(500, "修改失败,请先移除该仓库关联用户！"); + } + //更新仓库信息 + invWarehouseEntity.setUpdateTime(new Date()); boolean b = invWarehouseService.updateInvSubWarehouse(invWarehouseEntity); + //如果要是一级仓库就吧全部子集都刷成一样的寄售仓库 + if(StrUtil.isBlank(invWarehouseEntity.getParentCode())){ + List invWarehouseEntityList=invWarehouseService.selectLowWarehouseAll(invWarehouseEntity.getCode()); + for (InvWarehouseEntity obj : invWarehouseEntityList) { + obj.setAdvanceType(invWarehouseEntity.getAdvanceType()); + obj.setUpdateTime(new Date()); + invWarehouseService.updateInvSubWarehouse(obj); + } + } + + + //更新部门信息 DeptEntity pEntity = deptService.selectByCode(invWarehouseEntity.getParentId()); pEntity.setUpdateTime(new Date()); @@ -610,4 +628,10 @@ public class InvWarehouseController extends BaseController { return ResultVOUtils.success(); } + @PostMapping("/warehouse/inout/getDeptById") + public BaseResponse getDeptById(@RequestBody List deptIds) { + List list = deptService.getDeptById(deptIds); + return ResultVOUtils.success(list); + } + } diff --git a/src/main/java/com/glxp/api/service/basic/IBasicBusTypePreService.java b/src/main/java/com/glxp/api/service/basic/IBasicBusTypePreService.java index 8c3aa4c0..3822a371 100644 --- a/src/main/java/com/glxp/api/service/basic/IBasicBusTypePreService.java +++ b/src/main/java/com/glxp/api/service/basic/IBasicBusTypePreService.java @@ -5,6 +5,7 @@ import com.glxp.api.req.basic.FilterBusTypeChangeRequest; import com.glxp.api.req.basic.FilterBusTypePreRequest; import com.glxp.api.res.basic.BasicBusTypePreResponse; +import java.util.Date; import java.util.List; /** @@ -79,4 +80,6 @@ public interface IBasicBusTypePreService { * @return */ boolean verifyExists(BasicBusTypePreEntity basicBusTypePreEntity); + + List findByLastTime(Date lastUpdateTime); } diff --git a/src/main/java/com/glxp/api/service/basic/impl/BasicBusTypePreServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/BasicBusTypePreServiceImpl.java index 2b898f0d..856aad5a 100644 --- a/src/main/java/com/glxp/api/service/basic/impl/BasicBusTypePreServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/BasicBusTypePreServiceImpl.java @@ -105,6 +105,10 @@ public class BasicBusTypePreServiceImpl implements IBasicBusTypePreService { return false; } + @Override + public List findByLastTime(Date lastUpdateTime) { + return basicBusTypePreDao.selectList(new QueryWrapper().gt("updateTime", lastUpdateTime)); + } /** * 设置创建/更新信息 * From 76994ae9f54fb442d1438cac31b40116b2b20d56 Mon Sep 17 00:00:00 2001 From: anthonywj Date: Wed, 19 Apr 2023 14:36:45 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E9=A2=86=E7=94=A8=E5=8D=95=E6=8D=AE?= =?UTF-8?q?=E5=AE=A1=E6=A0=B8bug=E4=BF=AE=E6=94=B9=EF=BC=8C=E8=87=AA?= =?UTF-8?q?=E5=8A=A8=E7=94=9F=E6=88=90=E4=B8=9A=E5=8A=A1=E5=8D=95=EF=BC=8C?= =?UTF-8?q?=E6=89=AB=E7=A0=81=E5=8D=95=E7=AD=89=E4=BF=AE=E6=94=B9=E8=BF=81?= =?UTF-8?q?=E7=A7=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../purchase/IoPurChangeService.java | 6 +-- .../api/dao/basic/BasicBusTypeChangeDao.java | 3 +- .../glxp/api/dao/inout/ReceiveDetailDao.java | 4 +- .../res/basic/BasicBusTypeChangeResponse.java | 3 ++ .../basic/IBasicBusTypeChangeService.java | 1 - .../basic/IBasicBusTypePreService.java | 3 ++ .../impl/BasicBusTypeChangeServiceImpl.java | 1 - .../impl/BasicBusTypePreServiceImpl.java | 5 ++ .../api/service/inout/ReceiveService.java | 4 ++ .../service/inout/ReceivedetailService.java | 3 +- .../inout/impl/ReceiveDetailServiceImpl.java | 6 ++- .../inout/impl/ReceiveServiceImpl.java | 9 ++-- .../mapper/basic/BasicBusTypeChangeDao.xml | 9 ++-- .../mybatis/mapper/inout/ReceiveDetailDao.xml | 54 ++++++++++++++----- 14 files changed, 83 insertions(+), 28 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/purchase/IoPurChangeService.java b/src/main/java/com/glxp/api/controller/purchase/IoPurChangeService.java index 0c5a048d..7317cd49 100644 --- a/src/main/java/com/glxp/api/controller/purchase/IoPurChangeService.java +++ b/src/main/java/com/glxp/api/controller/purchase/IoPurChangeService.java @@ -275,7 +275,7 @@ public class IoPurChangeService { billNo += ioOrderEntity.getBillNo() + ","; //插入业务单表 for (PurReceiveDetailEntity obj : m.getValue()) { - BasicProductsEntity basicProductsEntity = purPlanDetailService.selectIoOrderDetailBiz(obj.getId()); + BasicProductsEntity basicProductsEntity = receivedetailService.selectIoOrderDetailBiz(obj.getId()); IoOrderDetailBizEntity ioOrderDetailBizEntity = new IoOrderDetailBizEntity(); ioOrderDetailBizEntity.setOrderIdFk(ioOrderEntity.getBillNo()); ioOrderDetailBizEntity.setBindRlFk(obj.getRelIdFk()); @@ -436,10 +436,10 @@ public class IoPurChangeService { ioOrderEntity.setAction(basicBusTypeChangeEntity.getTargetAction()); ioOrderEntity.setFromCorp(m.getKey()); ioOrderEntity.setFromType(ConstantStatus.FROM_Order); - if(basicBusTypeChangeEntity.getAuditStatus()==1){ + if (basicBusTypeChangeEntity.getAuditStatus() == 1) { ioOrderEntity.setStatus(ConstantStatus.ORDER_STATUS_TEMP_SAVE); ioOrderEntity.setDealStatus(ConstantStatus.ORDER_STATUS_TEMP_SAVE); - }else if(basicBusTypeChangeEntity.getAuditStatus()==2){ + } else if (basicBusTypeChangeEntity.getAuditStatus() == 2) { ioOrderEntity.setStatus(ConstantStatus.ORDER_STATUS_CHECK); ioOrderEntity.setDealStatus(ConstantStatus.ORDER_STATUS_PROCESS); } diff --git a/src/main/java/com/glxp/api/dao/basic/BasicBusTypeChangeDao.java b/src/main/java/com/glxp/api/dao/basic/BasicBusTypeChangeDao.java index 652a0b2b..088aefdf 100644 --- a/src/main/java/com/glxp/api/dao/basic/BasicBusTypeChangeDao.java +++ b/src/main/java/com/glxp/api/dao/basic/BasicBusTypeChangeDao.java @@ -21,4 +21,5 @@ public interface BasicBusTypeChangeDao extends BaseMapper filterList(FilterBusTypeChangeRequest filterBusTypeChangeRequest); -} \ No newline at end of file + +} diff --git a/src/main/java/com/glxp/api/dao/inout/ReceiveDetailDao.java b/src/main/java/com/glxp/api/dao/inout/ReceiveDetailDao.java index c0258375..ffaf2e57 100644 --- a/src/main/java/com/glxp/api/dao/inout/ReceiveDetailDao.java +++ b/src/main/java/com/glxp/api/dao/inout/ReceiveDetailDao.java @@ -1,12 +1,14 @@ package com.glxp.api.dao.inout; import com.glxp.api.dao.BaseMapperPlus; +import com.glxp.api.entity.basic.BasicProductsEntity; import com.glxp.api.entity.inout.PurReceiveDetailEntity; import com.glxp.api.req.inout.FilterReceiveDetailRequest; import com.glxp.api.req.inout.UpdateReceiveDetailRequest; import com.glxp.api.res.inout.ReceiveDetailResponse; import com.glxp.api.res.inout.ReceiveResponse; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -17,5 +19,5 @@ public interface ReceiveDetailDao extends BaseMapperPlus findByLastTime(Date lastUpdateTime); } diff --git a/src/main/java/com/glxp/api/service/basic/impl/BasicBusTypeChangeServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/BasicBusTypeChangeServiceImpl.java index a37faad5..7812a8b3 100644 --- a/src/main/java/com/glxp/api/service/basic/impl/BasicBusTypeChangeServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/BasicBusTypeChangeServiceImpl.java @@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.PageHelper; import com.glxp.api.dao.basic.BasicBusTypeChangeDao; import com.glxp.api.entity.basic.BasicBusTypeChangeEntity; -import com.glxp.api.entity.basic.BasicBussinessTypeEntity; import com.glxp.api.req.basic.FilterBusTypeChangeRequest; import com.glxp.api.res.basic.BasicBusTypeChangeResponse; import com.glxp.api.service.auth.CustomerService; diff --git a/src/main/java/com/glxp/api/service/basic/impl/BasicBusTypePreServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/BasicBusTypePreServiceImpl.java index 2b898f0d..1fb71d32 100644 --- a/src/main/java/com/glxp/api/service/basic/impl/BasicBusTypePreServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/BasicBusTypePreServiceImpl.java @@ -105,6 +105,11 @@ public class BasicBusTypePreServiceImpl implements IBasicBusTypePreService { return false; } + @Override + public List findByLastTime(Date lastUpdateTime) { + return basicBusTypePreDao.selectList(new QueryWrapper().gt("updateTime", lastUpdateTime)); + } + /** * 设置创建/更新信息 * diff --git a/src/main/java/com/glxp/api/service/inout/ReceiveService.java b/src/main/java/com/glxp/api/service/inout/ReceiveService.java index f0592f6d..bd7aed7c 100644 --- a/src/main/java/com/glxp/api/service/inout/ReceiveService.java +++ b/src/main/java/com/glxp/api/service/inout/ReceiveService.java @@ -1,5 +1,6 @@ package com.glxp.api.service.inout; +import com.glxp.api.entity.basic.BasicProductsEntity; import com.glxp.api.entity.inout.PurReceiveEntity; import com.glxp.api.req.inout.FilterReceiveRequest; import com.glxp.api.res.inout.ReceiveResponse; @@ -21,4 +22,7 @@ public interface ReceiveService { boolean delReceive(String orderIdFk); + + + } diff --git a/src/main/java/com/glxp/api/service/inout/ReceivedetailService.java b/src/main/java/com/glxp/api/service/inout/ReceivedetailService.java index 15e4c842..b097e0b3 100644 --- a/src/main/java/com/glxp/api/service/inout/ReceivedetailService.java +++ b/src/main/java/com/glxp/api/service/inout/ReceivedetailService.java @@ -1,5 +1,6 @@ package com.glxp.api.service.inout; +import com.glxp.api.entity.basic.BasicProductsEntity; import com.glxp.api.entity.inout.PurReceiveDetailEntity; import com.glxp.api.req.inout.FilterReceiveDetailRequest; import com.glxp.api.req.inout.FilterReceiveRequest; @@ -22,5 +23,5 @@ public interface ReceivedetailService { boolean delDetail(String id); - + BasicProductsEntity selectIoOrderDetailBiz(long id); } diff --git a/src/main/java/com/glxp/api/service/inout/impl/ReceiveDetailServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/ReceiveDetailServiceImpl.java index 2562bd1b..8e046072 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/ReceiveDetailServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inout/impl/ReceiveDetailServiceImpl.java @@ -3,6 +3,7 @@ package com.glxp.api.service.inout.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.PageHelper; import com.glxp.api.dao.inout.ReceiveDetailDao; +import com.glxp.api.entity.basic.BasicProductsEntity; import com.glxp.api.entity.inout.PurReceiveDetailEntity; import com.glxp.api.req.inout.FilterReceiveDetailRequest; import com.glxp.api.req.inout.UpdateReceiveDetailRequest; @@ -55,5 +56,8 @@ public class ReceiveDetailServiceImpl implements ReceivedetailService { return true; } - + @Override + public BasicProductsEntity selectIoOrderDetailBiz(long id) { + return receiveDetailDao.selectIoOrderDetailBiz(id); + } } diff --git a/src/main/java/com/glxp/api/service/inout/impl/ReceiveServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/ReceiveServiceImpl.java index f9e07174..866506ba 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/ReceiveServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inout/impl/ReceiveServiceImpl.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.PageHelper; import com.glxp.api.dao.inout.ReceiveDao; import com.glxp.api.dao.inout.ReceiveDetailDao; +import com.glxp.api.entity.basic.BasicProductsEntity; import com.glxp.api.entity.inout.PurReceiveDetailEntity; import com.glxp.api.entity.inout.PurReceiveEntity; import com.glxp.api.req.inout.FilterReceiveRequest; @@ -38,9 +39,9 @@ public class ReceiveServiceImpl implements ReceiveService { @Override public int updateOrder(PurReceiveEntity purReceiveEntity) { - QueryWrapper ew=new QueryWrapper<>(); - ew.eq("billNo",purReceiveEntity.getBillNo()); - return receiveDao.update(purReceiveEntity,ew); + QueryWrapper ew = new QueryWrapper<>(); + ew.eq("billNo", purReceiveEntity.getBillNo()); + return receiveDao.update(purReceiveEntity, ew); } @Override @@ -67,4 +68,6 @@ public class ReceiveServiceImpl implements ReceiveService { } + + } diff --git a/src/main/resources/mybatis/mapper/basic/BasicBusTypeChangeDao.xml b/src/main/resources/mybatis/mapper/basic/BasicBusTypeChangeDao.xml index 4f5748d8..9560b4ea 100644 --- a/src/main/resources/mybatis/mapper/basic/BasicBusTypeChangeDao.xml +++ b/src/main/resources/mybatis/mapper/basic/BasicBusTypeChangeDao.xml @@ -2,10 +2,11 @@ UPDATE pur_receive_detail - orderIdFk=#{orderIdFk}, - relIdFk=#{relIdFk}, - nameCode=#{nameCode}, - count=#{count}, - supId=#{supId}, - productDate=#{productDate}, - batchNo=#{batchNo}, - expireDate=#{expireDate}, + + orderIdFk=#{orderIdFk}, + + + relIdFk=#{relIdFk}, + + + nameCode=#{nameCode}, + + + count=#{count}, + + + supId=#{supId}, + + + productDate=#{productDate}, + + + batchNo=#{batchNo}, + + + expireDate=#{expireDate}, + WHERE id = #{id} + + From abe47786b582533aba793f1010154cbcbfe7098a Mon Sep 17 00:00:00 2001 From: anthonywj Date: Wed, 19 Apr 2023 14:37:08 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E9=A2=86=E7=94=A8=E5=8D=95=E6=8D=AE?= =?UTF-8?q?=E5=AE=A1=E6=A0=B8bug=E4=BF=AE=E6=94=B9=EF=BC=8C=E8=87=AA?= =?UTF-8?q?=E5=8A=A8=E7=94=9F=E6=88=90=E4=B8=9A=E5=8A=A1=E5=8D=95=EF=BC=8C?= =?UTF-8?q?=E6=89=AB=E7=A0=81=E5=8D=95=E7=AD=89=E4=BF=AE=E6=94=B9=E8=BF=81?= =?UTF-8?q?=E7=A7=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/glxp/api/service/inout/IoAddInoutService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/glxp/api/service/inout/IoAddInoutService.java b/src/main/java/com/glxp/api/service/inout/IoAddInoutService.java index aaebf94b..aa276a9c 100644 --- a/src/main/java/com/glxp/api/service/inout/IoAddInoutService.java +++ b/src/main/java/com/glxp/api/service/inout/IoAddInoutService.java @@ -326,7 +326,7 @@ public class IoAddInoutService { IoOrderEntity order = orderService.findByBillNo(orderId); BasicBussinessTypeEntity bussinessTypeEntity = basicBussinessTypeService.findByAction(order.getAction()); if (StrUtil.isBlank(bussinessTypeEntity.getSupplementOrderType())) { - return ResultVOUtils.error(ResultEnum.valueOf("此类型单据不可补单")); + return ResultVOUtils.error(500,"此单据类型不可补单"); } IoOrderEntity supplementOrder = new IoOrderEntity(); BeanUtil.copyProperties(order, supplementOrder); From e3c25b05b5836e19f9a61191570f63506ef67a16 Mon Sep 17 00:00:00 2001 From: x_z Date: Wed, 19 Apr 2023 14:47:05 +0800 Subject: [PATCH 4/6] =?UTF-8?q?1.=E6=B7=BB=E5=8A=A0=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E8=AF=B7=E6=B1=82=E6=97=B6=E9=97=B4=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/glxp/api/entity/thrsys/ThrSystemDetailEntity.java | 5 +++++ .../api/service/thrsys/impl/ThrSystemDetailServiceImpl.java | 3 ++- .../resources/mybatis/mapper/thrsys/ThrSystemDetailDao.xml | 1 + src/main/resources/schemas/schema_v2.1.sql | 2 ++ 4 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/glxp/api/entity/thrsys/ThrSystemDetailEntity.java b/src/main/java/com/glxp/api/entity/thrsys/ThrSystemDetailEntity.java index e0918c8b..64205c11 100644 --- a/src/main/java/com/glxp/api/entity/thrsys/ThrSystemDetailEntity.java +++ b/src/main/java/com/glxp/api/entity/thrsys/ThrSystemDetailEntity.java @@ -19,6 +19,11 @@ public class ThrSystemDetailEntity { private String localAction; private String thirdAction; + /** + * 请求时间，单位：分钟 + */ + private Integer time; + public String getValue() { if (value == null) return null; diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrSystemDetailServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrSystemDetailServiceImpl.java index 752c1505..f96c99d1 100644 --- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrSystemDetailServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrSystemDetailServiceImpl.java @@ -50,10 +50,11 @@ public class ThrSystemDetailServiceImpl implements ThrSystemDetailService { return data; } - @Transactional(rollbackFor = Exception.class) @Override public void updateInterfaceStatus(List list) { for (ThrSystemDetailEntity thrSystemDetailEntity : list) { + //请求默认0分钟 + thrSystemDetailEntity.setTime(0); thrSystemDetailDao.updateBasicThirdSysDetail(thrSystemDetailEntity); } } diff --git a/src/main/resources/mybatis/mapper/thrsys/ThrSystemDetailDao.xml b/src/main/resources/mybatis/mapper/thrsys/ThrSystemDetailDao.xml index fbc6227f..dc79e907 100644 --- a/src/main/resources/mybatis/mapper/thrsys/ThrSystemDetailDao.xml +++ b/src/main/resources/mybatis/mapper/thrsys/ThrSystemDetailDao.xml @@ -14,6 +14,7 @@ name=#{name}, fromType=#{fromType}, thirdSysFk=#{thirdSysFk}, + time=#{time}, WHERE id=#{id} diff --git a/src/main/resources/schemas/schema_v2.1.sql b/src/main/resources/schemas/schema_v2.1.sql index 82ca826f..68738fbd 100644 --- a/src/main/resources/schemas/schema_v2.1.sql +++ b/src/main/resources/schemas/schema_v2.1.sql @@ -186,6 +186,8 @@ CALL Pro_Temp_ColumnWork('sys_pdf_template_relevance_biz', 'updateTime', 'dateti CALL Pro_Temp_ColumnWork('sys_pdf_template_relevance_label', 'updateTime', 'datetime', 1); CALL Pro_Temp_ColumnWork('sys_pdf_template_relevance_statemen', 'updateTime', 'datetime', 1); +CALL Pro_Temp_ColumnWork('thr_system_detail', 'time', 'int(5)', 1); + # CALL Pro_Temp_ColumnWork('sup_cert_set', 'foreign', 'tinyint', 3); # CALL Pro_Temp_ColumnWork('sup_cert_set', 'needForeign', 'tinyint', 1); From 35704f22219e258006dddd07206bb9c4f5de0a21 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com> Date: Wed, 19 Apr 2023 15:03:22 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E5=8D=95=E6=8D=AE=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4(?= =?UTF-8?q?=E5=90=8C=E6=AD=A5)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic/BasicBussinessTypeController.java | 11 +++++++++++ .../controller/inout/IoCodeTempController.java | 4 ++-- .../entity/basic/BasicBussinessTypeEntity.java | 11 ++++++++--- .../api/req/basic/BussinessTypeSaveRequest.java | 9 ++++++--- .../req/basic/FilterBussinessTypeRequest.java | 3 +++ .../res/basic/BasicBussinessTypeResponse.java | 8 +++++--- .../com/glxp/api/task/AsyncFetchUdiTask.java | 6 +++--- .../java/com/glxp/api/task/AsyncUdiTask.java | 6 +++--- .../mapper/basic/BasicBussinessTypeDao.xml | 16 ++++++++++++---- src/main/resources/schemas/schema_v2.1.sql | 6 ++++++ 10 files changed, 59 insertions(+), 21 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/basic/BasicBussinessTypeController.java b/src/main/java/com/glxp/api/controller/basic/BasicBussinessTypeController.java index bc7dd1bc..5c97cc0d 100644 --- a/src/main/java/com/glxp/api/controller/basic/BasicBussinessTypeController.java +++ b/src/main/java/com/glxp/api/controller/basic/BasicBussinessTypeController.java @@ -389,4 +389,15 @@ public class BasicBussinessTypeController extends BaseController { return ResultVOUtils.success(pageSimpleResponse); } + @GetMapping("/udiwms/busType/selectList") + public BaseResponse selectList() { + + FilterBussinessTypeRequest bussinessTypeFilterRequest=new FilterBussinessTypeRequest(); + bussinessTypeFilterRequest.setAction("2"); + bussinessTypeFilterRequest.setMainAction("WareHouseOut"); + bussinessTypeFilterRequest.setCorpType(2); + List bussinessTypeEntities = basicBussinessTypeService.findList(bussinessTypeFilterRequest); + return ResultVOUtils.success(bussinessTypeEntities); + } + } diff --git a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java index c2d8b4e0..3235f1b2 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java @@ -428,7 +428,7 @@ public class IoCodeTempController extends BaseController { //过期提醒： // SystemParamConfigEntity expireParamConfigEntity = systemParamConfigService.selectByParamKey("expire_date_tip"); - if (bussinessTypeEntity.isCheckExpire() && !addOrderRequest.isIgnoreExpire()) { + if (bussinessTypeEntity.getCheckVailDate()==1 && !addOrderRequest.isIgnoreExpire()) { if (StrUtil.isNotEmpty(udiEntity.getExpireDate())) { String expireDate = "20" + udiEntity.getExpireDate(); long expireTime = DateUtil.parseDateExpire(expireDate); @@ -441,7 +441,7 @@ public class IoCodeTempController extends BaseController { //失效期提醒 SystemParamConfigEntity recentParamConfigEntity = systemParamConfigService.selectByParamKey("recent_date_tip"); long recent = Long.parseLong(recentParamConfigEntity.getParamValue()); - if (bussinessTypeEntity.isCheckVailDate() && recent > 0 && !addOrderRequest.isIgnoreRecentExpire()) { + if (bussinessTypeEntity.getCheckVailDate()==1 && recent > 0 && !addOrderRequest.isIgnoreRecentExpire()) { if (StrUtil.isNotEmpty(udiEntity.getExpireDate())) { String expireDate = "20" + udiEntity.getExpireDate(); long expireTime = DateUtil.parseDateExpire(expireDate); diff --git a/src/main/java/com/glxp/api/entity/basic/BasicBussinessTypeEntity.java b/src/main/java/com/glxp/api/entity/basic/BasicBussinessTypeEntity.java index c01f6077..24ccac7f 100644 --- a/src/main/java/com/glxp/api/entity/basic/BasicBussinessTypeEntity.java +++ b/src/main/java/com/glxp/api/entity/basic/BasicBussinessTypeEntity.java @@ -390,11 +390,11 @@ public class BasicBussinessTypeEntity { @TableField(value = "fillCodeRel") private boolean fillCodeRel; @TableField(value = "checkVailDate") - private boolean checkVailDate; + private Integer checkVailDate; @TableField(value = "checkExpire") - private boolean checkExpire; + private Integer checkExpire; @TableField(value = "checkCertExpire") - private boolean checkCertExpire; + private Integer checkCertExpire; // 预验收退库单据类型 @TableField(value = "preInBackAction") @@ -404,4 +404,9 @@ public class BasicBussinessTypeEntity { private Integer backPreinType; @TableField(value = "checkPreInOrders") private String checkPreInOrders; + // 寄售使用禁止无库存出库 + @TableField(value = "advancePreIn") + private boolean advancePreIn; + @TableField(value = "sortNum") + private Integer sortNum; } diff --git a/src/main/java/com/glxp/api/req/basic/BussinessTypeSaveRequest.java b/src/main/java/com/glxp/api/req/basic/BussinessTypeSaveRequest.java index b5496efb..fa44a124 100644 --- a/src/main/java/com/glxp/api/req/basic/BussinessTypeSaveRequest.java +++ b/src/main/java/com/glxp/api/req/basic/BussinessTypeSaveRequest.java @@ -295,12 +295,15 @@ public class BussinessTypeSaveRequest { - private boolean checkVailDate; - private boolean checkExpire; - private boolean checkCertExpire; + private Integer checkVailDate; + private Integer checkExpire; + private Integer checkCertExpire; private String preInBackAction; private Integer backPreinType; + private Integer sortNum; private String checkPreInOrders; + private Boolean advancePreIn; + } diff --git a/src/main/java/com/glxp/api/req/basic/FilterBussinessTypeRequest.java b/src/main/java/com/glxp/api/req/basic/FilterBussinessTypeRequest.java index 2a166985..59ea4844 100644 --- a/src/main/java/com/glxp/api/req/basic/FilterBussinessTypeRequest.java +++ b/src/main/java/com/glxp/api/req/basic/FilterBussinessTypeRequest.java @@ -108,4 +108,7 @@ public class FilterBussinessTypeRequest extends ListPageRequest { private Boolean fillCodeRel; private String vueType; + private Integer corpType; + private Integer sortNum; + private Integer actionType; } diff --git a/src/main/java/com/glxp/api/res/basic/BasicBussinessTypeResponse.java b/src/main/java/com/glxp/api/res/basic/BasicBussinessTypeResponse.java index 4387b6c7..93d2e919 100644 --- a/src/main/java/com/glxp/api/res/basic/BasicBussinessTypeResponse.java +++ b/src/main/java/com/glxp/api/res/basic/BasicBussinessTypeResponse.java @@ -144,10 +144,12 @@ public class BasicBussinessTypeResponse { private boolean fillCodeRel; - private boolean checkVailDate; - private boolean checkExpire; - private boolean checkCertExpire; + private Integer checkVailDate; + private Integer checkExpire; + private Integer checkCertExpire; private String preInBackAction; private Integer backPreinType; private String checkPreInOrders; + private Boolean advancePreIn; + private Integer sortNum; } diff --git a/src/main/java/com/glxp/api/task/AsyncFetchUdiTask.java b/src/main/java/com/glxp/api/task/AsyncFetchUdiTask.java index 3f49738f..ec0dfd45 100644 --- a/src/main/java/com/glxp/api/task/AsyncFetchUdiTask.java +++ b/src/main/java/com/glxp/api/task/AsyncFetchUdiTask.java @@ -15,9 +15,9 @@ import com.glxp.api.entity.system.ScheduledEntity; import com.glxp.api.idc.service.IdcService; import com.glxp.api.req.system.ScheduledRequest; - -@Component -@EnableScheduling +// +//@Component +//@EnableScheduling public class AsyncFetchUdiTask implements SchedulingConfigurer { final Logger logger = LoggerFactory.getLogger(AsyncFetchUdiTask.class); diff --git a/src/main/java/com/glxp/api/task/AsyncUdiTask.java b/src/main/java/com/glxp/api/task/AsyncUdiTask.java index 001d5a50..c00ae317 100644 --- a/src/main/java/com/glxp/api/task/AsyncUdiTask.java +++ b/src/main/java/com/glxp/api/task/AsyncUdiTask.java @@ -15,9 +15,9 @@ import com.glxp.api.entity.system.ScheduledEntity; import com.glxp.api.idc.service.IdcService; import com.glxp.api.req.system.ScheduledRequest; - -@Component -@EnableScheduling +// +//@Component +//@EnableScheduling public class AsyncUdiTask implements SchedulingConfigurer { final Logger logger = LoggerFactory.getLogger(AsyncUdiTask.class); diff --git a/src/main/resources/mybatis/mapper/basic/BasicBussinessTypeDao.xml b/src/main/resources/mybatis/mapper/basic/BasicBussinessTypeDao.xml index 92bb76ee..d23da2a0 100644 --- a/src/main/resources/mybatis/mapper/basic/BasicBussinessTypeDao.xml +++ b/src/main/resources/mybatis/mapper/basic/BasicBussinessTypeDao.xml @@ -53,7 +53,7 @@ ]]> - order by bu.updateTime desc + order by bu.sortNum @@ -70,7 +70,7 @@ vailGroupBuy, busType, inStock, actionType, thrCheckEnable, thrCheckWebNew, thrCheckPdaUn, thrCheckPdaEd, thrCheckUdims, thrCheckPc, thrCheckSp, thrCheckChange, thrCheckBalance, thrCheckCopy, fillCodeRel, checkVailDate, - checkExpire, checkCertExpire, preInBackAction, backPreinType, checkPreInOrders) + checkExpire, checkCertExpire, preInBackAction, backPreinType, checkPreInOrders,sortNum) values (#{mainAction}, #{action}, #{name}, #{enable}, #{remark}, #{thirdSysFk}, #{genUnit}, #{innerOrder}, #{secCheckEnable}, #{checkEnable}, #{checkUdims}, #{checkPdaEd}, #{checkPdaUn}, #{checkPc}, #{checkWebNew}, #{checkSp}, #{checkChange}, #{secCheckUdims}, #{secCheckPdaEd}, #{secCheckPdaUn}, @@ -82,7 +82,7 @@ #{vailGroupBuy}, #{busType}, #{inStock}, #{actionType}, #{thrCheckEnable}, #{thrCheckWebNew}, #{thrCheckPdaUn}, #{thrCheckPdaEd}, #{thrCheckUdims}, #{thrCheckPc}, #{thrCheckSp}, #{thrCheckChange}, #{thrCheckBalance}, #{thrCheckCopy}, #{fillCodeRel}, #{checkVailDate}, - #{checkExpire}, #{checkCertExpire}, #{preInBackAction}, #{backPreinType}, #{checkPreInOrders}) + #{checkExpire}, #{checkCertExpire}, #{preInBackAction}, #{backPreinType}, #{checkPreInOrders}, #{sortNum}) + + + select * + from auth_dept + where id in + + #{item} + + + + + select name from auth_dept where code = #{code} + + + diff --git a/src/main/resources/mybatis/mapper/auth/DeptUserDao.xml b/src/main/resources/mybatis/mapper/auth/DeptUserDao.xml index 6cfb932f..123fa62a 100644 --- a/src/main/resources/mybatis/mapper/auth/DeptUserDao.xml +++ b/src/main/resources/mybatis/mapper/auth/DeptUserDao.xml @@ -17,6 +17,30 @@ + + + + + @@ -373,4 +386,26 @@ from auth_warehouse where code = #{invCode} + + + +