diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/auth/AuthAdminController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/auth/AuthAdminController.java index 52dffda..9bbf6f4 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/auth/AuthAdminController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/auth/AuthAdminController.java @@ -29,10 +29,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.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.stream.Collectors; /** @@ -95,50 +92,6 @@ public class AuthAdminController { authAdminPageSimpleResponse.setList(authAdminResponseList); return ResultVOUtils.success(authAdminPageSimpleResponse); - - -// if (bindingResult.hasErrors()) { -// return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); -// } -// -// if (authAdminQueryRequest.getRoleId() != null) { -// List authRoleAdmins = authRoleAdminService.listByRoleId(authAdminQueryRequest.getRoleId()); -// List ids = new ArrayList<>(); -// if (authRoleAdmins != null && !authRoleAdmins.isEmpty()) { -// ids = authRoleAdmins.stream().map(AuthRoleAdmin::getAdmin_id).collect(Collectors.toList()); -// } -// authAdminQueryRequest.setIds(ids); -// } -// List authAdmins = authAdminService.listAdminPage(authAdminQueryRequest); -// List authAdminList = new ArrayList<>(); -// for (AuthAdmin authAdmin : authAdmins) { -// if (!authAdmin.getUserName().equals("admin")) { -// authAdminList.add(authAdmin); -// } -// } -// // 查询所有的权限 -// List adminIds = authAdminList.stream().map(AuthAdmin::getId).collect(Collectors.toList()); -// List authRoleAdminList = authRoleAdminService.listByAdminIdIn(adminIds); -// -// // 视图列表 -// List authAdminResponseList = authAdminList.stream().map(item -> { -// AuthAdminResponse authAdminResponse = new AuthAdminResponse(); -// BeanUtils.copyProperties(item, authAdminResponse); -// List roles = authRoleAdminList.stream() -// .filter(authRoleAdmin -> authAdminResponse.getId().equals(authRoleAdmin.getAdmin_id())) -// .map(AuthRoleAdmin::getRole_id) -// .collect(Collectors.toList()); -// authAdminResponse.setRoles(roles); -// return authAdminResponse; -// }).collect(Collectors.toList()); -// -// PageInfo authAdminPageInfo = new PageInfo<>(authAdminList); -// PageSimpleResponse authAdminPageSimpleResponse = new PageSimpleResponse<>(); -// authAdminPageSimpleResponse.setTotal(authAdminPageInfo.getTotal()); -// authAdminPageSimpleResponse.setList(authAdminResponseList); -// -// return ResultVOUtils.success(authAdminPageSimpleResponse); - } @@ -249,6 +202,7 @@ public class AuthAdminController { authAdmin.setPassWord(PasswordUtils.authAdminPwd(authAdmin.getPassWord())); } authAdmin.setCustomerId(curUser.getCustomerId()); + authAdmin.setLastModifyTime(new Date()); boolean b = authAdminService.insertAuthAdmin(authAdmin); authAdmin = authAdminService.findByUserName(authAdmin.getUserName()); if (!b) { @@ -303,7 +257,7 @@ public class AuthAdminController { if (authAdmin.getPassWord() != null) { authAdmin.setPassWord(PasswordUtils.authAdminPwd(authAdmin.getPassWord())); } - + authAdmin.setLastModifyTime(new Date()); boolean b = authAdminService.updateAuthAdmin(authAdmin); if (!b) { diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/auth/LoginController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/auth/LoginController.java index 4319e61..d68fc9d 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/auth/LoginController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/auth/LoginController.java @@ -274,7 +274,7 @@ public class LoginController { authAdminUp.setId(authAdmin.getId()); String newPwd = PasswordUtils.authAdminPwd(updatePasswordRequest.getNewPassword()); authAdminUp.setPassWord(newPwd); - + authAdmin.setLastModifyTime(new Date()); boolean b = authAdminService.updateAuthAdmin(authAdminUp); if (b) { return ResultVOUtils.success(); 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 14d3bc0..86e69b0 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 @@ -48,10 +48,7 @@ import org.springframework.web.client.RestTemplate; import javax.annotation.Resource; import javax.servlet.http.HttpSession; import javax.validation.Valid; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; @RestController @Slf4j @@ -285,6 +282,7 @@ public class RegisterController { CustomerContactEntity customerContactEntity = customerContactService.selectById(Long.valueOf(String.valueOf(authAdmin.getCustomerId()))); if (customerContactEntity != null && customerContactEntity.getMobile().equals(phoneNum)) { authAdmin.setPassWord(resetPasswdRequest.getPassword()); + authAdmin.setLastModifyTime(new Date()); authAdminService.updateAuthAdmin(authAdmin); } else { return ResultVOUtils.error(500, "手机号与该用户不匹配"); @@ -324,6 +322,7 @@ public class RegisterController { authAdmin.setUserName(userRegisterEntity.getUserName()); //用手机号当用户名，通过手机号登录 authAdmin.setEmployeeName(userRegisterEntity.getNickName()); authAdmin.setUserFlag(1); + authAdmin.setLastModifyTime(new Date()); authAdminService.insertAuthAdmin(authAdmin); authAdmin = authAdminService.findByUserName(authAdmin.getUserName()); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/EntrustReceController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/EntrustReceController.java index 429079c..2acbe82 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/EntrustReceController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/EntrustReceController.java @@ -4,6 +4,7 @@ package com.glxp.sale.admin.controller.basic; import cn.hutool.core.collection.CollUtil; import com.github.pagehelper.PageInfo; import com.glxp.sale.admin.entity.basic.BussinessTypeEntity; +import com.glxp.sale.admin.entity.basic.DlEntrustReceEntity; import com.glxp.sale.admin.entity.basic.EntrustReceEntity; import com.glxp.sale.admin.req.basic.BasicEntrustRecRequest; import com.glxp.sale.admin.req.basic.BussinessTypeFilterRequest; @@ -47,6 +48,21 @@ public class EntrustReceController { return ResultVOUtils.success(pageSimpleResponse); } + //手持终端下载委托验收 + @GetMapping("/spms/entrust/rece/downloads") + public BaseResponse downloadEntrust(BasicEntrustRecRequest basicExportStatusRequest) { + Integer userId = customerService.getUserId(); + basicExportStatusRequest.setEntrustUser(userId + ""); + List entrustReceEntities = entrustReceService.downloadEntrustRec(basicExportStatusRequest); + PageInfo pageInfo; + pageInfo = new PageInfo<>(entrustReceEntities); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(entrustReceEntities); + return ResultVOUtils.success(pageSimpleResponse); + } + + @GetMapping("/spms/entrust/rece/filterAllNoUse") public BaseResponse filterAllNoUse(BasicEntrustRecRequest basicExportStatusRequest) { Integer uerId = customerService.getUserId(); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/SpsSyncDownloadController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/SpsSyncDownloadController.java index a237287..acf4720 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/SpsSyncDownloadController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/SpsSyncDownloadController.java @@ -48,6 +48,8 @@ public class SpsSyncDownloadController { logs = logs + "第三方产品信息：" + baseResponse.getData().getThrProductsEntities().size() + "条\n"; if (CollUtil.isNotEmpty(baseResponse.getData().getThrCorpEntities())) logs = logs + "第三方往来单位：" + baseResponse.getData().getThrCorpEntities().size() + "条\n"; + if (CollUtil.isNotEmpty(baseResponse.getData().getAuthAdminList())) + logs = logs + "系统用户信息：" + baseResponse.getData().getAuthAdminList().size() + "条\n"; basicExportStatusEntity.setRemark(logs); basicExportService.updateExportStatus(basicExportStatusEntity); } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/SpsSyncDownloadService.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/SpsSyncDownloadService.java index 3ff1fde..12f4191 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/SpsSyncDownloadService.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/SpsSyncDownloadService.java @@ -3,18 +3,18 @@ package com.glxp.sale.admin.controller.basic; import cn.hutool.core.collection.CollUtil; import com.glxp.sale.admin.constant.ConstantStatus; import com.glxp.sale.admin.dao.basic.UdiInfoDao; +import com.glxp.sale.admin.entity.auth.AuthAdmin; import com.glxp.sale.admin.entity.basic.*; import com.glxp.sale.admin.entity.info.CompanyProductRelevanceEntity; -import com.glxp.sale.admin.entity.inout.ErpOrderEntity; -import com.glxp.sale.admin.entity.inout.OrderEntity; -import com.glxp.sale.admin.entity.inout.WarehouseBussinessTypeEntity; -import com.glxp.sale.admin.entity.inout.WarehouseEntity; +import com.glxp.sale.admin.entity.inout.*; import com.glxp.sale.admin.entity.inventory.InvWarehouseEntity; import com.glxp.sale.admin.entity.receipt.ProductInfoEntity; import com.glxp.sale.admin.entity.thrsys.*; +import com.glxp.sale.admin.req.auth.AuthAdminQueryRequest; import com.glxp.sale.admin.req.basic.*; import com.glxp.sale.admin.req.info.FilterCompanyProductRelevanceRequest; import com.glxp.sale.admin.req.inout.OrderFilterRequest; +import com.glxp.sale.admin.req.inventory.FilterInvUserRequest; import com.glxp.sale.admin.req.inventory.FilterInvWarehouseRequest; import com.glxp.sale.admin.req.receipt.ProductInfoFilterRequest; import com.glxp.sale.admin.req.thrsys.*; @@ -23,11 +23,10 @@ import com.glxp.sale.admin.res.basic.SpsSyncBusResponse; import com.glxp.sale.admin.res.basic.SpsSyncDataResponse; import com.glxp.sale.admin.res.basic.SpsSyncOrderResponse; import com.glxp.sale.admin.res.param.SyncDataSetResponse; +import com.glxp.sale.admin.service.auth.AuthAdminService; import com.glxp.sale.admin.service.basic.*; import com.glxp.sale.admin.service.info.CompanyProductRelevanceService; -import com.glxp.sale.admin.service.inout.CodesService; -import com.glxp.sale.admin.service.inout.OrderDetailService; -import com.glxp.sale.admin.service.inout.OrderService; +import com.glxp.sale.admin.service.inout.*; import com.glxp.sale.admin.service.inventory.InvWarehouseService; import com.glxp.sale.admin.service.param.SyncDataSetService; import com.glxp.sale.admin.service.receipt.ProductInfoService; @@ -69,16 +68,46 @@ public class SpsSyncDownloadService { @Resource private SyncDataSetService syncDataSetService; + + @Resource + WarehouseBussinessTypeService warehouseBussinessTypeService; + @Resource + WarehouseUserService warehouseUserService; + @Resource + AuthAdminService authAdminService; + public BaseResponse findProductInfo(SpsSyncDataRequest spsSyncDataRequest) { SpsSyncDataResponse syncDataResponse = new SpsSyncDataResponse(); SyncDataSetResponse syncDataSetEntity = syncDataSetService.selectSet(); + + //用户信息 + if (syncDataSetEntity.isSysUser()) { + AuthAdminQueryRequest authAdminQueryRequest = new AuthAdminQueryRequest(); + BeanUtils.copyProperties(spsSyncDataRequest, authAdminQueryRequest); + authAdminQueryRequest.setCustomerId("110"); + List authAdminList = authAdminService.listAdminPage(authAdminQueryRequest); + syncDataResponse.setAuthAdminList(authAdminList); + } + if (syncDataSetEntity.isBasicInv()) { //仓库字典 FilterInvWarehouseRequest filterInvWarehouseRequest = new FilterInvWarehouseRequest(); BeanUtils.copyProperties(spsSyncDataRequest, filterInvWarehouseRequest); List invWarehouseEntities = invWarehouseService.filterGroupInvWarehouse(filterInvWarehouseRequest); syncDataResponse.setInvWarehouseEntities(invWarehouseEntities); + + //仓库关联单据类型 + FilterInvBusTypeRequest filterInvBusTypeRequest = new FilterInvBusTypeRequest(); + BeanUtils.copyProperties(spsSyncDataRequest, filterInvBusTypeRequest); + List warehouseBussinessTypeEntities = warehouseBussinessTypeService.filterList(filterInvBusTypeRequest); + syncDataResponse.setWarehouseBussinessTypeEntities(warehouseBussinessTypeEntities); + + //仓库关联用户 + FilterInvUserRequest filterInvUserRequest = new FilterInvUserRequest(); + BeanUtils.copyProperties(spsSyncDataRequest, filterInvBusTypeRequest); + List warehouseUserEntities = warehouseUserService.filterWarehouseUsers(filterInvUserRequest); + syncDataResponse.setWarehouseUserEntities(warehouseUserEntities); } if (syncDataSetEntity.isBasicProducts()) { @@ -267,10 +296,10 @@ public class SpsSyncDownloadService { List warehouseEntityList = new ArrayList<>(); if (CollUtil.isNotEmpty(orderEntities)) { for (OrderEntity orderEntity : orderEntities) { - List orderDetailEntityList = orderDetailService.filterAllByOrderIdFk(orderEntity.getId()); - if (CollUtil.isNotEmpty(orderDetailEntityList)) { - allOrderDetailEntityList.addAll(orderDetailEntityList); - } +// List orderDetailEntityList = orderDetailService.filterAllByOrderIdFk(orderEntity.getId()); +// if (CollUtil.isNotEmpty(orderDetailEntityList)) { +// allOrderDetailEntityList.addAll(orderDetailEntityList); +// } List codes = codesService.findByReceiptId(orderEntity.getId()); if (CollUtil.isNotEmpty(codes)) { warehouseEntityList.addAll(codes); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/SpsSyncExportStatusController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/SpsSyncExportStatusController.java index a65240a..a31a1b0 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/SpsSyncExportStatusController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/SpsSyncExportStatusController.java @@ -120,8 +120,11 @@ public class SpsSyncExportStatusController { if (CollUtil.isNotEmpty(syncOrderResponse.getOrderEntities())) { BasicExportStatusTimeEntity basicExportStatusTimeEntity = basicExportTimeService.findByType(ConstantStatus.SYNC_SCAN_ORDER); if (basicExportStatusTimeEntity != null) { - basicExportStatusTimeEntity.setLastUpdateTime(basicExportStatusRequest.getSyncTime()); + if (StrUtil.isNotEmpty(basicExportStatusRequest.getSyncTime())) + basicExportStatusTimeEntity.setLastUpdateTime(basicExportStatusRequest.getSyncTime()); + basicExportTimeService.updateExportStatus(basicExportStatusTimeEntity); } + BasicExportStatusEntity orderStatusEntity = new BasicExportStatusEntity(); orderStatusEntity.setId(CustomUtil.getId()); orderStatusEntity.setIdDatas(ConstantStatus.SYNC_SCAN_ORDER); @@ -148,7 +151,9 @@ public class SpsSyncExportStatusController { || CollUtil.isNotEmpty(spsSyncBusResponse.getBussinessTypeEntities())) { BasicExportStatusTimeEntity basicExportStatusTimeEntity = basicExportTimeService.findByType(ConstantStatus.SYNC_BUS_TYPE); if (basicExportStatusTimeEntity != null) { - basicExportStatusTimeEntity.setLastUpdateTime(basicExportStatusRequest.getSyncTime()); + if (StrUtil.isNotEmpty(basicExportStatusRequest.getSyncTime())) + basicExportStatusTimeEntity.setLastUpdateTime(basicExportStatusRequest.getSyncTime()); + basicExportTimeService.updateExportStatus(basicExportStatusTimeEntity); } BasicExportStatusEntity busTypetatusEntity = new BasicExportStatusEntity(); busTypetatusEntity.setId(CustomUtil.getId()); @@ -183,10 +188,13 @@ public class SpsSyncExportStatusController { || CollUtil.isNotEmpty(spsSyncDataResponse.getUdiRelevanceEntities()) || CollUtil.isNotEmpty(spsSyncDataResponse.getThrProductsEntities()) || CollUtil.isNotEmpty(spsSyncDataResponse.getThrInvWarehouseEntities()) + || CollUtil.isNotEmpty(spsSyncDataResponse.getAuthAdminList()) ) { BasicExportStatusTimeEntity basicExportStatusTimeEntity = basicExportTimeService.findByType(ConstantStatus.SYNC_BASIC_DATA); if (basicExportStatusTimeEntity != null) { - basicExportStatusTimeEntity.setLastUpdateTime(basicExportStatusRequest.getSyncTime()); + if (StrUtil.isNotEmpty(basicExportStatusRequest.getSyncTime())) + basicExportStatusTimeEntity.setLastUpdateTime(basicExportStatusRequest.getSyncTime()); + basicExportTimeService.updateExportStatus(basicExportStatusTimeEntity); } BasicExportStatusEntity basicExportStatusEntity = new BasicExportStatusEntity(); basicExportStatusEntity.setId(CustomUtil.getId()); @@ -214,7 +222,8 @@ public class SpsSyncExportStatusController { || CollUtil.isNotEmpty(spSyncUdiResponse.getUdiCompanyEntities())) { BasicExportStatusTimeEntity basicExportStatusTimeEntity = basicExportTimeService.findByType(ConstantStatus.SYNC_DI_PRODUCTS); if (basicExportStatusTimeEntity != null) { - basicExportStatusTimeEntity.setLastUpdateTime(basicExportStatusRequest.getSyncTime()); + if (StrUtil.isNotEmpty(basicExportStatusRequest.getSyncTime())) + basicExportStatusTimeEntity.setLastUpdateTime(basicExportStatusRequest.getSyncTime()); } BasicExportStatusEntity basicExportStatusEntity = new BasicExportStatusEntity(); basicExportStatusEntity.setId(CustomUtil.getId()); 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 6c6c515..e56c425 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 @@ -1,5 +1,6 @@ package com.glxp.sale.admin.controller.inout; +import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSONObject; @@ -7,28 +8,37 @@ import com.github.pagehelper.PageInfo; import com.glxp.sale.admin.annotation.AuthRuleAnnotation; import com.glxp.sale.admin.constant.ConstantStatus; import com.glxp.sale.admin.controller.inout.utils.DataTransUtil; +import com.glxp.sale.admin.dao.inout.CodesDao; +import com.glxp.sale.admin.dao.inout.CodesTempDao; +import com.glxp.sale.admin.dao.inout.OrderDao; +import com.glxp.sale.admin.dao.inout.StockOrderDao; +import com.glxp.sale.admin.dao.inventory.InvWarehouseDao; import com.glxp.sale.admin.entity.auth.AuthAdmin; import com.glxp.sale.admin.entity.basic.BussinessTypeEntity; +import com.glxp.sale.admin.entity.basic.EntrustReceEntity; import com.glxp.sale.admin.entity.info.CompanyEntity; import com.glxp.sale.admin.entity.inout.*; import com.glxp.sale.admin.entity.inventory.InvWarehouseEntity; import com.glxp.sale.admin.entity.udid.UdiEntity; +import com.glxp.sale.admin.req.basic.BasicEntrustRecRequest; import com.glxp.sale.admin.req.inout.*; import com.glxp.sale.admin.req.inventory.FilterInvUserRequest; import com.glxp.sale.admin.res.PageSimpleResponse; import com.glxp.sale.admin.res.inout.OrderEditRequest; +import com.glxp.sale.admin.service.auth.AuthAdminService; import com.glxp.sale.admin.service.auth.CustomerService; import com.glxp.sale.admin.service.basic.BussinessTypeService; +import com.glxp.sale.admin.service.basic.EntrustReceService; import com.glxp.sale.admin.service.info.CompanyService; import com.glxp.sale.admin.service.inout.*; import com.glxp.sale.admin.service.inventory.InvWarehouseService; import com.glxp.sale.admin.thread.InvProductsTrService; -import com.glxp.sale.admin.util.CustomUtil; -import com.glxp.sale.admin.util.FilterUdiUtils; +import com.glxp.sale.admin.util.*; import com.glxp.sale.common.enums.ResultEnum; import com.glxp.sale.common.res.BaseResponse; import com.glxp.sale.common.util.ResultVOUtils; import org.apache.commons.lang3.StringUtils; +import org.apache.regexp.RE; import org.springframework.beans.factory.annotation.Value; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; @@ -68,6 +78,18 @@ public class OrderController { WarehouseUserService warehouseUserService; @Resource CustomerService customerService; + @Resource + EntrustReceService entrustReceService; + @Resource + GennerOrderUtils gennerOrderUtils; + @Resource + InvWarehouseDao invWarehouseDao; + @Resource + OrderDao orderDao; + @Resource + CodesTempDao codesTempDao; + @Resource + private AuthAdminService authAdminService; @AuthRuleAnnotation("") @GetMapping("udiwms/inout/order/getUdi") @@ -172,7 +194,8 @@ public class OrderController { public BaseResponse filterOrder(OrderFilterRequest orderFilterRequest, BindingResult bindingResult) { - if (StringUtils.isBlank(orderFilterRequest.getCustomerId())) return ResultVOUtils.success(); + if (StringUtils.isBlank(orderFilterRequest.getCustomerId())) + return ResultVOUtils.success(); CompanyEntity companyEntity = companyService.findCompany(Long.parseLong(orderFilterRequest.getCustomerId())); if (companyEntity.getUnitIdFk().equals("110")) { Integer userId = customerService.getUserId(); @@ -228,37 +251,43 @@ public class OrderController { if (bindingResult.hasErrors()) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } - - Integer userId = customerService.getUserId(); + Integer userId = null; + if (StrUtil.isNotEmpty(orderFilterRequest.getWmsUserId())) { + userId = Integer.parseInt(orderFilterRequest.getWmsUserId()); + } else userId = customerService.getUserId(); BussinessTypeEntity bussinessTypeEntity = bussinessTypeService.findBTByAction(orderFilterRequest.getAction()); StockOrderEntity stockOrderEntity = stockOrderService.findByBillNo(orderFilterRequest.getOrderId()); - - if (stockOrderEntity == null || stockOrderEntity.getOrderIdFk() == null) { return ResultVOUtils.error(500, "单据未找到！"); } else if (!bussinessTypeEntity.getLocalAction().equals(stockOrderEntity.getBillType())) { 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()); + FilterInvUserRequest filterInvUserRequest = new FilterInvUserRequest(); + filterInvUserRequest.setCode(invWarehouseEntity.getCode()); + filterInvUserRequest.setUserid(userId.longValue()); + List warehouseUserEntities = warehouseUserService.filterWarehouseUsers(filterInvUserRequest); + List entrustReceEntities = null; + if (!stockOrderEntity.isEntrustEnd()) { + BasicEntrustRecRequest basicEntrustRecRequest = new BasicEntrustRecRequest(); + basicEntrustRecRequest.setAction(stockOrderEntity.getBillType()); + basicEntrustRecRequest.setEntrustUser(userId + ""); + basicEntrustRecRequest.setCurInv(stockOrderEntity.getLocStorageCode()); + entrustReceEntities = entrustReceService.filterEntrustRec(basicEntrustRecRequest); + } else { + return ResultVOUtils.error(500, "单据已委托验收完成！"); + } + if (CollUtil.isEmpty(warehouseUserEntities) && CollUtil.isEmpty(entrustReceEntities)) { + return ResultVOUtils.error(500, "权限不足，无法验收！"); + } + } } else { - StockOrderFilterRequest stockOrderFilterRequest = new StockOrderFilterRequest(); - orderFilterRequest.setId(stockOrderEntity.getOrderIdFk()); - stockOrderFilterRequest.setUserId(customerService.getUserId()); -// if (StrUtil.isNotEmpty(stockOrderFilterRequest.getLocStorageCode())) { -// InvWarehouseEntity invWarehouseEntity = invWarehouseService.selectByCode(stockOrderFilterRequest.getLocStorageCode()); -// FilterInvUserRequest filterInvUserRequest = new FilterInvUserRequest(); -// filterInvUserRequest.setCode(invWarehouseEntity.getCode()); -// filterInvUserRequest.setUserid(userId.longValue()); -// filterInvUserRequest.setIsDirector(true); -// List warehouseUserEntities = warehouseUserService.filterWarehouseUsers(filterInvUserRequest); -// if (CollUtil.isEmpty(warehouseUserEntities)) { -// stockOrderFilterRequest.setUnionUser(userId); -// } -// } - - - + return ResultVOUtils.error(500, "非未验收单据！"); } + orderFilterRequest.setId(stockOrderEntity.getOrderIdFk()); if (orderFilterRequest.getOrderId() == null || "".equals(orderFilterRequest.getOrderId())) { orderFilterRequest.setId(null); @@ -267,10 +296,6 @@ public class OrderController { return ResultVOUtils.error(500, "单据已验收！"); } } - - - - List orderEntityList; if (orderFilterRequest.getStatus() == null || orderFilterRequest.getStatus() == 0) { orderFilterRequest.setStatus(4); @@ -294,19 +319,104 @@ public class OrderController { @PostMapping("/spms/inout/order/check/updateStatus") public BaseResponse updateStatus(@RequestBody UpdateExportStatusRequest updateExportStatusRequest, BindingResult bindingResult) { + AuthAdmin authAdmin = null; + if (StrUtil.isNotEmpty(updateExportStatusRequest.getWmsUserId())) { + authAdmin = authAdminService.findById(Long.parseLong(updateExportStatusRequest.getWmsUserId())); + } else + authAdmin = customerService.getUserBean(); + OrderEntity orderEntity = orderService.findById(updateExportStatusRequest.getOrderId()); + if (orderEntity.getReceiveStatus() == ConstantStatus.RECEIVE_ED) { + return ResultVOUtils.error(500, "单据已验收！"); + } + if (updateExportStatusRequest.isEntrust() && updateExportStatusRequest.getEntrustId() != null) { + EntrustReceEntity entrustReceEntity = entrustReceService.findById(updateExportStatusRequest.getEntrustId()); + if (entrustReceEntity == null) { + return ResultVOUtils.error(500, "无验收权限！"); + } else { - AuthAdmin authAdmin = customerService.getUserBean(); - long customerId = customerService.getCustomerId(); - return updateReview(authAdmin, customerId, updateExportStatusRequest); + if (orderEntity.getFromType().intValue() != ConstantStatus.FROM_CHANGE && orderEntity.getFromType().intValue() != ConstantStatus.FROM_PEACE_CHANGE) { + transferOrder(orderEntity, entrustReceEntity); + } + if (!entrustReceEntity.isFinishRece()) { + StockOrderFilterRequest stockOrderFilterRequest = new StockOrderFilterRequest(); + stockOrderFilterRequest.setOrderIdFk(updateExportStatusRequest.getOrderId()); + List stockOrderEntityLit = stockOrderService.findAllOrders(stockOrderFilterRequest); + if (!stockOrderEntityLit.isEmpty()) { + for (StockOrderEntity stockOrderEntity : stockOrderEntityLit) { + stockOrderEntity.setEntrustEnd(true); + stockOrderService.updateById(stockOrderEntity); + } + } + return ResultVOUtils.success("验收成功！"); + } else + + return updateReview(authAdmin, updateExportStatusRequest); + } + } else + return updateReview(authAdmin, updateExportStatusRequest); + } + + + public void transferOrder(OrderEntity orderEntity, EntrustReceEntity entrustReceEntity) { + List warehouseEntities = codesService.findByReceiptId(orderEntity.getId()); + BussinessTypeEntity bussinessTypeEntity = bussinessTypeService.findBTByAction(entrustReceEntity.getEntrustAction()); + OrderEntity supplementOrder = new OrderEntity(); + BeanUtil.copyProperties(orderEntity, supplementOrder); + //生成补单单号 + String orderNo = gennerOrderUtils.createScOrderNo(new OrderNoTypeBean(Constant.SCAN_ORDER + MyStrUtil.trim(bussinessTypeEntity.getPrefix()), "yyyyMMdd")); + String supplementOrderNo = orderNo; + supplementOrder.setOriginUllageSupNo(orderEntity.getId()); + supplementOrder.setId(supplementOrderNo); + supplementOrder.setStatus(ConstantStatus.ORDER_STATUS_PROCESS); + + + supplementOrder.setExportStatus(0); //设置导出状态为未导出 + supplementOrder.setContrastStatus(0);//设置erp校验状态为未校验 + supplementOrder.setReceiveStatus(0); //设置验收状态为未验收 + supplementOrder.setCorpOrderId(CustomUtil.getId() + "x"); + //修改往来单位及当前库存号 + supplementOrder.setFromCorpId(orderEntity.getLocStorageCode()); + supplementOrder.setLocStorageCode(orderEntity.getFromCorpId()); + String name = invWarehouseDao.getNameByCode(supplementOrder.getFromCorpId()); + supplementOrder.setFromCorp(name); + supplementOrder.setFromType(ConstantStatus.FROM_PEACE_CHANGE); + + supplementOrder.setMainAction(bussinessTypeEntity.getMainAction()); + supplementOrder.setAction(bussinessTypeEntity.getAction()); + supplementOrder.setErpFk(null); + //复制码表 + List supplementCodes = new ArrayList<>(); + warehouseEntities.forEach( + code -> { + WarehouseEntity supplementCode = new WarehouseEntity(); + BeanUtil.copyProperties(code, supplementCode); + supplementCode.setFromCorpId(supplementOrder.getFromCorpId()); + supplementCode.setFromCorp(supplementOrder.getFromCorp()); + supplementCode.setLocStorageCode(supplementOrder.getLocStorageCode()); + supplementCode.setOrderId(supplementOrderNo); + //查询补单设置 + supplementCode.setAction(bussinessTypeEntity.getSupplementOrderType()); + supplementCode.setMainAction(bussinessTypeEntity.getMainAction()); + supplementCode.setId(null); + supplementCodes.add(supplementCode); + } + ); + //更新数据 + try { + orderDao.insertOrder(supplementOrder); + orderEntity.setUllageSupNo(supplementOrder.getId()); + orderDao.updateOrder(orderEntity); + codesTempDao.insertCodesTemp(supplementCodes); + } catch (Exception e) { + } } - public BaseResponse updateReview(AuthAdmin authAdmin, long customerId, UpdateExportStatusRequest updateExportStatusRequest) { + + public BaseResponse updateReview(AuthAdmin authAdmin, UpdateExportStatusRequest updateExportStatusRequest) { OrderEntity orderEntity = orderService.findById(updateExportStatusRequest.getOrderId()); orderEntity.setReceiveStatus(1); - if (customerId == 110) { - orderEntity.setReviewUser(authAdmin.getId().intValue()); - } + orderEntity.setReviewUser(authAdmin.getId().intValue()); orderEntity.setUpdateTime(new Date()); orderEntity.setAuditTime(new Date()); orderService.updateOrder(orderEntity); @@ -317,10 +427,9 @@ public class OrderController { stockOrderFilterRequest.setBillNo(id); StockOrderEntity stockOrderEntity = stockOrderService.findOne(stockOrderFilterRequest); stockOrderEntity.setStatus(ConstantStatus.SORDER_DELIVER); - if (customerId == 110) { - stockOrderEntity.setReviewUser(authAdmin.getId().intValue()); - } + stockOrderEntity.setReviewUser(authAdmin.getId().intValue()); stockOrderEntity.setAuditTime(new Date()); + stockOrderEntity.setEntrustEnd(true); stockOrderService.updateById(stockOrderEntity); } } else { @@ -330,9 +439,7 @@ public class OrderController { if (!stockOrderEntityLit.isEmpty()) { for (StockOrderEntity stockOrderEntity : stockOrderEntityLit) { stockOrderEntity.setStatus(ConstantStatus.SORDER_DELIVER); - if (customerId == 110) { - stockOrderEntity.setReviewUser(authAdmin.getId().intValue()); - } + stockOrderEntity.setReviewUser(authAdmin.getId().intValue()); stockOrderEntity.setAuditTime(new Date()); stockOrderService.updateById(stockOrderEntity); } @@ -360,7 +467,7 @@ public class OrderController { AuthAdmin authAdmin = customerService.getUserBean(); long customerId = customerService.getCustomerId(); - return updateReview(authAdmin, customerId, updateExportStatusRequest); + return updateReview(authAdmin, updateExportStatusRequest); } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/WareHouseController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/WareHouseController.java index a6a0917..b8d38bb 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/WareHouseController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/WareHouseController.java @@ -7,16 +7,14 @@ import com.github.pagehelper.PageInfo; import com.glxp.sale.admin.annotation.AuthRuleAnnotation; import com.glxp.sale.admin.constant.ConstantStatus; import com.glxp.sale.admin.dao.auth.AuthLicenseDao; +import com.glxp.sale.admin.dao.inventory.InvWarehouseDao; import com.glxp.sale.admin.entity.auth.AuthAdmin; import com.glxp.sale.admin.entity.auth.AuthLicense; import com.glxp.sale.admin.entity.basic.BasicUnitMaintainEntity; import com.glxp.sale.admin.entity.basic.BussinessTypeEntity; import com.glxp.sale.admin.entity.basic.UdiInfoEntity; import com.glxp.sale.admin.entity.info.CompanyEntity; -import com.glxp.sale.admin.entity.inout.OrderEntity; -import com.glxp.sale.admin.entity.inout.StockOrderEntity; -import com.glxp.sale.admin.entity.inout.WarehouseEntity; -import com.glxp.sale.admin.entity.inout.WarehouseUserEntity; +import com.glxp.sale.admin.entity.inout.*; import com.glxp.sale.admin.entity.inventory.InvProductDetailEntity; import com.glxp.sale.admin.entity.param.SystemParamConfigEntity; import com.glxp.sale.admin.entity.udid.UdiEntity; @@ -39,6 +37,7 @@ import com.glxp.sale.admin.service.info.CompanyProductRelevanceService; import com.glxp.sale.admin.service.info.CompanyService; import com.glxp.sale.admin.service.inout.*; import com.glxp.sale.admin.service.inventory.InvPreInProductDetailService; +import com.glxp.sale.admin.service.inventory.InvWarehouseService; import com.glxp.sale.admin.service.param.SystemParamConfigService; import com.glxp.sale.admin.thread.IoTransInoutService; import com.glxp.sale.admin.util.*; @@ -103,6 +102,8 @@ public class WareHouseController { GennerOrderUtils gennerOrderUtils; @Resource private UdiInfoService udiInfoService; + @Resource + InvWarehouseDao invWarehouseService; @AuthRuleAnnotation("") @GetMapping("admin/warehouse/inout/list") @@ -964,8 +965,15 @@ public class WareHouseController { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } try { - String customerId = getCustomerId(); - Integer userId = customerService.getUserId(); + String customerId = null; + Integer userId = null; + if (StrUtil.isNotEmpty(postOrderRequest.getWmsUserId())) { + customerId = Constant.SYSTEM_CUSTOMER_ID; + userId = Integer.parseInt(postOrderRequest.getWmsUserId()); + } else { + customerId = getCustomerId(); + userId = customerService.getUserId(); + } postOrderRequest.setCustomerId(customerId); postOrderRequest.setUserId(userId); ioTransInoutService.creatOrder(postOrderRequest); @@ -1073,6 +1081,7 @@ public class WareHouseController { if (StrUtil.isBlank(code) || StrUtil.isBlank(userListJson)) return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); warehouseUserService.saveWarehouseUser(code, JSONUtil.toList(userListJson, AuthAdmin.class)); + invWarehouseService.updateTime(code, new Date()); return ResultVOUtils.success(); } @@ -1084,6 +1093,7 @@ public class WareHouseController { if (StrUtil.isBlank(code) || StrUtil.isBlank(bussinessTypeJson)) return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); warehouseBussinessTypeService.saveWarehouseBussinessType(code, JSONUtil.toList(bussinessTypeJson, BussinessTypResponse.class)); + invWarehouseService.updateTime(code, new Date()); return ResultVOUtils.success(); } @@ -1093,6 +1103,7 @@ public class WareHouseController { if (warehouseUserEntity == null) return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); warehouseUserService.updateDirector(warehouseUserEntity); + invWarehouseService.updateTime(warehouseUserEntity.getCode(), new Date()); return ResultVOUtils.success(); } @@ -1101,6 +1112,8 @@ public class WareHouseController { public BaseResponse deleteWarehouseUser(Integer id) { if (null == id) return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); + WarehouseUserEntity warehouseUserEntity = warehouseUserService.selectById(id); + invWarehouseService.updateTime(warehouseUserEntity.getCode(), new Date()); warehouseUserService.deleteWarehouseUser(id); return ResultVOUtils.success(); } @@ -1110,6 +1123,8 @@ public class WareHouseController { public BaseResponse deleteWarehouseBussinessType(Integer id) { if (null == id) return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); + WarehouseBussinessTypeEntity warehouseBussinessTypeEntity = warehouseBussinessTypeService.selectById(id); + invWarehouseService.updateTime(warehouseBussinessTypeEntity.getCode(), new Date()); warehouseBussinessTypeService.deleteWarehouseByssuinessType(id); return ResultVOUtils.success(); } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/inventory/InvPreInProductsController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/inventory/InvPreInProductsController.java index ad37f5b..d9bebdf 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/inventory/InvPreInProductsController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/inventory/InvPreInProductsController.java @@ -145,8 +145,12 @@ public class InvPreInProductsController { invProductService.deleteById(id); FilterInvProductDetailRequest detailRequest = new FilterInvProductDetailRequest(); detailRequest.setSupId(invProductEntity.getSupId()); - detailRequest.setBatchNo(invProductEntity.getBatchNo()); + if (StrUtil.isEmpty(invProductEntity.getBatchNo())) { + detailRequest.setBatchNo("empty"); + } else + detailRequest.setBatchNo(invProductEntity.getBatchNo()); detailRequest.setProductIdFk(invProductEntity.getRelIdFk()); + detailRequest.setInvStorageCode(invProductEntity.getInvStorageCode()); invProductDetailService.deleteByProductId(detailRequest); return ResultVOUtils.success("删除成功"); } else { diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/inventory/InvPreProductsController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/inventory/InvPreProductsController.java index 34de64f..ff76e17 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/inventory/InvPreProductsController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/inventory/InvPreProductsController.java @@ -117,8 +117,12 @@ public class InvPreProductsController { invProductService.deleteById(id); FilterInvProductDetailRequest detailRequest = new FilterInvProductDetailRequest(); detailRequest.setSupId(invProductEntity.getSupId()); - detailRequest.setBatchNo(invProductEntity.getBatchNo()); + if (StrUtil.isEmpty(invProductEntity.getBatchNo())) { + detailRequest.setBatchNo("empty"); + } else + detailRequest.setBatchNo(invProductEntity.getBatchNo()); detailRequest.setProductIdFk(invProductEntity.getRelIdFk()); + detailRequest.setInvStorageCode(invProductEntity.getInvStorageCode()); invProductDetailService.deleteByProductId(detailRequest); return ResultVOUtils.success("删除成功"); } else { diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/inventory/InvProductsController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/inventory/InvProductsController.java index dd4007d..9620b5e 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/inventory/InvProductsController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/inventory/InvProductsController.java @@ -171,8 +171,12 @@ public class InvProductsController { invProductService.deleteById(id); FilterInvProductDetailRequest detailRequest = new FilterInvProductDetailRequest(); detailRequest.setSupId(invProductEntity.getSupId()); - detailRequest.setBatchNo(invProductEntity.getBatchNo()); + if (StrUtil.isEmpty(invProductEntity.getBatchNo())) { + detailRequest.setBatchNo("empty"); + } else + detailRequest.setBatchNo(invProductEntity.getBatchNo()); detailRequest.setProductIdFk(invProductEntity.getRelIdFk()); + detailRequest.setInvStorageCode(invProductEntity.getInvStorageCode()); invProductDetailService.deleteByProductId(detailRequest); return ResultVOUtils.success("删除成功"); } else { diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/inventory/InvWarehouseController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/inventory/InvWarehouseController.java index dc4c369..4947dba 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/inventory/InvWarehouseController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/inventory/InvWarehouseController.java @@ -90,6 +90,17 @@ public class InvWarehouseController { } + @AuthRuleAnnotation("") + @GetMapping("spms/inv/warehouse/filterNext") + public BaseResponse filterNext(FilterInvWarehouseRequest filterInvWarehouseRequest) { + filterInvWarehouseRequest.setPid(0); + filterInvWarehouseRequest.setStatus(1); + + List invWarehouseEntities = invWarehouseService.filterGroupInvWarehouse(filterInvWarehouseRequest); + return ResultVOUtils.success(invWarehouseEntities); + } + + @AuthRuleAnnotation("") @GetMapping("spms/inv/warehouse/filterByUser") public BaseResponse filterByUser(FilterInvWarehouseRequest filterInvWarehouseRequest) { diff --git a/api-admin/src/main/java/com/glxp/sale/admin/dao/basic/EntrustReceDao.java b/api-admin/src/main/java/com/glxp/sale/admin/dao/basic/EntrustReceDao.java index e03175c..4af7511 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/dao/basic/EntrustReceDao.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/dao/basic/EntrustReceDao.java @@ -1,5 +1,7 @@ package com.glxp.sale.admin.dao.basic; +import cn.hutool.core.collection.CollUtil; +import com.glxp.sale.admin.entity.basic.DlEntrustReceEntity; import com.glxp.sale.admin.entity.basic.EntrustReceEntity; import com.glxp.sale.admin.req.basic.BasicEntrustRecRequest; import com.glxp.sale.admin.res.basic.EntrustReceRespose; @@ -10,9 +12,11 @@ import java.util.List; @Mapper public interface EntrustReceDao { - List filterEntrustRec(BasicEntrustRecRequest basicEntrustRecRequest); + List downloadEntrustRec(BasicEntrustRecRequest basicEntrustRecRequest); + + List filterJoinEntrustRec(BasicEntrustRecRequest basicEntrustRecRequest); boolean insertEntrustRec(EntrustReceEntity ioOrderStatusEntity); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/dao/inout/WarehouseBussinessTypeDao.java b/api-admin/src/main/java/com/glxp/sale/admin/dao/inout/WarehouseBussinessTypeDao.java index 17ae1cf..a80db37 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/dao/inout/WarehouseBussinessTypeDao.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/dao/inout/WarehouseBussinessTypeDao.java @@ -1,11 +1,17 @@ package com.glxp.sale.admin.dao.inout; import com.glxp.sale.admin.entity.inout.WarehouseBussinessTypeEntity; +import com.glxp.sale.admin.req.basic.FilterInvBusTypeRequest; +import com.glxp.sale.admin.req.inventory.FilterInvUserRequest; import org.apache.ibatis.annotations.Param; import java.util.List; public interface WarehouseBussinessTypeDao { + + + WarehouseBussinessTypeEntity selectById(Integer id); + int deleteByPrimaryKey(Integer id); int insert(WarehouseBussinessTypeEntity record); @@ -30,5 +36,7 @@ public interface WarehouseBussinessTypeDao { List selectListByCode(@Param("code") String code); + List filterList(FilterInvBusTypeRequest filterInvUserRequest); + void deleteByCode(@Param("code") String code); } \ No newline at end of file diff --git a/api-admin/src/main/java/com/glxp/sale/admin/dao/inout/WarehouseUserDao.java b/api-admin/src/main/java/com/glxp/sale/admin/dao/inout/WarehouseUserDao.java index d4071e0..1d25803 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/dao/inout/WarehouseUserDao.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/dao/inout/WarehouseUserDao.java @@ -9,7 +9,7 @@ import java.util.List; public interface WarehouseUserDao { int deleteByPrimaryKey(Integer id); - List filterWarehouseUsers(FilterInvUserRequest filterInvUserRequest); + List filterList(FilterInvUserRequest filterInvUserRequest); int insert(WarehouseUserEntity record); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/dao/inventory/InvWarehouseDao.java b/api-admin/src/main/java/com/glxp/sale/admin/dao/inventory/InvWarehouseDao.java index 1a95ad5..9fd521b 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/dao/inventory/InvWarehouseDao.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/dao/inventory/InvWarehouseDao.java @@ -5,6 +5,7 @@ import com.glxp.sale.admin.req.inventory.FilterInvWarehouseRequest; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +import java.util.Date; import java.util.List; @Mapper @@ -44,4 +45,8 @@ public interface InvWarehouseDao { * @return */ boolean updateThridId(@Param("id") Integer id, @Param("thridWarehouseId") String thridWarehouseId, @Param("sysId") String sysId); + + boolean updateTime(@Param("code") String code, @Param("updateTime") Date updateTime); + + } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/basic/DlEntrustReceEntity.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/basic/DlEntrustReceEntity.java new file mode 100644 index 0000000..d28073e --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/entity/basic/DlEntrustReceEntity.java @@ -0,0 +1,14 @@ +package com.glxp.sale.admin.entity.basic; + +import lombok.Data; + +@Data +public class DlEntrustReceEntity { + + + private Integer id; + private String action; + private String name; + private String mainAction; + +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/basic/EntrustReceEntity.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/basic/EntrustReceEntity.java index 83e73cb..9f4ab04 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/entity/basic/EntrustReceEntity.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/entity/basic/EntrustReceEntity.java @@ -7,7 +7,6 @@ import java.util.Date; @Data public class EntrustReceEntity { - private Integer id; private String action; private String curInv; @@ -19,5 +18,4 @@ public class EntrustReceEntity { private String remark; private boolean finishRece; - } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/inout/StockOrderEntity.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/inout/StockOrderEntity.java index a6d1899..fae42a8 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/entity/inout/StockOrderEntity.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/entity/inout/StockOrderEntity.java @@ -40,5 +40,7 @@ public class StockOrderEntity { private Date auditTime; //更新时间 private Date updateTime; + //委托验收已完成 + private boolean entrustEnd; } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/param/SyncDataSetEntity.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/param/SyncDataSetEntity.java index 01b945f..db98eb4 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/entity/param/SyncDataSetEntity.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/entity/param/SyncDataSetEntity.java @@ -24,4 +24,5 @@ public class SyncDataSetEntity { private boolean orderUnCheck; private String busTypes; private Integer syncTime; + private boolean sysUser; } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/auth/AuthAdminQueryRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/auth/AuthAdminQueryRequest.java index 1bb4bc7..69c7a72 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/req/auth/AuthAdminQueryRequest.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/req/auth/AuthAdminQueryRequest.java @@ -19,4 +19,5 @@ public class AuthAdminQueryRequest extends ListPageRequest { private List ids; private String CustomerId; + private String lastUpdateTime; } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/basic/BasicEntrustRecRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/basic/BasicEntrustRecRequest.java index 974c11d..c03d06b 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/req/basic/BasicEntrustRecRequest.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/req/basic/BasicEntrustRecRequest.java @@ -14,6 +14,7 @@ public class BasicEntrustRecRequest extends ListPageRequest { private String entrustUser; private String userId; private Date updateTime; + private String curInv; } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/basic/FilterInvBusTypeRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/basic/FilterInvBusTypeRequest.java new file mode 100644 index 0000000..a3c198c --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/req/basic/FilterInvBusTypeRequest.java @@ -0,0 +1,13 @@ +package com.glxp.sale.admin.req.basic; + +import com.glxp.sale.admin.req.ListPageRequest; +import lombok.Data; + +import java.util.List; + +@Data +public class FilterInvBusTypeRequest extends ListPageRequest { + private String lastUpdateTime; + private Integer id; + private String code; +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/inout/OrderFilterRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/inout/OrderFilterRequest.java index 8c43c32..bc0105d 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/req/inout/OrderFilterRequest.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/req/inout/OrderFilterRequest.java @@ -36,4 +36,6 @@ public class OrderFilterRequest extends ListPageRequest { private String lastUpdateTime; private Integer unionUser; private List filterActions; + private String wmsUserId; + private String wmsUserName; } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/inout/PostOrderRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/inout/PostOrderRequest.java index bfead93..a4c6e75 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/req/inout/PostOrderRequest.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/req/inout/PostOrderRequest.java @@ -13,6 +13,8 @@ public class PostOrderRequest { private String customerId; private Integer userId; + private String wmsUserId; + private String wmsUserName; public List getPostOrder() { return postOrders; diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/inout/StockOrderFilterRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/inout/StockOrderFilterRequest.java index 726ad43..0b8da27 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/req/inout/StockOrderFilterRequest.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/req/inout/StockOrderFilterRequest.java @@ -35,5 +35,6 @@ public class StockOrderFilterRequest extends ListPageRequest { private Integer userId; private Integer unionUser; private String entrustUser; + private boolean entrustEnd; } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/inout/UpdateExportStatusRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/inout/UpdateExportStatusRequest.java index 4e7f82c..d0a609c 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/req/inout/UpdateExportStatusRequest.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/req/inout/UpdateExportStatusRequest.java @@ -9,4 +9,8 @@ public class UpdateExportStatusRequest { private Integer exportStatus; private Integer checkStatus; private String stockOrderId; + private Integer entrustId; + private boolean entrust; + private String wmsUserId; + private String wmsUserName; } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/inventory/FilterInvUserRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/inventory/FilterInvUserRequest.java index 8b89435..dbf73fb 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/req/inventory/FilterInvUserRequest.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/req/inventory/FilterInvUserRequest.java @@ -1,9 +1,10 @@ package com.glxp.sale.admin.req.inventory; +import com.glxp.sale.admin.req.ListPageRequest; import lombok.Data; @Data -public class FilterInvUserRequest { +public class FilterInvUserRequest extends ListPageRequest { private Integer id; @@ -14,4 +15,5 @@ public class FilterInvUserRequest { private String username; private Boolean isDirector; + private String lastUpdateTime; } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/res/basic/SpsSyncBusResponse.java b/api-admin/src/main/java/com/glxp/sale/admin/res/basic/SpsSyncBusResponse.java index 70712e6..748d9bb 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/res/basic/SpsSyncBusResponse.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/res/basic/SpsSyncBusResponse.java @@ -1,5 +1,6 @@ package com.glxp.sale.admin.res.basic; +import com.glxp.sale.admin.entity.auth.AuthAdmin; import com.glxp.sale.admin.entity.basic.BussinessLocalTypeEntity; import com.glxp.sale.admin.entity.basic.BussinessOriginTypeEntity; import com.glxp.sale.admin.entity.basic.BussinessTypeEntity; @@ -14,4 +15,6 @@ public class SpsSyncBusResponse { private List bussinessTypeEntities; private List bussinessOriginTypeEntities; private List bussinessLocalTypeEntities; + + } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/res/basic/SpsSyncDataResponse.java b/api-admin/src/main/java/com/glxp/sale/admin/res/basic/SpsSyncDataResponse.java index 0df9c40..ec6a0a8 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/res/basic/SpsSyncDataResponse.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/res/basic/SpsSyncDataResponse.java @@ -1,9 +1,12 @@ package com.glxp.sale.admin.res.basic; +import com.glxp.sale.admin.entity.auth.AuthAdmin; import com.glxp.sale.admin.entity.basic.BasicUnitMaintainEntity; import com.glxp.sale.admin.entity.basic.UdiInfoEntity; import com.glxp.sale.admin.entity.basic.UdiRelevanceEntity; import com.glxp.sale.admin.entity.info.CompanyProductRelevanceEntity; +import com.glxp.sale.admin.entity.inout.WarehouseBussinessTypeEntity; +import com.glxp.sale.admin.entity.inout.WarehouseUserEntity; import com.glxp.sale.admin.entity.inventory.InvWarehouseEntity; import com.glxp.sale.admin.entity.thrsys.*; import lombok.Data; @@ -23,4 +26,10 @@ public class SpsSyncDataResponse { List thrOrderEntities; List companyProductRelevanceEntities; List udiRelevanceEntities; + + List warehouseBussinessTypeEntities; + List warehouseUserEntities; + List authAdminList; + + } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/res/inout/WarehouseUserResponse.java b/api-admin/src/main/java/com/glxp/sale/admin/res/inout/WarehouseUserResponse.java index f0f9572..4bb77d6 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/res/inout/WarehouseUserResponse.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/res/inout/WarehouseUserResponse.java @@ -8,7 +8,7 @@ public class WarehouseUserResponse { /** * id */ - private String id; + private Integer id; /** * 仓位码 diff --git a/api-admin/src/main/java/com/glxp/sale/admin/res/param/SyncDataSetResponse.java b/api-admin/src/main/java/com/glxp/sale/admin/res/param/SyncDataSetResponse.java index b2593f6..feeb0d6 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/res/param/SyncDataSetResponse.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/res/param/SyncDataSetResponse.java @@ -22,6 +22,7 @@ public class SyncDataSetResponse { private boolean orderScanFinish; private boolean orderUnReceive; private boolean orderUnCheck; + private boolean sysUser; private List busTypes; private Integer syncTime; diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/auth/impl/AuthAdminServiceImpl.java b/api-admin/src/main/java/com/glxp/sale/admin/service/auth/impl/AuthAdminServiceImpl.java index 9745f80..44790cd 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/auth/impl/AuthAdminServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/auth/impl/AuthAdminServiceImpl.java @@ -26,8 +26,12 @@ public class AuthAdminServiceImpl implements AuthAdminService { if (authAdminQueryRequest == null) { return Collections.emptyList(); } - int offset = (authAdminQueryRequest.getPage() - 1) * authAdminQueryRequest.getLimit(); - PageHelper.offsetPage(offset, authAdminQueryRequest.getLimit()); + + if(authAdminQueryRequest.getPage()!=null){ + int offset = (authAdminQueryRequest.getPage() - 1) * authAdminQueryRequest.getLimit(); + PageHelper.offsetPage(offset, authAdminQueryRequest.getLimit()); + } + return authAdminDao.listAdminPage(authAdminQueryRequest); } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/basic/EntrustReceService.java b/api-admin/src/main/java/com/glxp/sale/admin/service/basic/EntrustReceService.java index 7fedf1e..e3d61a1 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/basic/EntrustReceService.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/basic/EntrustReceService.java @@ -1,6 +1,7 @@ package com.glxp.sale.admin.service.basic; import com.glxp.sale.admin.entity.basic.BasicExportStatusEntity; +import com.glxp.sale.admin.entity.basic.DlEntrustReceEntity; import com.glxp.sale.admin.entity.basic.EntrustReceEntity; import com.glxp.sale.admin.req.basic.BasicEntrustRecRequest; import com.glxp.sale.admin.req.basic.BasicExportStatusRequest; @@ -10,9 +11,12 @@ import java.util.List; public interface EntrustReceService { + EntrustReceEntity findById(Integer id); List filterEntrustRec(BasicEntrustRecRequest basicEntrustRecRequest); + List downloadEntrustRec(BasicEntrustRecRequest basicEntrustRecRequest); + List filterJoinEntrustRec(BasicEntrustRecRequest basicEntrustRecRequest); boolean insertEntrustRec(EntrustReceEntity ioOrderStatusEntity); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/basic/impl/EntrustReceServiceImpl.java b/api-admin/src/main/java/com/glxp/sale/admin/service/basic/impl/EntrustReceServiceImpl.java index 85bdad3..247eabf 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/basic/impl/EntrustReceServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/basic/impl/EntrustReceServiceImpl.java @@ -1,8 +1,10 @@ package com.glxp.sale.admin.service.basic.impl; +import cn.hutool.core.collection.CollUtil; import com.github.pagehelper.PageHelper; import com.glxp.sale.admin.dao.basic.EntrustReceDao; import com.glxp.sale.admin.entity.basic.CorpImportLogEntity; +import com.glxp.sale.admin.entity.basic.DlEntrustReceEntity; import com.glxp.sale.admin.entity.basic.EntrustReceEntity; import com.glxp.sale.admin.req.basic.BasicEntrustRecRequest; import com.glxp.sale.admin.res.basic.EntrustReceRespose; @@ -19,6 +21,17 @@ public class EntrustReceServiceImpl implements EntrustReceService { @Resource EntrustReceDao entrustReceDao; + @Override + public EntrustReceEntity findById(Integer id) { + BasicEntrustRecRequest basicEntrustRecRequest = new BasicEntrustRecRequest(); + basicEntrustRecRequest.setId(id); + List entrustReceEntities = entrustReceDao.filterEntrustRec(basicEntrustRecRequest); + if (CollUtil.isNotEmpty(entrustReceEntities)) { + return entrustReceEntities.get(0); + } + return null; + } + @Override public List filterEntrustRec(BasicEntrustRecRequest basicEntrustRecRequest) { @@ -32,6 +45,18 @@ public class EntrustReceServiceImpl implements EntrustReceService { return entrustReceDao.filterEntrustRec(basicEntrustRecRequest); } + @Override + public List downloadEntrustRec(BasicEntrustRecRequest basicEntrustRecRequest) { + if (basicEntrustRecRequest == null) { + return Collections.emptyList(); + } + if (basicEntrustRecRequest.getPage() != null) { + int offset = (basicEntrustRecRequest.getPage() - 1) * basicEntrustRecRequest.getLimit(); + PageHelper.offsetPage(offset, basicEntrustRecRequest.getLimit()); + } + return entrustReceDao.downloadEntrustRec(basicEntrustRecRequest); + } + @Override public List filterJoinEntrustRec(BasicEntrustRecRequest basicEntrustRecRequest) { diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/inout/WarehouseBussinessTypeService.java b/api-admin/src/main/java/com/glxp/sale/admin/service/inout/WarehouseBussinessTypeService.java index 76679f7..42b352e 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/inout/WarehouseBussinessTypeService.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/inout/WarehouseBussinessTypeService.java @@ -1,12 +1,14 @@ package com.glxp.sale.admin.service.inout; import com.glxp.sale.admin.entity.inout.WarehouseBussinessTypeEntity; +import com.glxp.sale.admin.req.basic.FilterInvBusTypeRequest; import com.glxp.sale.admin.res.basic.BussinessTypResponse; import java.util.List; public interface WarehouseBussinessTypeService { + WarehouseBussinessTypeEntity selectById(Integer id); /** * 根据code查询数据列表 @@ -16,6 +18,8 @@ public interface WarehouseBussinessTypeService { */ List getListByCode(String code); + List filterList(FilterInvBusTypeRequest filterInvBusTypeRequest); + /** * 添加仓库信息-单据类型关联数据 * diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/inout/WarehouseUserService.java b/api-admin/src/main/java/com/glxp/sale/admin/service/inout/WarehouseUserService.java index 818f4fd..5265e25 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/inout/WarehouseUserService.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/inout/WarehouseUserService.java @@ -15,6 +15,9 @@ public interface WarehouseUserService { * @param code 仓位码 * @return */ + + WarehouseUserEntity selectById(Integer id); + List getListByCode(String code); List selectCodeByUser(String userId); 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 0806e93..0b92cda 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 @@ -160,8 +160,11 @@ public class OrderServiceImpl implements OrderService { if (orderFilterRequest == null) { return Collections.emptyList(); } - int offset = (orderFilterRequest.getPage() - 1) * orderFilterRequest.getLimit(); - PageHelper.offsetPage(offset, orderFilterRequest.getLimit()); + if(orderFilterRequest.getPage()!=null){ + int offset = (orderFilterRequest.getPage() - 1) * orderFilterRequest.getLimit(); + PageHelper.offsetPage(offset, orderFilterRequest.getLimit()); + } + return orderDao.filterListOr(orderFilterRequest); } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/WarehouseBussinessTypeServiceImpl.java b/api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/WarehouseBussinessTypeServiceImpl.java index a81f3f5..af444a3 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/WarehouseBussinessTypeServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/WarehouseBussinessTypeServiceImpl.java @@ -1,8 +1,10 @@ package com.glxp.sale.admin.service.inout.impl; import cn.hutool.core.collection.CollUtil; +import com.github.pagehelper.PageHelper; import com.glxp.sale.admin.dao.inout.WarehouseBussinessTypeDao; import com.glxp.sale.admin.entity.inout.WarehouseBussinessTypeEntity; +import com.glxp.sale.admin.req.basic.FilterInvBusTypeRequest; import com.glxp.sale.admin.res.basic.BussinessTypResponse; import com.glxp.sale.admin.service.inout.WarehouseBussinessTypeService; import lombok.extern.slf4j.Slf4j; @@ -20,6 +22,11 @@ public class WarehouseBussinessTypeServiceImpl implements WarehouseBussinessType @Resource private WarehouseBussinessTypeDao warehouseBussinessTypeDao; + @Override + public WarehouseBussinessTypeEntity selectById(Integer id) { + return warehouseBussinessTypeDao.selectById(id); + } + @Override public List getListByCode(String code) { List warehouseBussinessTypeEntities = warehouseBussinessTypeDao.selectListByCode(code); @@ -29,6 +36,19 @@ public class WarehouseBussinessTypeServiceImpl implements WarehouseBussinessType return warehouseBussinessTypeEntities; } + @Override + public List filterList(FilterInvBusTypeRequest filterInvBusTypeRequest) { + if (filterInvBusTypeRequest == null) { + return Collections.emptyList(); + } + if (filterInvBusTypeRequest.getPage() != null) { + int offset = (filterInvBusTypeRequest.getPage() - 1) * filterInvBusTypeRequest.getLimit(); + PageHelper.offsetPage(offset, filterInvBusTypeRequest.getLimit()); + } + + return warehouseBussinessTypeDao.filterList(filterInvBusTypeRequest); + } + @Override public void saveWarehouseBussinessType(String code, List bussinessTypResponseList) { if (CollUtil.isNotEmpty(bussinessTypResponseList)) { diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/WarehouseUserServiceImpl.java b/api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/WarehouseUserServiceImpl.java index 8043a4d..ffaf8b7 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/WarehouseUserServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/WarehouseUserServiceImpl.java @@ -1,6 +1,7 @@ package com.glxp.sale.admin.service.inout.impl; import cn.hutool.core.collection.CollUtil; +import com.github.pagehelper.PageHelper; import com.glxp.sale.admin.dao.inout.WarehouseUserDao; import com.glxp.sale.admin.entity.auth.AuthAdmin; import com.glxp.sale.admin.entity.inout.WarehouseUserEntity; @@ -22,6 +23,17 @@ public class WarehouseUserServiceImpl implements WarehouseUserService { @Resource private WarehouseUserDao warehouseUserDao; + @Override + public WarehouseUserEntity selectById(Integer id) { + FilterInvUserRequest filterInvUserRequest = new FilterInvUserRequest(); + filterInvUserRequest.setId(id); + List warehouseUserEntities = warehouseUserDao.filterList(filterInvUserRequest); + if (CollUtil.isNotEmpty(warehouseUserEntities)) { + return warehouseUserEntities.get(0); + } + return null; + } + @Override public List getListByCode(String code) { List warehouseUserEntities = warehouseUserDao.selectListByCode(code); @@ -38,10 +50,15 @@ public class WarehouseUserServiceImpl implements WarehouseUserService { @Override public List filterWarehouseUsers(FilterInvUserRequest filterInvUserRequest) { + if (filterInvUserRequest == null) { + return Collections.emptyList(); + } + if (filterInvUserRequest.getPage() != null) { + int offset = (filterInvUserRequest.getPage() - 1) * filterInvUserRequest.getLimit(); + PageHelper.offsetPage(offset, filterInvUserRequest.getLimit()); + } - List warehouseUserEntities = warehouseUserDao.filterWarehouseUsers(filterInvUserRequest); - - return warehouseUserEntities; + return warehouseUserDao.filterList(filterInvUserRequest); } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/inventory/impl/InvPreInProductServiceImpl.java b/api-admin/src/main/java/com/glxp/sale/admin/service/inventory/impl/InvPreInProductServiceImpl.java index cdcb9bc..2e52b89 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/inventory/impl/InvPreInProductServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/inventory/impl/InvPreInProductServiceImpl.java @@ -1,5 +1,6 @@ package com.glxp.sale.admin.service.inventory.impl; +import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageHelper; import com.glxp.sale.admin.dao.inventory.InvPreInProductDao; import com.glxp.sale.admin.entity.inventory.InvProductEntity; @@ -45,6 +46,9 @@ public class InvPreInProductServiceImpl implements InvPreInProductService { @Override public InvProductEntity selectByUuid(String uuid, String batchNo, String supId, String invStorageCode, String invWarehouseCode) { + if (StrUtil.isEmpty(batchNo)) { + batchNo = "empty"; + } return invPreInProductDao.selectByUuid(uuid, batchNo, supId, invStorageCode, invWarehouseCode); } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/inventory/impl/InvPreProductServiceImpl.java b/api-admin/src/main/java/com/glxp/sale/admin/service/inventory/impl/InvPreProductServiceImpl.java index 4c34324..6be5251 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/inventory/impl/InvPreProductServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/inventory/impl/InvPreProductServiceImpl.java @@ -1,5 +1,6 @@ package com.glxp.sale.admin.service.inventory.impl; +import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageHelper; import com.glxp.sale.admin.dao.inventory.InvPreProductDao; import com.glxp.sale.admin.dao.inventory.InvProductDao; @@ -50,7 +51,9 @@ public class InvPreProductServiceImpl implements InvPreProductService { @Override public InvProductEntity selectByUuid(String uuid, String batchNo, String supId, String invStorageCode, String invWarehouseCode) { - + if (StrUtil.isEmpty(batchNo)) { + batchNo = "empty"; + } return invPreProductDao.selectByUuid(uuid, batchNo, supId, invStorageCode, invWarehouseCode); } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/inventory/impl/InvProductServiceImpl.java b/api-admin/src/main/java/com/glxp/sale/admin/service/inventory/impl/InvProductServiceImpl.java index c96334e..aa04445 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/inventory/impl/InvProductServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/inventory/impl/InvProductServiceImpl.java @@ -1,6 +1,7 @@ package com.glxp.sale.admin.service.inventory.impl; import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageHelper; import com.glxp.sale.admin.dao.inventory.InvProductDao; import com.glxp.sale.admin.entity.inventory.InvProductEntity; @@ -58,6 +59,9 @@ public class InvProductServiceImpl implements InvProductService { // return data.get(0); // } // return null; + if (StrUtil.isEmpty(batchNo)) { + batchNo = "empty"; + } return invProductDao.selectByUuid(uuid, batchNo, supId, invStorageCode, invWarehouseCode); } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/thread/BasicBackUpdateProductService.java b/api-admin/src/main/java/com/glxp/sale/admin/thread/BasicBackUpdateProductService.java index a3f16f9..91245c0 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/thread/BasicBackUpdateProductService.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/thread/BasicBackUpdateProductService.java @@ -308,6 +308,7 @@ public class BasicBackUpdateProductService { || CollUtil.isNotEmpty(spsSyncDataResponse.getUdiRelevanceEntities()) || CollUtil.isNotEmpty(spsSyncDataResponse.getThrProductsEntities()) || CollUtil.isNotEmpty(spsSyncDataResponse.getThrInvWarehouseEntities()) + || CollUtil.isNotEmpty(spsSyncDataResponse.getAuthAdminList()) ) { BasicExportStatusEntity basicExportStatusEntity = new BasicExportStatusEntity(); basicExportStatusEntity.setId(CustomUtil.getId()); diff --git a/api-admin/src/main/resources/mybatis/mapper/auth/AuthAdminDao.xml b/api-admin/src/main/resources/mybatis/mapper/auth/AuthAdminDao.xml index 84198b8..de61496 100644 --- a/api-admin/src/main/resources/mybatis/mapper/auth/AuthAdminDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/auth/AuthAdminDao.xml @@ -24,6 +24,9 @@ AND CustomerId = #{CustomerId} + + = DATE_FORMAT(#{lastUpdateTime}, '%Y-%m-%d %H:%i:%S') ]]> + ORDER BY id DESC @@ -76,7 +79,8 @@ - INSERT INTO auth_user(userName,passWord,lastLoginIp,lastLoginTime,createTime,userFlag,employeeName,CustomerId) + INSERT INTO + auth_user(userName,passWord,lastLoginIp,lastLoginTime,createTime,userFlag,employeeName,CustomerId,lastModifyTime) values (#{userName}, @@ -108,7 +112,7 @@ #{createTime}, #{userFlag,jdbcType=INTEGER}, #{employeeName}, - #{CustomerId}) + #{CustomerId},#{lastModifyTime}) @@ -118,6 +122,7 @@ passWord=#{passWord}, lastLoginIp=#{lastLoginIp}, lastLoginTime=#{lastLoginTime}, + lastModifyTime=#{lastModifyTime}, userFlag=#{userFlag}, employeeName=#{employeeName} diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/BasicExportTimeDao.xml b/api-admin/src/main/resources/mybatis/mapper/basic/BasicExportTimeDao.xml index 82e4884..e68cc16 100644 --- a/api-admin/src/main/resources/mybatis/mapper/basic/BasicExportTimeDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/basic/BasicExportTimeDao.xml @@ -34,8 +34,9 @@ lastUpdateTime=#{lastUpdateTime}, remark=#{remark}, - WHERE key = #{key} + WHERE `key` = #{key} + DELETE FROM basic_export_status_time diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/EntrustReceDao.xml b/api-admin/src/main/resources/mybatis/mapper/basic/EntrustReceDao.xml index eae7699..84c742e 100644 --- a/api-admin/src/main/resources/mybatis/mapper/basic/EntrustReceDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/basic/EntrustReceDao.xml @@ -22,10 +22,42 @@ and userId = #{userId} + + and curInv = #{curInv} + order by updateTime desc + + + + 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 d461d8e..d5df34b 100644 --- a/api-admin/src/main/resources/mybatis/mapper/inout/StockOrderDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/inout/StockOrderDao.xml @@ -29,7 +29,7 @@ insert INTO stock_order(id, billNo, billdate, corpId, corpName, billType, billFlag, thirdSysFk, status, statusInfo, type, sourceType, printStatus, unitIdFk, customerId, thirdOrderFk, orderIdFk, - totalPrice, locStorageCode, supplementNo, createUser, reviewUser) + totalPrice, locStorageCode, supplementNo, createUser, reviewUser, entrustEnd,auditTime,updateTime) values (#{id}, #{billNo}, #{billdate}, @@ -43,7 +43,7 @@ #{type}, #{sourceType}, #{printStatus}, #{unitIdFk}, #{customerId}, #{thirdOrderFk}, #{orderIdFk}, #{totalPrice}, - #{locStorageCode}, #{supplementNo}, #{createUser}, #{reviewUser}) + #{locStorageCode}, #{supplementNo}, #{createUser}, #{reviewUser}, #{entrustEnd},#{auditTime},#{updateTime}) UPDATE stock_order @@ -69,6 +69,10 @@ supplementNo=#{supplementNo}, createUser=#{createUser}, reviewUser=#{reviewUser}, + entrustEnd=#{entrustEnd}, + auditTime=#{auditTime}, + updateTime=#{updateTime}, + WHERE id = #{id} @@ -158,7 +162,8 @@ and locStorageCode = #{locStorageCode} - and ((createUser =#{unionUser} or reviewUser =#{unionUser}) or (reviewUser is null and createUser is null) ) + and ((createUser =#{unionUser} or reviewUser =#{unionUser}) or (reviewUser is null and createUser is + null) ) and createUser = #{createUser} @@ -175,6 +180,7 @@ and inv_warehouse_user.userId =#{userId} + group by stock_order.id ORDER BY id DESC @@ -194,7 +200,7 @@ and locStorageCode = #{locStorageCode} - and basic_entrust_accept.entrustUser = #{entrustUser} + and basic_entrust_accept.entrustUser = #{entrustUser} group by stock_order.id @@ -233,6 +239,7 @@ and reviewUser = #{reviewUser} + limit 1 diff --git a/api-admin/src/main/resources/mybatis/mapper/inout/WarehouseBussinessTypeDao.xml b/api-admin/src/main/resources/mybatis/mapper/inout/WarehouseBussinessTypeDao.xml index 8c0801f..1f8ca59 100644 --- a/api-admin/src/main/resources/mybatis/mapper/inout/WarehouseBussinessTypeDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/inout/WarehouseBussinessTypeDao.xml @@ -233,15 +233,40 @@ + + + -