From fec801b31e663f1c979f460b878d6ad41d3d5c14 Mon Sep 17 00:00:00 2001 From: anthonywj Date: Fri, 28 Apr 2023 11:42:15 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E9=A2=84=E9=AA=8C=E6=94=B6=E6=8C=89?= =?UTF-8?q?=E8=B4=A7=E4=BD=8D=E9=80=80=E8=B4=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inout/IoCodeTempController.java | 39 +++++++++++++++++-- .../glxp/api/req/inout/AddOrderRequest.java | 2 + .../service/inout/IoCheckInoutService.java | 2 - .../InvPreInProductDetailServiceImpl.java | 2 +- 4 files changed, 39 insertions(+), 6 deletions(-) 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 52cf48da4..ef55450a6 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java @@ -495,7 +495,7 @@ public class IoCodeTempController extends BaseController { //校验预验收库存是否已存在 if (bussinessTypeEntity.isScanPreIn()) { - if (bussinessTypeEntity.getBackPreinType() == 1 && bussinessTypeEntity.isPreInBack()) {//按单出库 + if (bussinessTypeEntity.getBackPreinType() == 1) {//按单出库&& bussinessTypeEntity.isPreInBack() String orderIds = addOrderRequest.getCheckPreInOrders(); if (StrUtil.isNotEmpty(orderIds)) { String[] orderIdArray = orderIds.split(","); @@ -524,8 +524,11 @@ public class IoCodeTempController extends BaseController { return ResultVOUtils.error(500, "未选择预验收入库单，请先选择预验收入库单！"); } - } else { //按库存出库 - int preInCount = invPreinProductDetailService.findCountByCode(code); + } else if (bussinessTypeEntity.getBackPreinType() == 2) { //按货位出库 + if (StrUtil.isEmpty(addOrderRequest.getCheckPreInSpaceCode())) + return ResultVOUtils.error(500, "" + + "请选择预验收货位！"); + int preInCount = invPreinProductDetailService.findCountBySpaceCode(addOrderRequest.getCheckPreInSpaceCode(), code); InvPreInProductDetailEntity invPreinDetailEntity = invPreinProductDetailService.findUseOneByCode(code); if (preInCount <= 0) { return ResultVOUtils.error(500, "预验收库存数量不足！"); @@ -552,6 +555,36 @@ public class IoCodeTempController extends BaseController { } } + /** + * else { //按库存出库 + * int preInCount = invPreinProductDetailService.findCountByCode(code); + * InvPreInProductDetailEntity invPreinDetailEntity = invPreinProductDetailService.findUseOneByCode(code); + * if (preInCount <= 0) { + * return ResultVOUtils.error(500, "预验收库存数量不足！"); + * } else { + * if (StrUtil.isNotEmpty(invPreinDetailEntity.getBatchNo()) && StrUtil.isNotEmpty(udiEntity.getBatchNo()) + * && !invPreinDetailEntity.getBatchNo().equals(udiEntity.getBatchNo())) { + * return ResultVOUtils.error(500, "当前批次号与预验收录入批次号不匹配！"); + * } + * if (StrUtil.isNotEmpty(orderId)) {//非首次添加 + * if (StrUtil.isEmpty(udiEntity.getSerialNo())) {//该单据已有该产品 + * //无序列号，则可能存在多个预验收入库单 + * IoCodeTempEntity codeTempEntity = codeTempService.findByUnique(orderId, code); + * if (codeTempEntity != null) { + * if (preInCount < (codeTempEntity.getMyCount() + 1)) { + * return ResultVOUtils.error(500, "超出预验收库存数量"); + * } + * } + * } else { + * if (preInCount < 1) { + * return ResultVOUtils.error(500, "预验收库存数量不足"); + * } + * } + * } + * } + * } + */ + } // 是否检验寄售库存 diff --git a/src/main/java/com/glxp/api/req/inout/AddOrderRequest.java b/src/main/java/com/glxp/api/req/inout/AddOrderRequest.java index 78ab31c0b..fd859af6d 100644 --- a/src/main/java/com/glxp/api/req/inout/AddOrderRequest.java +++ b/src/main/java/com/glxp/api/req/inout/AddOrderRequest.java @@ -29,5 +29,7 @@ public class AddOrderRequest { private String remark; private String checkPreInOrders; + // 预验收货位 + private String checkPreInSpaceCode; private int fromVailPi; //是否需要校验三期；1：不需要，2：需要 } diff --git a/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java b/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java index b99350f71..4788472be 100644 --- a/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java +++ b/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java @@ -803,7 +803,6 @@ public class IoCheckInoutService { // ThreadUtil.execAsync(() -> { if (StrUtil.isNotEmpty(bussinessTypeEntity.getPreInBackAction())) { if (bussinessTypeEntity.getBackPreinType() == 1) { //按单退货 - String orderIds = orderEntity.getCheckPreInOrders(); if (StrUtil.isNotEmpty(orderIds)) { String[] orderIdArray = orderIds.split(","); @@ -861,7 +860,6 @@ public class IoCheckInoutService { codeEntity.setReCount(udiCalCountUtil.getActCount(codeEntity.getNameCode())); codeEntity.setWarehouseCode(orderEntity.getCheckPreInSpaceCode()); backCodeList.add(codeEntity); - } } genBackOrder(orderEntity, backCodeList); diff --git a/src/main/java/com/glxp/api/service/inv/impl/InvPreInProductDetailServiceImpl.java b/src/main/java/com/glxp/api/service/inv/impl/InvPreInProductDetailServiceImpl.java index 27f12a809..e1f3a27ce 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/InvPreInProductDetailServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inv/impl/InvPreInProductDetailServiceImpl.java @@ -190,7 +190,7 @@ public class InvPreInProductDetailServiceImpl implements InvPreinProductDetailSe @Override public InvPreInProductDetailEntity findUseOneByCode(String code) { List invPreinDetailEntities = invPreInProductDetailDao.selectList(new QueryWrapper().eq("code", code) - .last("limit 1")); + .last("limit 1")); if (CollUtil.isNotEmpty(invPreinDetailEntities)) { return invPreinDetailEntities.get(0); } From 4687aeea24f8b232b453ea6cb101c9d45d80a279 Mon Sep 17 00:00:00 2001 From: anthonywj Date: Fri, 28 Apr 2023 11:52:50 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E9=A2=84=E9=AA=8C=E6=94=B6=E6=8C=89?= =?UTF-8?q?=E8=B4=A7=E4=BD=8D=E9=80=80=E8=B4=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mybatis/mapper/auth/InvBusUserDao.xml | 77 +++++++++---------- 1 file changed, 38 insertions(+), 39 deletions(-) diff --git a/src/main/resources/mybatis/mapper/auth/InvBusUserDao.xml b/src/main/resources/mybatis/mapper/auth/InvBusUserDao.xml index 078a8cd87..56e9d9414 100644 --- a/src/main/resources/mybatis/mapper/auth/InvBusUserDao.xml +++ b/src/main/resources/mybatis/mapper/auth/InvBusUserDao.xml @@ -2,7 +2,6 @@ - replace - INTO auth_user_bustype - (userId, `subInvCode`, scAction, remark,updateTime) - values ( - #{userId}, - #{subInvCode}, - #{scAction}, - #{remark},now() - ) + INTO auth_user_bustype + (userId, `subInvCode`, scAction, remark, updateTime) + values (#{userId}, + #{subInvCode}, + #{scAction}, + #{remark}, now()) @@ -103,28 +95,35 @@ DELETE FROM auth_user_bustype - - - AND subInvCode = #{subInvCode} - - - and scAction in - - #{item} - - - + + + AND subInvCode = #{subInvCode} + + + and scAction in + + #{item} + + + UPDATE auth_user_bustype + + userId=#{userId}, + + + subInvCode=#{subInvCode}, + + + scAction=#{scAction}, + + + remark=#{remark}, + updateTime=now() - userId=#{userId}, - subInvCode=#{subInvCode}, - scAction=#{scAction}, - remark=#{remark}, WHERE id = #{id} - From a4838a4459e0dcbd42215e8852a38ef70c3efcc8 Mon Sep 17 00:00:00 2001 From: anthonywj Date: Fri, 28 Apr 2023 13:57:10 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E9=80=89=E5=85=A5?= =?UTF-8?q?=E7=94=A8=E6=88=B7=EF=BC=8C=E7=A7=BB=E9=99=A4=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E7=B9=81=E5=BF=99=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../auth/InvWarehouseController.java | 2 +- .../glxp/api/dao/auth/WarehouseUserDao.java | 7 ++--- .../api/req/auth/FilterInvUserRequest.java | 2 +- .../service/auth/WarehouseUserService.java | 8 ++++-- .../auth/impl/WarehouseUserServiceImpl.java | 10 ++++--- .../mybatis/mapper/auth/WarehouseUserDao.xml | 28 ++++--------------- src/main/resources/schemas/schema_v2.1.sql | 5 ++++ 7 files changed, 27 insertions(+), 35 deletions(-) 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 4d983b6cd..dad64d2ad 100644 --- a/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java +++ b/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java @@ -612,7 +612,7 @@ public class InvWarehouseController extends BaseController { @AuthRuleAnnotation("") @PostMapping("/warehouse/inout/delWarehouseUser") - public BaseResponse deleteWarehouseUser(Integer id) { + public BaseResponse deleteWarehouseUser(Long id) { if (null == id) return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); WarehouseUserEntity warehouseUserEntity = warehouseUserService.selectById(id); diff --git a/src/main/java/com/glxp/api/dao/auth/WarehouseUserDao.java b/src/main/java/com/glxp/api/dao/auth/WarehouseUserDao.java index 43cefff33..109b703e8 100644 --- a/src/main/java/com/glxp/api/dao/auth/WarehouseUserDao.java +++ b/src/main/java/com/glxp/api/dao/auth/WarehouseUserDao.java @@ -10,8 +10,7 @@ import org.apache.ibatis.annotations.Param; import java.util.List; @Mapper -public interface WarehouseUserDao extends BaseMapperPlus { - int deleteByPrimaryKey(Integer id); +public interface WarehouseUserDao extends BaseMapperPlus { int deleteByCodeAndId(@Param("id") Long id, @Param("code") String code); @@ -35,13 +34,13 @@ public interface WarehouseUserDao extends BaseMapperPlus list); - int batchInsert(@Param("list") List list); List selectListByCode(@Param("code") String code); List selectListkey(FilterInvLinkDataRequest filterInvLinkDataRequest); - List selectNotSelectUserid(@Param("userIds")List userIds ); + List selectNotSelectUserid(@Param("userIds") List userIds); + List selectCodeByUser(@Param("userId") String userId); void deleteByCode(@Param("code") String code); diff --git a/src/main/java/com/glxp/api/req/auth/FilterInvUserRequest.java b/src/main/java/com/glxp/api/req/auth/FilterInvUserRequest.java index d231ad607..6fcb8d963 100644 --- a/src/main/java/com/glxp/api/req/auth/FilterInvUserRequest.java +++ b/src/main/java/com/glxp/api/req/auth/FilterInvUserRequest.java @@ -6,7 +6,7 @@ import lombok.Data; @Data public class FilterInvUserRequest extends ListPageRequest { - private Integer id; + private Long id; private String code; private Long userid; private String username; diff --git a/src/main/java/com/glxp/api/service/auth/WarehouseUserService.java b/src/main/java/com/glxp/api/service/auth/WarehouseUserService.java index 476f5a36b..248c6c2e2 100644 --- a/src/main/java/com/glxp/api/service/auth/WarehouseUserService.java +++ b/src/main/java/com/glxp/api/service/auth/WarehouseUserService.java @@ -18,7 +18,7 @@ public interface WarehouseUserService extends IService { * @return */ - WarehouseUserEntity selectById(Integer id); + WarehouseUserEntity selectById(Long id); List getListByCode(String code); @@ -48,7 +48,7 @@ public interface WarehouseUserService extends IService { * * @param id */ - void deleteWarehouseUser(Integer id); + void deleteWarehouseUser(Long id); void deleteByCodeAndId(Long id, String code); @@ -61,7 +61,8 @@ public interface WarehouseUserService extends IService { * @return */ List getWarehouseUserList(FilterInvLinkDataRequest filterInvLinkDataRequest); - List selectNotSelectUserid(@Param("userIds")List userIds ); + + List selectNotSelectUserid(@Param("userIds") List userIds); /** * 根据分仓编码，统计用户数量 @@ -70,5 +71,6 @@ public interface WarehouseUserService extends IService { * @return */ Integer countUserBySubInvCode(String subInvCode); + boolean insert(WarehouseUserEntity warehouseUserEntity); } diff --git a/src/main/java/com/glxp/api/service/auth/impl/WarehouseUserServiceImpl.java b/src/main/java/com/glxp/api/service/auth/impl/WarehouseUserServiceImpl.java index ab5966e5f..55ef0342e 100644 --- a/src/main/java/com/glxp/api/service/auth/impl/WarehouseUserServiceImpl.java +++ b/src/main/java/com/glxp/api/service/auth/impl/WarehouseUserServiceImpl.java @@ -1,6 +1,7 @@ package com.glxp.api.service.auth.impl; import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.IdUtil; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.pagehelper.PageHelper; import com.glxp.api.dao.auth.WarehouseUserDao; @@ -28,7 +29,7 @@ public class WarehouseUserServiceImpl extends ServiceImpl warehouseUserEntities = warehouseUserDao.filterList(filterInvUserRequest); @@ -75,9 +76,10 @@ public class WarehouseUserServiceImpl extends ServiceImpl - - - delete - from auth_warehouse_user - where id = #{id,jdbcType=INTEGER} - delete @@ -101,7 +95,7 @@ isDirector = #{isDirector} - where id = #{id,jdbcType=INTEGER} + where id = #{id,jdbcType=INTEGER} @@ -167,16 +161,6 @@ #{item.id,jdbcType=INTEGER} - - - insert into auth_warehouse_user - (code, userId, userName, isDirector) - values - - (#{item.code,jdbcType=VARCHAR}, #{item.userid,jdbcType=BIGINT}, #{item.username,jdbcType=VARCHAR}, - #{item.isDirector}) - - @@ -205,9 +189,9 @@ id = #{id,jdbcType=INTEGER}, - code = #{code,jdbcType=VARCHAR}, - userId = #{userid,jdbcType=BIGINT}, - userName = #{username,jdbcType=VARCHAR}, + code = #{code,jdbcType=VARCHAR}, + userId = #{userid,jdbcType=BIGINT}, + userName = #{username,jdbcType=VARCHAR}, select auth_warehouse_user.*, auth_user.employeeName from auth_warehouse_user - inner join auth_user on auth_user.id = auth_warehouse_user.userId + inner join auth_user on auth_user.id = auth_warehouse_user.userId where code = #{code} @@ -271,7 +255,7 @@ parameterType="com.glxp.api.req.auth.FilterInvLinkDataRequest"> select auth_warehouse_user.*, auth_user.employeeName from auth_warehouse_user - inner join auth_user on auth_user.id = auth_warehouse_user.userId + inner join auth_user on auth_user.id = auth_warehouse_user.userId AND code = #{code} diff --git a/src/main/resources/schemas/schema_v2.1.sql b/src/main/resources/schemas/schema_v2.1.sql index 6e57cb659..c010b2601 100644 --- a/src/main/resources/schemas/schema_v2.1.sql +++ b/src/main/resources/schemas/schema_v2.1.sql @@ -382,3 +382,8 @@ CALL Pro_Temp_ColumnWork('thr_dept', 'id', 'bigint', 2); CALL Pro_Temp_ColumnWork('thr_inv_warehouse', 'id', 'bigint', 2); CALL Pro_Temp_ColumnWork('thr_products', 'id', 'bigint', 2); CALL Pro_Temp_ColumnWork('thr_corp', 'id', 'bigint', 2); + + + +CALL Pro_Temp_ColumnWork('auth_dept_user', 'userId', 'bigint', 2); +CALL Pro_Temp_ColumnWork('auth_dept_user', 'deptId', 'bigint', 2); From eca01f3f4ae84b81799ba0ca7cf4cc18fb3accca Mon Sep 17 00:00:00 2001 From: anthonywj Date: Fri, 28 Apr 2023 14:09:09 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E4=BB=93=E5=BA=93=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E5=8D=95=E6=8D=AE=E7=B1=BB=E5=9E=8B=E7=A7=BB=E9=99=A4=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/glxp/api/controller/auth/InvBusUserController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/glxp/api/controller/auth/InvBusUserController.java b/src/main/java/com/glxp/api/controller/auth/InvBusUserController.java index 676ac8c95..ae107aba6 100644 --- a/src/main/java/com/glxp/api/controller/auth/InvBusUserController.java +++ b/src/main/java/com/glxp/api/controller/auth/InvBusUserController.java @@ -128,8 +128,8 @@ public class InvBusUserController { @AuthRuleAnnotation("") @PostMapping("/spms/bus/user/warehouse/post") public BaseResponse postRes(@RequestBody UpdateUserRelBusRequset relBusRequset) { + invBusUserService.deleteByUnion(relBusRequset.getUserId(), relBusRequset.getSubInvCode()); if (CollUtil.isNotEmpty(relBusRequset.getSelectActions())) { - invBusUserService.deleteByUnion(relBusRequset.getUserId(), relBusRequset.getSubInvCode()); relBusRequset.getSelectActions().forEach(action -> { InvBusUserEntity invBusUserEntity = new InvBusUserEntity(); From ac199432c9c285ea6036aa71ea06f16c6dc982a4 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, 28 Apr 2023 14:28:20 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E7=89=A9=E8=B5=84=E6=B7=BB=E5=8A=A0id?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/glxp/api/service/basic/UdiContrastService.java | 5 +++++ src/main/java/com/glxp/api/task/SyncHeartTask.java | 6 +++--- src/main/resources/mybatis/mapper/basic/UdiProductDao.xml | 5 +++-- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/glxp/api/service/basic/UdiContrastService.java b/src/main/java/com/glxp/api/service/basic/UdiContrastService.java index 3992a4bea..dcf5cb632 100644 --- a/src/main/java/com/glxp/api/service/basic/UdiContrastService.java +++ b/src/main/java/com/glxp/api/service/basic/UdiContrastService.java @@ -1,6 +1,7 @@ package com.glxp.api.service.basic; 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.dao.basic.UdiRelevanceDao; @@ -16,6 +17,7 @@ import com.glxp.api.service.thrsys.ThrProductsService; import com.glxp.api.util.CustomUtil; import com.glxp.api.util.DateUtil; import com.glxp.api.util.GennerOrderUtils; + import com.glxp.api.util.udi.UdiInfoUtil; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; @@ -206,6 +208,9 @@ public class UdiContrastService { if (CollUtil.isNotEmpty(udiInfoEntities)) { UdiProductEntity udiProductEntity = udiProductService.findByUuid(udiInfoEntities.get(0).getUuid()); if (udiProductEntity == null) { + for (UdiProductEntity udiInfoEntity : udiInfoEntities) { + udiInfoEntity.setId(IdUtil.getSnowflakeNextId()); + } udiProductService.insertUdiInfos(UdiInfoUtil.initUdiInfoEntitys(udiInfoEntities)); } } diff --git a/src/main/java/com/glxp/api/task/SyncHeartTask.java b/src/main/java/com/glxp/api/task/SyncHeartTask.java index 932e4b435..9a91ea980 100644 --- a/src/main/java/com/glxp/api/task/SyncHeartTask.java +++ b/src/main/java/com/glxp/api/task/SyncHeartTask.java @@ -19,9 +19,9 @@ import org.springframework.stereotype.Component; import javax.annotation.Resource; import java.util.Arrays; - -@Component -@EnableScheduling +// +//@Component +//@EnableScheduling public class SyncHeartTask implements SchedulingConfigurer { final Logger logger = LoggerFactory.getLogger(SyncHeartTask.class); diff --git a/src/main/resources/mybatis/mapper/basic/UdiProductDao.xml b/src/main/resources/mybatis/mapper/basic/UdiProductDao.xml index 2a8e2ad76..8a2886cfb 100644 --- a/src/main/resources/mybatis/mapper/basic/UdiProductDao.xml +++ b/src/main/resources/mybatis/mapper/basic/UdiProductDao.xml @@ -229,7 +229,7 @@ replace INTO basic_products - (uuid, originUuid, nameCode, deviceRecordKey, packRatio, packLevel, packUnit, bhxjsl, bhzxxsbzsl, + (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, @@ -241,7 +241,8 @@ - (#{item.uuid}, + (#{item.id}, + #{item.uuid}, #{item.originUuid}, #{item.nameCode}, #{item.deviceRecordKey},