From 07b6f3e9b004baba8656366a76f1324d496f1a42 Mon Sep 17 00:00:00 2001 From: wj <1285151836@qq.com> Date: Wed, 26 Apr 2023 10:37:34 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=8B=E8=BD=BD?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E7=8A=B6=E6=80=81?= 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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 3205845c5..f1a03cedc 100644 --- a/src/main/java/com/glxp/api/service/sync/HeartService.java +++ b/src/main/java/com/glxp/api/service/sync/HeartService.java @@ -1229,7 +1229,7 @@ public class HeartService { basicDownloadStatusEntity.setUpdateTime(new Date()); basicDownloadStatusEntity.setEndTime(new Date()); basicDownloadStatusEntity.setIdDatas(exportType.getKey()); - basicDownloadStatusEntity.setStatus(ConstantStatus.SYNC_STATUS_SUCCESS); //下载完成 + basicDownloadStatusEntity.setStatus(BasicExportStatusEnum.SUCCESS.getCode()); //下载完成 basicDownloadStatusEntity.setType(BasicProcessStatus.BASIC_DATA); basicDownloadStatusEntity.setScheduleType(1); basicDownloadService.insertDownloadStatus(basicDownloadStatusEntity); From 48188c661ca37ed0fcfaf629381a25632f0b998b 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, 26 Apr 2023 10:57:39 +0800 Subject: [PATCH 2/9] =?UTF-8?q?=E8=80=97=E6=9D=90=E9=A2=86=E7=94=A8?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/glxp/api/controller/auth/InvWarehouseController.java | 4 +++- .../java/com/glxp/api/req/auth/FilterInvWarehouseRequest.java | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) 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 c4980feac..6427ada58 100644 --- a/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java +++ b/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java @@ -132,7 +132,9 @@ public class InvWarehouseController extends BaseController { return ResultVOUtils.error(500, "当前仓库不能为空！"); } FilterInvSubWarehouseRequest filterInvSubWarehouseRequest = new FilterInvSubWarehouseRequest(); - filterInvSubWarehouseRequest.setAdvanceType(1); + if(filterInvWarehouseRequest.getType()==null){ + filterInvSubWarehouseRequest.setAdvanceType(1); + } List invWarehouseEntities = invWarehouseService.filterInvSubWarehouse(filterInvSubWarehouseRequest); List results = new ArrayList<>(); if (CollUtil.isNotEmpty(invWarehouseEntities)) { diff --git a/src/main/java/com/glxp/api/req/auth/FilterInvWarehouseRequest.java b/src/main/java/com/glxp/api/req/auth/FilterInvWarehouseRequest.java index 9fcbeab91..9a4067020 100644 --- a/src/main/java/com/glxp/api/req/auth/FilterInvWarehouseRequest.java +++ b/src/main/java/com/glxp/api/req/auth/FilterInvWarehouseRequest.java @@ -31,4 +31,5 @@ public class FilterInvWarehouseRequest extends ListPageRequest { private String superiorCode;//上级 private String subordinateCode;//下级 private String superiorPcode;//上级 + private Integer type; } From 00bd1ac2a46c87542621be9fd27014508acc1b87 Mon Sep 17 00:00:00 2001 From: x_z Date: Wed, 26 Apr 2023 13:55:08 +0800 Subject: [PATCH 3/9] =?UTF-8?q?1.=E8=B0=83=E6=95=B4=E6=91=86=E6=94=BE?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/mybatis/mapper/inv/invProductDetailDao.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/resources/mybatis/mapper/inv/invProductDetailDao.xml b/src/main/resources/mybatis/mapper/inv/invProductDetailDao.xml index f206ea126..811dbb233 100644 --- a/src/main/resources/mybatis/mapper/inv/invProductDetailDao.xml +++ b/src/main/resources/mybatis/mapper/inv/invProductDetailDao.xml @@ -96,6 +96,7 @@ bp.zczbhhzbapzbh, bp.ylqxzcrbarmc, bp.nameCode, + bp.manufactory, ad.name deptName, aw.name invName, sp.name invSpaceName @@ -117,6 +118,7 @@ AND pd.invSpaceCode = #{invSpaceCode} + group by pd.code From db2b9bcafeb69a932641336295be05b51cd61055 Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Wed, 26 Apr 2023 14:45:50 +0800 Subject: [PATCH 4/9] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=8D=95=E6=8D=AE?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/glxp/api/service/inout/impl/IoOrderServiceImpl.java | 2 +- src/main/resources/mybatis/mapper/purchase/PurPlanDao.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java index 6bdac5f5a..9eb6ef610 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java @@ -646,7 +646,7 @@ public class IoOrderServiceImpl implements IoOrderService { filterOrderRequest.setDealStatuses(Arrays.asList(1, 2, 3, 4)); break; case Constant.ORDER_STATUS_WAIT_AUDITED: - filterOrderRequest.setStatuses(Arrays.asList(10, 7)); + filterOrderRequest.setStatuses(Arrays.asList(10)); filterOrderRequest.setDealStatuses(Arrays.asList(3, 4)); break; case Constant.ORDER_STATUS_UN_ALLOCATE: diff --git a/src/main/resources/mybatis/mapper/purchase/PurPlanDao.xml b/src/main/resources/mybatis/mapper/purchase/PurPlanDao.xml index b1fb4af5f..152caeadc 100644 --- a/src/main/resources/mybatis/mapper/purchase/PurPlanDao.xml +++ b/src/main/resources/mybatis/mapper/purchase/PurPlanDao.xml @@ -138,4 +138,4 @@ WHERE id = #{id} - \ No newline at end of file + From e12f19f50253365770cb42d205a30f28be75987f 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, 26 Apr 2023 16:20:07 +0800 Subject: [PATCH 5/9] =?UTF-8?q?=E5=BE=80=E6=9D=A5=E5=8D=95=E4=BD=8D?= =?UTF-8?q?=E7=BC=96=E8=BE=91=E6=8F=90=E7=A4=BA=E9=87=8D=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/glxp/api/service/basic/impl/BasicCorpServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/glxp/api/service/basic/impl/BasicCorpServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/BasicCorpServiceImpl.java index 87accbbce..730103ef0 100644 --- a/src/main/java/com/glxp/api/service/basic/impl/BasicCorpServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/BasicCorpServiceImpl.java @@ -112,7 +112,7 @@ public class BasicCorpServiceImpl implements BasicCorpService { if (CollUtil.isNotEmpty(list)) { if (null != basicCorpEntity.getId()) { for (BasicCorpEntity corpEntity : list) { - if (corpEntity.getId() != basicCorpEntity.getId()) { + if (!corpEntity.getId().equals(basicCorpEntity.getId())) { return true; } } From cfe0153f1bc8ca991f8904092097bdd32bc59f5b Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Wed, 26 Apr 2023 17:48:44 +0800 Subject: [PATCH 6/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E7=AE=A1=E7=90=86,=E7=BC=96=E8=BE=91=E6=97=B6=E5=80=99,?= =?UTF-8?q?=E4=BC=9A=E6=8A=8A=E4=B9=8B=E5=89=8D=E9=80=89=E5=85=A5=E7=9A=84?= =?UTF-8?q?=E9=83=A8=E9=97=A8=E6=9B=BF=E6=8D=A2=E6=8E=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/glxp/api/controller/auth/SysUserController.java | 2 ++ src/main/resources/mybatis/mapper/auth/DeptUserDao.xml | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/glxp/api/controller/auth/SysUserController.java b/src/main/java/com/glxp/api/controller/auth/SysUserController.java index d7b38f6ca..759f74119 100644 --- a/src/main/java/com/glxp/api/controller/auth/SysUserController.java +++ b/src/main/java/com/glxp/api/controller/auth/SysUserController.java @@ -276,6 +276,8 @@ public class SysUserController extends BaseController { for (DeptUserEntity deptUserEntity : deptUserEntities) { if(deptUserEntity.getDeptId() == 1){ checkDeptId=true; + }else{ + deptCodeList.add(deptUserEntity.getDeptId()); } } if(checkDeptId==false){ diff --git a/src/main/resources/mybatis/mapper/auth/DeptUserDao.xml b/src/main/resources/mybatis/mapper/auth/DeptUserDao.xml index 8cdb52005..db3b063fa 100644 --- a/src/main/resources/mybatis/mapper/auth/DeptUserDao.xml +++ b/src/main/resources/mybatis/mapper/auth/DeptUserDao.xml @@ -78,7 +78,7 @@ delete from auth_dept_user - where userId = #{userId} + where userId = #{userId} and deptId != 1 delete From d6336d806ef3b93420e0c0582fab439f033a7ef1 Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Thu, 27 Apr 2023 10:41:03 +0800 Subject: [PATCH 7/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E4=BB=93=E5=BA=93?= =?UTF-8?q?=E7=BC=96=E8=BE=91=E6=97=B6=E5=80=99=E5=88=A4=E6=96=AD=20?= =?UTF-8?q?=E5=90=8C=E9=83=A8=E9=97=A8=E4=B8=8B=E6=98=AF=E5=90=A6=E6=9C=89?= =?UTF-8?q?=E5=90=8C=E5=90=8D=E7=9A=84=E4=BB=93=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../glxp/api/controller/auth/InvWarehouseController.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) 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 6427ada58..02b0bb522 100644 --- a/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java +++ b/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java @@ -33,7 +33,6 @@ import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; import javax.validation.Valid; import java.util.*; -import java.util.stream.Collectors; @RestController public class InvWarehouseController extends BaseController { @@ -273,6 +272,13 @@ public class InvWarehouseController extends BaseController { if (userCount > 0) { return ResultVOUtils.error(500, "修改失败,请先移除该仓库关联用户！"); } + // 先判断是否有相同名字的仓库 + boolean checkResult = invWarehouseService.checkDuplicateName(invWarehouseEntity.getParentId(), invWarehouseEntity.getName()); + if (checkResult) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, "仓库名称重复！"); + } + + //更新仓库信息 invWarehouseEntity.setUpdateTime(new Date()); From 23d1193b5618804826d48be7adad7d798e7e6795 Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Thu, 27 Apr 2023 11:07:43 +0800 Subject: [PATCH 8/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=9A=E5=8A=A1?= =?UTF-8?q?=E7=AE=A1=E7=90=86=20=E6=A8=A1=E5=9D=97=E4=B8=AD=E6=97=A0?= =?UTF-8?q?=E6=B3=95=E6=A0=B9=E6=8D=AE=E7=B4=A7=E6=80=A5=E6=88=90=E9=83=BD?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/mybatis/mapper/purchase/PurApplyDao.xml | 5 ++++- .../resources/mybatis/mapper/purchase/PurOrderDao.xml | 9 ++++++--- .../resources/mybatis/mapper/purchase/PurPlanDao.xml | 3 +++ 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/src/main/resources/mybatis/mapper/purchase/PurApplyDao.xml b/src/main/resources/mybatis/mapper/purchase/PurApplyDao.xml index ab40c4247..3ad289afe 100644 --- a/src/main/resources/mybatis/mapper/purchase/PurApplyDao.xml +++ b/src/main/resources/mybatis/mapper/purchase/PurApplyDao.xml @@ -64,6 +64,9 @@ AND generatePlan = 1 + + AND emergency = #{emergency} + @@ -142,4 +145,4 @@ WHERE id = #{id} - \ No newline at end of file + diff --git a/src/main/resources/mybatis/mapper/purchase/PurOrderDao.xml b/src/main/resources/mybatis/mapper/purchase/PurOrderDao.xml index b5efe840c..7501b5a37 100644 --- a/src/main/resources/mybatis/mapper/purchase/PurOrderDao.xml +++ b/src/main/resources/mybatis/mapper/purchase/PurOrderDao.xml @@ -27,8 +27,8 @@ - id, billNo, billDate, `status`, billType, remark, invCode, deptCode, `createUser`, - createTime, auditUser, auditTime, auditRemark, updateTime, updateUser, applyCreateUser, + id, billNo, billDate, `status`, billType, remark, invCode, deptCode, `createUser`, + createTime, auditUser, auditTime, auditRemark, updateTime, updateUser, applyCreateUser, applyAuditUser, applyRemark, applyBillNo, stockOrderNo @@ -86,9 +86,12 @@ AND createUser = #{createUser} + + AND emergency = #{emergency} + - \ No newline at end of file + diff --git a/src/main/resources/mybatis/mapper/purchase/PurPlanDao.xml b/src/main/resources/mybatis/mapper/purchase/PurPlanDao.xml index 152caeadc..e76001bd7 100644 --- a/src/main/resources/mybatis/mapper/purchase/PurPlanDao.xml +++ b/src/main/resources/mybatis/mapper/purchase/PurPlanDao.xml @@ -58,6 +58,9 @@ AND createUser = #{createUser} + + AND emergency = #{emergency} + From 2e36abdc602c7d4d048ba42ff850b79f07888bf9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com> Date: Thu, 27 Apr 2023 11:32:46 +0800 Subject: [PATCH 9/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8D=95=E6=8D=AEbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/glxp/api/controller/purchase/IoPurChangeService.java | 4 ++-- .../java/com/glxp/api/res/basic/UdiRelevanceResponse.java | 1 + src/main/java/com/glxp/api/res/inout/IoOrderResponse.java | 3 +++ src/main/resources/mybatis/mapper/thrsys/ThrProductsDao.xml | 2 +- 4 files changed, 7 insertions(+), 3 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 7317cd49c..2b3157389 100644 --- a/src/main/java/com/glxp/api/controller/purchase/IoPurChangeService.java +++ b/src/main/java/com/glxp/api/controller/purchase/IoPurChangeService.java @@ -385,8 +385,8 @@ public class IoPurChangeService { ioOrderEntity.setUpdateTime(new Date()); ioOrderEntity.setUpdateUser(purPlanEntity.getCreateUser()); ioOrderEntity.setCustomerId("110"); - ioOrderEntity.setDeptCode(purPlanEntity.getInvCode()); - ioOrderEntity.setInvCode(purPlanEntity.getDeptCode()); + ioOrderEntity.setDeptCode(purPlanEntity.getDeptCode()); + ioOrderEntity.setInvCode(purPlanEntity.getInvCode()); ioOrderService.insertOrder(ioOrderEntity); billNo += ioOrderEntity.getBillNo() + ","; //插入业务单表 diff --git a/src/main/java/com/glxp/api/res/basic/UdiRelevanceResponse.java b/src/main/java/com/glxp/api/res/basic/UdiRelevanceResponse.java index e75499eae..d2f06e5dd 100644 --- a/src/main/java/com/glxp/api/res/basic/UdiRelevanceResponse.java +++ b/src/main/java/com/glxp/api/res/basic/UdiRelevanceResponse.java @@ -70,6 +70,7 @@ public class UdiRelevanceResponse { private Boolean allowNoBatch; private Boolean allowNoExpire; private Boolean allowNoProduct; + private Boolean allowNoSerial; private String spmc; private String cplx; private String hchzsb; diff --git a/src/main/java/com/glxp/api/res/inout/IoOrderResponse.java b/src/main/java/com/glxp/api/res/inout/IoOrderResponse.java index c047b9e76..514dbe2ea 100644 --- a/src/main/java/com/glxp/api/res/inout/IoOrderResponse.java +++ b/src/main/java/com/glxp/api/res/inout/IoOrderResponse.java @@ -220,6 +220,9 @@ public class IoOrderResponse { private Integer processStatus; private int inCodeStatus; + private Date checkTime; + private String checkUserName; + /** * 校验信息 diff --git a/src/main/resources/mybatis/mapper/thrsys/ThrProductsDao.xml b/src/main/resources/mybatis/mapper/thrsys/ThrProductsDao.xml index dd44c14f5..a231f6342 100644 --- a/src/main/resources/mybatis/mapper/thrsys/ThrProductsDao.xml +++ b/src/main/resources/mybatis/mapper/thrsys/ThrProductsDao.xml @@ -36,7 +36,7 @@ AND thirdSysFk = #{thirdSysFk} - AND thirdSys = #{thirdSys} + AND thirdSysFk = #{thirdSys} AND supName LIKE concat('%',#{supName},'%')