diff --git a/api-admin/src/main/java/com/glxp/api/admin/constant/Constant.java b/api-admin/src/main/java/com/glxp/api/admin/constant/Constant.java index 7453a174..6db5f611 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/constant/Constant.java +++ b/api-admin/src/main/java/com/glxp/api/admin/constant/Constant.java @@ -41,6 +41,7 @@ public class Constant { public static final String dlThrInvProducts = "THR_DOWNLOAD_INV_PRODUCTS"; public static final String dlThrOrders = "THR_DOWNLOAD_ORDERS"; public static final String dlThrCorps = "THR_DOWNLOAD_CORPS"; + public static final String SPS_SYNC_DOWNLOAD_INFO = "SPS_SYNC_DOWNLOAD_INFO"; public static String SPTM_TO_DI = "sptm_to_di"; diff --git a/api-admin/src/main/java/com/glxp/api/admin/constant/ConstantStatus.java b/api-admin/src/main/java/com/glxp/api/admin/constant/ConstantStatus.java index 9118e325..9c355a5d 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/constant/ConstantStatus.java +++ b/api-admin/src/main/java/com/glxp/api/admin/constant/ConstantStatus.java @@ -47,6 +47,7 @@ public class ConstantStatus { public static String SORDER_CHECK = "3";//待校验 public static String SORDER_CHECKED = "4";//已校验 public static String SORDER_DELIVER = "5";//已送货 + public static String SORDER_ERROR = "6"; //校验异常 public static final int RECEIVE_UN = 0; //未验收 public static final int RECEIVE_ED = 1; //已验收 diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/auth/AuthAdminController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/auth/AuthAdminController.java index c07c9080..dc46a50d 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/auth/AuthAdminController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/auth/AuthAdminController.java @@ -1,5 +1,6 @@ package com.glxp.api.admin.controller.auth; +import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageInfo; import com.glxp.api.admin.annotation.AuthRuleAnnotation; import com.glxp.api.admin.annotation.Log; @@ -7,15 +8,15 @@ import com.glxp.api.admin.constant.BusinessType; import com.glxp.api.admin.entity.auth.AuthAdmin; import com.glxp.api.admin.entity.auth.AuthRole; import com.glxp.api.admin.entity.auth.AuthRoleAdmin; +import com.glxp.api.admin.entity.auth.DeptEntity; import com.glxp.api.admin.entity.inventory.InvSubWarehouseEntity; import com.glxp.api.admin.req.auth.AuthAdminQueryRequest; import com.glxp.api.admin.req.auth.AuthAdminSaveRequest; import com.glxp.api.admin.res.PageSimpleResponse; import com.glxp.api.admin.res.auth.AuthAdminResponse; import com.glxp.api.admin.res.auth.AuthAdminRoleResponse; -import com.glxp.api.admin.service.auth.AuthAdminService; -import com.glxp.api.admin.service.auth.AuthRoleAdminService; -import com.glxp.api.admin.service.auth.AuthRoleService; +import com.glxp.api.admin.service.auth.*; +import com.glxp.api.admin.service.inout.WarehouseUserService; import com.glxp.api.admin.service.inventory.InvSubWarehouseService; import com.glxp.api.admin.util.GennerOrderUtils; import com.glxp.api.admin.util.PasswordUtils; @@ -49,6 +50,15 @@ public class AuthAdminController { GennerOrderUtils gennerOrderUtils; @Resource private InvSubWarehouseService invSubWarehouseService; + @Resource + private DeptService deptService; + @Resource + private CustomerService customerService; + + @Resource + private WarehouseUserService warehouseUserService; + + /** * 获取管理员列表 @@ -146,7 +156,17 @@ public class AuthAdminController { if (authAdmin.getPassWord() != null) { authAdmin.setPassWord(PasswordUtils.authAdminPwd(authAdmin.getPassWord())); } + + //设置部门信息 + if (StrUtil.isNotBlank(authAdminSaveRequest.getDept())) { + authAdmin.setDept(authAdminSaveRequest.getDept()); + DeptEntity deptEntity = deptService.findByDeptCode(authAdminSaveRequest.getDept()); + authAdmin.setDeptName(deptEntity.getName()); + } + authAdmin.setLastModifyTime(new Date()); + authAdmin.setCustomerId(customerService.getUserBean().getCustomerId()); + authAdmin.setId(gennerOrderUtils.getRelId()); boolean b = authAdminService.insertAuthAdmin(authAdmin); authAdmin = authAdminService.findByUserName(authAdmin.getUserName()); @@ -194,6 +214,13 @@ public class AuthAdminController { authAdmin.setPassWord(PasswordUtils.authAdminPwd(authAdmin.getPassWord())); } authAdmin.setLastModifyTime(new Date()); + + if (StrUtil.isNotBlank(authAdminSaveRequest.getDept())) { + authAdmin.setDept(authAdmin.getDept()); + DeptEntity deptEntity = deptService.findByDeptCode(authAdmin.getDept()); + authAdmin.setDeptName(deptEntity.getName()); + } + boolean b = authAdminService.updateAuthAdmin(authAdmin); if (!b) { @@ -249,14 +276,16 @@ public class AuthAdminController { if (authAdminSaveRequest.getId() == null) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, "参数错误！"); } - + // 先得到要删除角色的 getLocSubInvCode + AuthAdmin byId = authAdminService.findById(authAdminSaveRequest.getId()); boolean b = authAdminService.deleteById(authAdminSaveRequest.getId()); if (!b) { return ResultVOUtils.error(ResultEnum.NOT_NETWORK); } + // 先删除之前的角色 authRoleAdminService.deleteByAdminId(authAdminSaveRequest.getId()); - + warehouseUserService.deleteByCodeAndId(authAdminSaveRequest.getId(),byId.getLocSubInvCode()); return ResultVOUtils.success(); } diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/basic/BussinessLocalTypeController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/basic/BussinessLocalTypeController.java index 014d73e9..bc88a4f0 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/basic/BussinessLocalTypeController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/basic/BussinessLocalTypeController.java @@ -204,6 +204,10 @@ public class BussinessLocalTypeController { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } if (bussinessTypeEntity != null) { + BussinessLocalTypeEntity bussinessLocalTypeEntity1 = bussinessLocalTypeService.findBTByName(bussinessTypeEntity.getName(),String.valueOf(bussinessTypeEntity.getId())); + if (bussinessLocalTypeEntity1 != null) { + return ResultVOUtils.error(999, "业务单据类型名称已存在！"); + } bussinessTypeEntity.setUpdateTime(new Date()); bussinessLocalTypeService.updateBusLocalType(bussinessTypeEntity); } else { @@ -223,7 +227,7 @@ public class BussinessLocalTypeController { if (bussinessTypeEntity != null) { bussinessTypeEntity.setAction("ST" + CustomUtil.getId()); BussinessLocalTypeEntity bussinessLocalTypeEntity = bussinessLocalTypeService.findByAction(bussinessTypeEntity.getAction()); - BussinessLocalTypeEntity bussinessLocalTypeEntity1 = bussinessLocalTypeService.findBTByName(bussinessTypeEntity.getName()); + BussinessLocalTypeEntity bussinessLocalTypeEntity1 = bussinessLocalTypeService.findBTByName(bussinessTypeEntity.getName(),null); if (bussinessLocalTypeEntity1 != null) { return ResultVOUtils.error(999, "业务单据类型名称已存在！"); } diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/basic/SpsSyncDownloadController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/basic/SpsSyncDownloadController.java index 7865f58e..1126a9d6 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/basic/SpsSyncDownloadController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/basic/SpsSyncDownloadController.java @@ -7,8 +7,9 @@ import com.glxp.api.admin.req.basic.BasicDownloadRequest; import com.glxp.api.admin.req.info.DeleteRequest; import com.glxp.api.admin.res.PageSimpleResponse; import com.glxp.api.admin.service.basic.BasicDownloadService; -import com.glxp.api.admin.service.inout.OrderService; +import com.glxp.api.admin.thread.DlBasicService; import com.glxp.api.admin.util.RedisUtil; +import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; import lombok.extern.slf4j.Slf4j; @@ -32,7 +33,7 @@ public class SpsSyncDownloadController { @Resource SpGetHttpClient spGetHttp; @Resource - OrderService orderService; + DlBasicService dlBasicService; @GetMapping("/spssync/download/basic/udiinfo/getStatus") @@ -82,5 +83,19 @@ public class SpsSyncDownloadController { } + /** + * 立即下载数据 + * + * @param type + * @return + */ + @GetMapping("/spsync/download/now") + public BaseResponse downloadNow(Integer type) { + if (null == type) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); + } + return dlBasicService.downloadNow(type); + } + } \ No newline at end of file diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/basic/SpsSyncExportStatusController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/basic/SpsSyncExportStatusController.java index c49b83b0..61baa93d 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/basic/SpsSyncExportStatusController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/basic/SpsSyncExportStatusController.java @@ -171,7 +171,17 @@ public class SpsSyncExportStatusController { && CollUtil.isEmpty(syncDataResponse.getThrOrderDetailEntities()) && CollUtil.isEmpty(syncDataResponse.getCompanyProductRelevanceEntities()) && CollUtil.isEmpty(syncDataResponse.getUdiRelevanceEntities()) - && CollUtil.isEmpty(syncDataResponse.getAuthAdminList())) { + && CollUtil.isEmpty(syncDataResponse.getAuthAdminList()) + && CollUtil.isEmpty(syncDataResponse.getDeptEntityList()) + && CollUtil.isEmpty(syncDataResponse.getWarehouseBussinessTypeEntities()) + && CollUtil.isEmpty(syncDataResponse.getWarehouseUserEntities()) + && CollUtil.isEmpty(syncDataResponse.getInvSubWarehouseEntities()) + && CollUtil.isEmpty(syncDataResponse.getSupCompanyEntities()) + && CollUtil.isEmpty(syncDataResponse.getSupManufacturerEntities()) + && CollUtil.isEmpty(syncDataResponse.getSupProductEntities()) + && CollUtil.isEmpty(syncDataResponse.getSupCertEntities()) + && CollUtil.isEmpty(syncDataResponse.getSupCertSetEntities()) + ) { //数据不记录日志 return ResultVOUtils.error(500, "当前暂无更新数据需要同步"); } diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/basic/UdiRelevanceController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/basic/UdiRelevanceController.java index 39b89ba6..7aaf93b9 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/basic/UdiRelevanceController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/basic/UdiRelevanceController.java @@ -319,6 +319,9 @@ public class UdiRelevanceController { udiInfoEntity.setCpms(udiRelevanceResponse.getCpms()); udiInfoEntity.setPrice(udiRelevanceResponse.getPrice()); udiInfoEntity.setSpmc(udiRelevanceResponse.getSpmc()); + udiInfoEntity.setAllowNoBatch(udiRelevanceResponse.isAllowNoBatch()); + udiInfoEntity.setAllowNoExpire(udiRelevanceResponse.isAllowNoExpire()); + udiInfoEntity.setAllowNoProduct(udiRelevanceResponse.isAllowNoProduct()); udiInfoEntity.setBasicPrductRemak1(udiRelevanceResponse.getBasicPrductRemak1()); udiInfoEntity.setBasicPrductRemak2(udiRelevanceResponse.getBasicPrductRemak2()); udiInfoEntity.setBasicPrductRemak3(udiRelevanceResponse.getBasicPrductRemak3()); diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/business/StockOrderController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/business/StockOrderController.java index a34827e0..084f5a9a 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/business/StockOrderController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/business/StockOrderController.java @@ -32,7 +32,9 @@ import com.glxp.api.admin.req.business.StockOrderIdsRequest; import com.glxp.api.admin.req.business.StockOrderPostRequest; import com.glxp.api.admin.req.inout.AddStockOrderChangeRequest; import com.glxp.api.admin.req.inout.DeleteRequest; -import com.glxp.api.admin.req.inventory.*; +import com.glxp.api.admin.req.inventory.FilterInvUserRequest; +import com.glxp.api.admin.req.inventory.InnerOrderDetailRequest; +import com.glxp.api.admin.req.inventory.PostStockPrintRequest; import com.glxp.api.admin.res.PageSimpleResponse; import com.glxp.api.admin.res.basic.UdiRelevanceResponse; import com.glxp.api.admin.res.business.StockOrderExportResponse; @@ -48,7 +50,6 @@ import com.glxp.api.admin.service.business.StockOrderDetailService; import com.glxp.api.admin.service.business.StockOrderDetailTempService; import com.glxp.api.admin.service.business.StockOrderService; import com.glxp.api.admin.service.business.StockQRCodeTextService; -import com.glxp.api.admin.service.info.CompanyService; import com.glxp.api.admin.service.info.SystemParamConfigService; import com.glxp.api.admin.service.inout.CodesService; import com.glxp.api.admin.service.inout.CodesTempService; @@ -328,9 +329,12 @@ public class StockOrderController { //判断订单是否可以补单 List resultList = orderService.checkSupplementOrder(stockOrderEntityList); + //查询补单设置 + orderService.checkSubmitOrder(resultList); //查询仓库名称 orderService.queryInvName(resultList); - resultList = orderService.checkSubmitOrder(resultList); + //查询单据备注 + orderService.queryPrintRemark(resultList); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(resultList); diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/business/StockOrderDetailController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/business/StockOrderDetailController.java index 5d04acb6..4cb55b8a 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/business/StockOrderDetailController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/business/StockOrderDetailController.java @@ -14,6 +14,7 @@ import com.glxp.api.admin.entity.business.StockOrderDetailEntity; import com.glxp.api.admin.entity.business.StockOrderEntity; import com.glxp.api.admin.entity.info.SystemParamConfigEntity; import com.glxp.api.admin.entity.inout.WarehouseEntity; +import com.glxp.api.admin.entity.inventory.InvProductEntity; import com.glxp.api.admin.exception.JsonException; import com.glxp.api.admin.req.basic.CompanyProductRelevanceRequest; import com.glxp.api.admin.req.basic.FilterUdiInfoRequest; @@ -38,6 +39,7 @@ import com.glxp.api.admin.service.business.StockOrderService; import com.glxp.api.admin.service.info.CompanyProductRelevanceService; import com.glxp.api.admin.service.info.SystemParamConfigService; import com.glxp.api.admin.service.inout.CodesService; +import com.glxp.api.admin.service.inventory.InvProductService; import com.glxp.api.admin.service.purchase.SupProductService; import com.glxp.api.admin.util.FilterUdiUtils; import com.glxp.api.common.enums.ResultEnum; @@ -84,6 +86,8 @@ public class StockOrderDetailController { CodesService codesService; @Resource SupProductService supProductService; + @Resource + InvProductService invProductService; @AuthRuleAnnotation("") @@ -118,7 +122,8 @@ public class StockOrderDetailController { if (CollUtil.isNotEmpty(codeList)) { for (WarehouseEntity codeDetaiEntity : codeList) { if (StrUtil.trimToEmpty(codeDetaiEntity.getRelId()).equals(StrUtil.trimToEmpty(stockOrderDetailEntity.getRelId())) - && StrUtil.trimToEmpty(codeDetaiEntity.getBatchNo()).equals(StrUtil.trimToEmpty(stockOrderDetailEntity.getBatchNo())) + && + (StrUtil.isEmpty(codeDetaiEntity.getBatchNo()) || StrUtil.trimToEmpty(codeDetaiEntity.getBatchNo()).equals(StrUtil.trimToEmpty(stockOrderDetailEntity.getBatchNo()))) ) { StockOrderDetailEntity item = new StockOrderDetailEntity(); BeanUtils.copyProperties(stockOrderDetailEntity, item); @@ -589,6 +594,29 @@ public class StockOrderDetailController { if (bindingResult.hasErrors()) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } + //判断 + InvProductEntity invProductEntity = invProductService.selectExit(stockOrderDetailFilterRequest.getProductId()); + if (invProductEntity != null) { + UdiInfoEntity udiInfoEntity = udiInfoService.findByNameCode(invProductEntity.getNameCode()); + if (udiInfoEntity != null) { + if (udiInfoEntity.getScbssfbhph().equals("是")) { + if (stockOrderDetailFilterRequest.getBatchNo() == null) { + return ResultVOUtils.error(999, "批次号不能为空！"); + } + } + if (udiInfoEntity.getScbssfbhscrq().equals("是")) { + if (stockOrderDetailFilterRequest.getProductDate() == null) { + return ResultVOUtils.error(999, "生产日期不能为空！"); + } + } + if (udiInfoEntity.getScbssfbhsxrq().equals("是")) { + if (stockOrderDetailFilterRequest.getExpireDate() == null) { + return ResultVOUtils.error(999, "失效日期不能为空！"); + } + } + } + } + if (StringUtils.isNotBlank(stockOrderDetailFilterRequest.getId())) { if (StringUtils.isBlank(stockOrderDetailFilterRequest.getCount()) || StringUtils.isBlank(stockOrderDetailFilterRequest.getReCount())) { diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/business/StockQRCodeTextController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/business/StockQRCodeTextController.java index 2ab2c02b..61cdb9f5 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/business/StockQRCodeTextController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/business/StockQRCodeTextController.java @@ -45,6 +45,7 @@ import com.glxp.api.admin.service.inventory.StockPrintTempService; import com.glxp.api.admin.thread.IoTransInoutService; import com.glxp.api.admin.thread.JaspaperService; import com.glxp.api.admin.util.CustomUtil; +import com.glxp.api.admin.util.DateUtil; import com.glxp.api.admin.util.FileUtils; import com.glxp.api.admin.util.JasperUtils; import com.glxp.api.common.enums.ResultEnum; @@ -413,7 +414,14 @@ public class StockQRCodeTextController { stockOrderPrintEntity.setRemark1(systemPDFModuleEntity.getRemark1()); stockOrderPrintEntity.setRemark2(systemPDFModuleEntity.getRemark2()); stockOrderPrintEntity.setRemark3(systemPDFModuleEntity.getRemark3()); - stockOrderPrintEntity.setBillRemark(orderEntity.getPrintRemark()); + if (StrUtil.isNotEmpty(stockOrderPrintEntity.getProductDate())) { + stockOrderPrintEntity.setProductDate(DateUtil.formatExpireTime("20" + stockOrderPrintEntity.getProductDate())); + } + if (StrUtil.isNotEmpty(stockOrderPrintEntity.getExpireDate())) { + stockOrderPrintEntity.setExpireDate(DateUtil.formatExpireTime("20" + stockOrderPrintEntity.getExpireDate())); + } + + if (orderEntity != null) stockOrderPrintEntity.setBillRemark(orderEntity.getPrintRemark()); if (systemParamConfigEntity.getParamValue().equals("1")) { @@ -464,6 +472,13 @@ public class StockQRCodeTextController { StockOrderDetailEntity stockOrderDetailEntity = getDetailByRelBatch(stockOrderDetailEntities, stockOrderPrintEntity.getProductId(), stockOrderPrintEntity.getBatchNo()); if (stockOrderDetailEntity != null) { stockOrderPrintEntity.setPrice(stockOrderDetailEntity.getPrice()); + stockOrderPrintEntity.setZczbhhzbapzbh(stockOrderDetailEntity.getZczbhhzbapzbh()); + if (StrUtil.isNotEmpty(stockOrderDetailEntity.getProductDate())) { + stockOrderPrintEntity.setProductDate(DateUtil.formatExpireTime("20" + stockOrderDetailEntity.getProductDate())); + } + if (StrUtil.isNotEmpty(stockOrderDetailEntity.getExpireDate())) { + stockOrderPrintEntity.setExpireDate(DateUtil.formatExpireTime("20" + stockOrderDetailEntity.getExpireDate())); + } } stockOrderPrintEntity.setCount(stockOrderPrintEntity.getCount() * getActCount(stockOrderPrintEntity)); diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/info/CompanyProductRelevanceController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/info/CompanyProductRelevanceController.java index e521c436..427a8a09 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/info/CompanyProductRelevanceController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/info/CompanyProductRelevanceController.java @@ -6,7 +6,6 @@ import com.glxp.api.admin.annotation.AuthRuleAnnotation; import com.glxp.api.admin.entity.auth.AuthAdmin; import com.glxp.api.admin.entity.basic.BasicUnitMaintainEntity; import com.glxp.api.admin.entity.basic.CompanyProductRelevanceEntity; -import com.glxp.api.admin.entity.info.CompanyEntity; import com.glxp.api.admin.exception.JsonException; import com.glxp.api.admin.req.basic.CompanyProductRelevanceRequest; import com.glxp.api.admin.req.basic.FilterCompanyProductRelevanceRequest; @@ -105,7 +104,7 @@ public class CompanyProductRelevanceController { for (CompanyProductRelevanceEntity companyProductRelevanceEntity : companyProductRelevanceEntities) { erpIds.add(companyProductRelevanceEntity.getUnitFk()); } - List basicUnitMaintainEntities = basicUnitMaintainService.batchSelectByErpIds(erpIds); + List basicUnitMaintainEntities = basicUnitMaintainService.batchSelectByErpIdsAndName(erpIds, filterCompanyProductRelevanceRequest.getKey()); return ResultVOUtils.success(basicUnitMaintainEntities); } return ResultVOUtils.error(500, "该产品未关联供应商！"); diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/info/PlatformController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/info/PlatformController.java deleted file mode 100644 index 60e36d66..00000000 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/info/PlatformController.java +++ /dev/null @@ -1,250 +0,0 @@ -package com.glxp.api.admin.controller.info; - -import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.util.StrUtil; -import com.alibaba.fastjson.JSON; -import com.github.pagehelper.PageInfo; -import com.glxp.api.admin.annotation.AuthRuleAnnotation; -import com.glxp.api.admin.entity.info.PlatformEntity; -import com.glxp.api.admin.entity.inout.UnitMaintainPlatformEntity; -import com.glxp.api.admin.req.info.PlatformUserInfoRequest; -import com.glxp.api.admin.req.inout.DeleteRequest; -import com.glxp.api.admin.req.inout.PlatformLinkRequest; -import com.glxp.api.admin.res.PageSimpleResponse; -import com.glxp.api.admin.res.info.PlatformLinkResponse; -import com.glxp.api.admin.service.auth.CustomerService; -import com.glxp.api.admin.service.info.PlatformService; -import com.glxp.api.common.enums.ResultEnum; -import com.glxp.api.common.res.BaseResponse; -import com.glxp.api.common.util.ResultVOUtils; -import lombok.extern.slf4j.Slf4j; -import org.springframework.http.HttpEntity; -import org.springframework.http.HttpHeaders; -import org.springframework.http.MediaType; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; -import org.springframework.web.client.RestTemplate; - -import javax.annotation.Resource; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -@RestController -@Slf4j -public class PlatformController { - - @Resource - private PlatformService platformService; - @Resource - private CustomerService customerService; - - @AuthRuleAnnotation("") - @PostMapping("/udiwms/platform/remove") - public BaseResponse remove(@RequestBody PlatformEntity platformEntity) { - if (platformService.remove(platformEntity.getId()) > 0) { - ResultVOUtils.success("删除成功"); - } - return ResultVOUtils.error(500, "删除失败"); - } - - - @AuthRuleAnnotation("") - @PostMapping("/udiwms/platform/update") - public BaseResponse update(@RequestBody PlatformEntity platformEntity) { - if (StrUtil.isBlank(platformEntity.getName()) || StrUtil.isBlank(platformEntity.getHost())) { - return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, "参数不能为空"); - } - return platformService.update(platformEntity); - } - - @AuthRuleAnnotation("") - @GetMapping("/udiwms/platform/list") - public BaseResponse list(@RequestParam Map params) { - List list = platformService.list(params); - PageInfo pageInfo = new PageInfo<>(list); - PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); - pageSimpleResponse.setTotal(pageInfo.getTotal()); - pageSimpleResponse.setList(pageInfo.getList()); - return ResultVOUtils.success(pageSimpleResponse); - } - - /** - * 测试账号连通性 - * - * @return - */ - @AuthRuleAnnotation("") - @PostMapping("/udiwms/platform/testUserInfo") - public BaseResponse testUserInfo(@RequestBody PlatformUserInfoRequest platformUserInfoRequest, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); - } - - PlatformEntity platformEntity = platformService.getPlatformById(platformUserInfoRequest.getPlatformId()); - if (null == platformEntity || StrUtil.isBlank(platformEntity.getHost())) { - return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); - } - - String url = platformEntity.getHost() + "/verify"; - Map map = new HashMap<>(); - map.put("username", platformUserInfoRequest.getUsername()); - map.put("password", platformUserInfoRequest.getPassword()); - - HttpHeaders headers = new HttpHeaders(); - headers.setContentType(MediaType.APPLICATION_JSON_UTF8); - - HttpEntity request = new HttpEntity<>(JSON.toJSONString(map), headers); - RestTemplate restTemplate = new RestTemplate(); - log.error(url); - - String result = restTemplate.postForObject(url, request, String.class, map); - log.error(result); - Map object = JSON.parseObject(result, Map.class); - if (!String.valueOf(object.get("code")).equals("20000")) { - return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, String.valueOf(object.get("message"))); - } - return ResultVOUtils.success(); - } - - @AuthRuleAnnotation("") - @PostMapping("/udiwms/platform/link") - public BaseResponse update(@RequestBody PlatformLinkRequest platformLinkRequest) { - //判断此数据是否重复 - String verifyResult = platformService.verifyUnitMaintainPlatform(platformLinkRequest); - if (!verifyResult.equals("success")) { - return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, verifyResult); - } - - platformLinkRequest.setCustomerId(String.valueOf(customerService.getUserBean().getCustomerId())); - - PlatformEntity platformEntity = platformService.get(platformLinkRequest.getPlatformId()); - if (platformEntity != null) { - String url = platformEntity.getHost() + "/verify"; - - Map map = new HashMap(); - map.put("username", platformLinkRequest.getPlatformUsername()); - map.put("password", platformLinkRequest.getPlatformPassword()); - - HttpHeaders headers = new HttpHeaders(); - headers.setContentType(MediaType.APPLICATION_JSON_UTF8); - - HttpEntity request = new HttpEntity(JSON.toJSONString(map), headers); - RestTemplate restTemplate = new RestTemplate(); - log.error(url); - - String result = restTemplate.postForObject(url, request, String.class, map); - log.error(result); - Map object = JSON.parseObject(result, Map.class); - - if (object != null && object.get("data") != null) { - Map data = JSON.parseObject(JSON.toJSONString(object.get("data")), Map.class); - log.error(JSON.toJSONString(object.get("data"))); - if (data.get("appid") != null) { - platformLinkRequest.setAppid(data.get("appid").toString()); - if (data.get("apiKey") != null) { - platformLinkRequest.setApiKey(data.get("apiKey").toString()); - } - if (data.get("secretKey") != null) { - platformLinkRequest.setSecretKey(data.get("secretKey").toString()); - } - } else { - return ResultVOUtils.error(500, "关联验证失败,请联系管理人员"); - } - } else if (object != null && object.get("message") != null) { - return ResultVOUtils.error(500, object.get("message").toString()); - } else { - return ResultVOUtils.error(500, "关联失败,请联系管理人员"); - } - } else { - return ResultVOUtils.error(500, "未查询到平台信息"); - } - UnitMaintainPlatformEntity unitMaintainPlatform = new UnitMaintainPlatformEntity(); - BeanUtil.copyProperties(platformLinkRequest, unitMaintainPlatform); - platformService.saveUnitPlatform(unitMaintainPlatform); - return ResultVOUtils.success("关联成功"); - } - - /** - * 获取往来单位与自助平台关联数据 - */ - @AuthRuleAnnotation("") - @GetMapping("/udiwms/platform/getLinkPlatformList") - public BaseResponse getLinkPlatformList(PlatformLinkRequest platformLinkRequest, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); - } - platformLinkRequest.setCustomerId(String.valueOf(customerService.getUserBean().getCustomerId())); - List list = platformService.getLinkPlatformList(platformLinkRequest); - PageInfo pageInfo = new PageInfo<>(list); - PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); - pageSimpleResponse.setTotal(pageInfo.getTotal()); - pageSimpleResponse.setList(pageInfo.getList()); - return ResultVOUtils.success(pageSimpleResponse); - } - - /** - * 解绑往来单位和自助平台的关联 - * - * @param corpId - * @return - */ - @AuthRuleAnnotation("") - @PostMapping("/udiwms/platform/unbind") - public BaseResponse unbindPlatform(DeleteRequest deleteRequest) { - if (StrUtil.isBlank(deleteRequest.getId())) { - return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); - } - platformService.unbindPlatform(deleteRequest.getId()); - return ResultVOUtils.success(); - } - - /** - * 获取对应平台单据类型 - * - * @return - */ - @AuthRuleAnnotation("") - @GetMapping("/udiwms/platform/getTargetActions") - public BaseResponse getTargetActions(String platformId, String invSubCode) { - if (StrUtil.isBlank(platformId)) { - return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); - } - return platformService.getTargetActions(platformId, invSubCode); - } - - - @AuthRuleAnnotation("") - @GetMapping("/udiwms/platform/getTargetInv") - public BaseResponse getTargetInv(String platformId) { - if (StrUtil.isBlank(platformId)) { - return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); - } - return platformService.getTargetInv(platformId); - } - - @AuthRuleAnnotation("") - @GetMapping("/udiwms/platform/getTargetSubInv") - public BaseResponse getTargetSubInv(String platformId, String invCode) { - if (StrUtil.isBlank(platformId)) { - return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); - } - return platformService.getTargetSubInv(platformId, invCode); - } - - /** - * 测试自助平台连通性 - * - * @param host - * @return - */ - @AuthRuleAnnotation("") - @GetMapping("udiwms/platform/testPlatformConnection") - public BaseResponse testPlatformConnection(String host) { - if (StrUtil.isBlank(host)) { - return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); - } - return platformService.testPlatformConnection(host); - } - -} diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/inout/OrderController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/inout/OrderController.java index 8399a5ac..16a21100 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/inout/OrderController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/inout/OrderController.java @@ -3,9 +3,7 @@ package com.glxp.api.admin.controller.inout; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; -import cn.hutool.json.JSONUtil; import com.alibaba.fastjson.JSONObject; -import com.alibaba.fastjson.TypeReference; import com.github.pagehelper.PageInfo; import com.glxp.api.admin.annotation.AuthRuleAnnotation; import com.glxp.api.admin.constant.Constant; @@ -19,11 +17,12 @@ import com.glxp.api.admin.entity.auth.AuthAdmin; import com.glxp.api.admin.entity.basic.BussinessTypeEntity; import com.glxp.api.admin.entity.basic.EntrustReceEntity; import com.glxp.api.admin.entity.basic.UdiEntity; -import com.glxp.api.admin.entity.business.StockOrderDetailEntity; import com.glxp.api.admin.entity.business.StockOrderEntity; -import com.glxp.api.admin.entity.info.PlatformEntity; import com.glxp.api.admin.entity.info.SystemParamConfigEntity; -import com.glxp.api.admin.entity.inout.*; +import com.glxp.api.admin.entity.inout.ErpOrderEntity; +import com.glxp.api.admin.entity.inout.FilterErpOrderRequest; +import com.glxp.api.admin.entity.inout.OrderEntity; +import com.glxp.api.admin.entity.inout.WarehouseEntity; import com.glxp.api.admin.entity.inventory.InvBusUserEntity; import com.glxp.api.admin.entity.inventory.InvWarehouseEntity; import com.glxp.api.admin.httpclient.SpsDirectClient; @@ -31,7 +30,6 @@ import com.glxp.api.admin.req.basic.BasicEntrustRecRequest; import com.glxp.api.admin.req.business.StockOrderFilterRequest; import com.glxp.api.admin.req.inout.*; import com.glxp.api.admin.req.inventory.FilterInvBusUserRequest; -import com.glxp.api.admin.req.inventory.FilterInvUserRequest; import com.glxp.api.admin.req.inventory.FilterInvWarehouseRequest; import com.glxp.api.admin.req.receipt.BussinessTypeFilterRequest; import com.glxp.api.admin.res.PageSimpleResponse; @@ -42,7 +40,6 @@ import com.glxp.api.admin.service.basic.EntrustReceService; import com.glxp.api.admin.service.basic.UdiRelevanceService; import com.glxp.api.admin.service.business.StockOrderDetailService; import com.glxp.api.admin.service.business.StockOrderService; -import com.glxp.api.admin.service.info.PlatformService; import com.glxp.api.admin.service.info.SystemParamConfigService; import com.glxp.api.admin.service.inout.*; import com.glxp.api.admin.service.inventory.InvBusUserService; @@ -113,8 +110,6 @@ public class OrderController { @Resource InvBusUserService invBusUserService; - @Resource - private PlatformService platformService; @Resource private StockOrderDetailService stockOrderDetailService; @Resource @@ -214,6 +209,25 @@ public class OrderController { return ResultVOUtils.success("更新成功"); } + /** + * 更新单据备注 + * + * @param orderEntity + * @param bindingResult + * @return + */ + @PostMapping("/udiwms/inout/order/updateOrderPrintRemark") + public BaseResponse updateOrderRemark(@RequestBody OrderEntity orderEntity, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + boolean b = orderService.updatePrintRemark(orderEntity.getId(), orderEntity.getPrintRemark()); + if (!b) { + return ResultVOUtils.error(500, "单据备注更新失败！"); + } + return ResultVOUtils.success("更新成功"); + } + @AuthRuleAnnotation("") @PostMapping("/udiwms/inout/order/updateUnit") @@ -244,17 +258,6 @@ public class OrderController { Integer userId = customerService.getUserId(); orderFilterRequest.setFromCorpId(null); orderFilterRequest.setUserId(userId); - if (StrUtil.isNotEmpty(orderFilterRequest.getLocStorageCode())) { - InvWarehouseEntity invWarehouseEntity = invWarehouseService.selectByCode(orderFilterRequest.getLocStorageCode()); - FilterInvUserRequest filterInvUserRequest = new FilterInvUserRequest(); - filterInvUserRequest.setCode(invWarehouseEntity.getCode()); - filterInvUserRequest.setUserid(userId.longValue()); - filterInvUserRequest.setIsDirector(true); - List warehouseUserEntities = warehouseUserService.filterWarehouseUsers(filterInvUserRequest); - } else { - return ResultVOUtils.error(500, "请先选择当前仓库"); - } - if (bindingResult.hasErrors()) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } @@ -448,8 +451,6 @@ public class OrderController { } else { supplementOrder.setStatus(ConstantStatus.ORDER_STATUS_ADDITIONAL); //设置状态为补录单据 } - - supplementOrder.setExportStatus(0); //设置导出状态为未导出 supplementOrder.setContrastStatus(0);//设置erp校验状态为未校验 supplementOrder.setReceiveStatus(0); //设置验收状态为未验收 @@ -485,13 +486,10 @@ public class OrderController { } ); //更新数据 - try { - orderDao.insertOrder(supplementOrder); - orderEntity.setUllageSupNo(supplementOrder.getId()); - orderDao.updateOrder(orderEntity); - codesTempDao.insertCodesTemp(supplementCodes); - } catch (Exception e) { - } + orderDao.insertOrder(supplementOrder); + orderEntity.setUllageSupNo(supplementOrder.getId()); + orderDao.updateOrder(orderEntity); + codesTempDao.insertCodesTemp(supplementCodes); } @@ -867,84 +865,4 @@ public class OrderController { return ResultVOUtils.success(orderEntity); } - @AuthRuleAnnotation("") - @PostMapping("/warehouse/inout/order/uploadSpms") - public BaseResponse uploadSpms(@RequestBody OrderUploadRequest orderUploadRequest, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); - } - if (orderUploadRequest.getOrderIds() != null && orderUploadRequest.getOrderIds().size() > 0) { - PostUdimsOrderRequest postUdimsOrderRequest = new PostUdimsOrderRequest(); - List orderBeans = new ArrayList<>(); - String orderId = orderUploadRequest.getOrderIds().get(0); - OrderEntity orderEntity = orderService.findById(orderId); - UnitMaintainPlatformEntity unitMaintainPlatform = platformService.findLinkData(customerService.getUserBean().getCustomerId(), orderEntity.getAction(), orderEntity.getFromCorpId()); - if (unitMaintainPlatform == null || unitMaintainPlatform.getAppid() == null) { - return ResultVOUtils.error(500, "该往来单位未绑定UDI自助平台！"); - } - if (!orderEntity.getAction().equals(unitMaintainPlatform.getSourceAction())) { - return ResultVOUtils.error(500, "该单据类型不支持提交！"); - } - PostUdimsOrderRequest.OrderBean orderBean = new PostUdimsOrderRequest.OrderBean(); - BeanUtils.copyProperties(orderEntity, orderBean); - orderBean.setAction(unitMaintainPlatform.getTargetAction()); - orderBean.setInvStorageCode(unitMaintainPlatform.getInvCode()); - orderBean.setInvWarehouseCode(unitMaintainPlatform.getInvSubCode()); - WarehouseQueryRequest warehouseQueryRequest = new WarehouseQueryRequest(); - warehouseQueryRequest.setOrderId(orderEntity.getId()); - List warehouseEntities = codesService.findByOrderId(warehouseQueryRequest); - List codeBeans = new ArrayList<>(); - warehouseEntities.forEach(data -> { - PostUdimsOrderRequest.OrderBean.CodeBean codeBean = new PostUdimsOrderRequest.OrderBean.CodeBean(); - BeanUtils.copyProperties(data, codeBean); - codeBean.setInvStorageCode(unitMaintainPlatform.getInvCode()); - codeBean.setInvWarehouseCode(unitMaintainPlatform.getInvSubCode()); - codeBeans.add(codeBean); - }); - //查询单据详情 - FilterOrderDetailRequest filterOrderDetailRequest = new FilterOrderDetailRequest(); - filterOrderDetailRequest.setOrderId(orderBean.getOrderId()); - //查询业务单据详情 - List orderDetailList = stockOrderDetailService.findByScanOrderId(orderBean.getOrderId()); - if (CollUtil.isNotEmpty(orderDetailList)) { - List orderDetails = new ArrayList<>(); - for (StockOrderDetailEntity stockOrderDetailEntity : orderDetailList) { - PostUdimsOrderDetailRequest orderDetail = new PostUdimsOrderDetailRequest(); - orderDetail.setUuidFk(udiRelevanceService.findUuidById(stockOrderDetailEntity.getRelId())); - orderDetail.setFirstSalesInvNo(stockOrderDetailEntity.getFirstSalesInvNo()); - orderDetail.setSecSalesInvNo(stockOrderDetailEntity.getSecSalesInvNo()); - orderDetail.setPrice(stockOrderDetailEntity.getPrice()); - orderDetail.setInvoiceDate(stockOrderDetailEntity.getInvoiceDate()); - orderDetail.setSecSalesListNo(stockOrderDetailEntity.getSecSalesListNo()); - orderDetail.setBatchNo(stockOrderDetailEntity.getBatchNo()); - orderDetails.add(orderDetail); - } - orderBean.setOrderDetails(orderDetails); - } - orderBean.setCodes(codeBeans); - orderBeans.add(orderBean); - postUdimsOrderRequest.setOrderBeans(orderBeans); - PlatformEntity platformEntity = platformService.get(unitMaintainPlatform.getPlatformId()); - postUdimsOrderRequest.setOrderBeans(orderBeans); - - - log.info("提交单据到自助平台，单据数据：{}", JSONUtil.toJsonStr(postUdimsOrderRequest)); - String response = - HttpClient.uCloudPostSmp(platformEntity.getHost() + "/warehouse/inout/postOrdersUdims", - postUdimsOrderRequest, unitMaintainPlatform.getApiKey(), unitMaintainPlatform.getSecretKey()); - log.info("自助平台响应结果：{}", response); - BaseResponse baseResponse = - JSONObject.parseObject(response, new TypeReference() { - }); - if (baseResponse.getCode() == 20000) { - orderEntity.setUploadStatus("1"); - orderService.updateOrder(orderEntity); - return baseResponse; - } else { - return ResultVOUtils.error(500, baseResponse.getMessage()); - } - } - return ResultVOUtils.success("未选择订单！"); - } - } diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/inout/OrderDetailController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/inout/OrderDetailController.java index 8561ba64..5af9fd2d 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/inout/OrderDetailController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/inout/OrderDetailController.java @@ -739,9 +739,10 @@ public class OrderDetailController { } - ErpOrderEntity exitErp = new ContrastErpUtil().vailErpExit(orderDetailService, erpOrderEntities, importErpOrderRequest.getOrderId()); +// ErpOrderEntity exitErp = new ContrastErpUtil().vailErpExit(orderDetailService, erpOrderEntities, importErpOrderRequest.getOrderId()); + OrderEntity exitErp = vialErpExit(docids); if (exitErp != null) { - String errMsg = "所选业务单据" + exitErp.getErpOrderId() + "已被其他出入库单" + exitErp.getOrderIdFk() + "绑定"; + String errMsg = "所选业务单据" + docidStr + "已被其他出入库单" + exitErp.getId() + "绑定"; orderEntity.setRemark(errMsg); orderEntity.setUpdateTime(new Date()); orderService.updateOrder(orderEntity); @@ -761,6 +762,24 @@ public class OrderDetailController { return ResultVOUtils.success("导入成功"); } + public OrderEntity vialErpExit(List docids) { + + + if (CollUtil.isNotEmpty(docids)) { + for (ErpOrderResponse erpOrderResponse : docids) { + + OrderFilterRequest orderFilterRequest = new OrderFilterRequest(); + orderFilterRequest.setErpFk(erpOrderResponse.getBillNo()); + List orderEntities = orderService.findAllOrders(orderFilterRequest); + if (CollUtil.isNotEmpty(orderEntities)) { + return orderEntities.get(0); + } + } + } + return null; + } + + @AuthRuleAnnotation("") @PostMapping("/warehouse/repeatPrintCheck")//TODO 重新校验 public BaseResponse repeatPrintCheck(@RequestBody FilterErpOrderRequest filterErpOrderRequest, BindingResult bindingResult) { diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/inout/WareHouseController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/inout/WareHouseController.java index 6d3ad9f7..7ed02b14 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/inout/WareHouseController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/inout/WareHouseController.java @@ -301,6 +301,8 @@ public class WareHouseController { orderEntity1.setPreCheck(addOrderRequest.isPreCheck()); orderEntity1.setUpdateTime(new Date()); orderEntity1.setCodeFillCheck(addOrderRequest.isCodeFillCheck()); + orderEntity1.setInvStorageCode(addOrderRequest.getInvStorageCode()); + orderEntity1.setSubInvCode(addOrderRequest.getSubInvCode()); orderService.updateOrder(orderEntity1); WarehouseEntity warehouseEntity = new WarehouseEntity(); warehouseEntity.setOrderId(addOrderRequest.getOrderId()); @@ -753,9 +755,15 @@ public class WareHouseController { return ResultVOUtils.error(500, "当前库存不足，不允许0库存出库"); } } else { - int count = invProductDetailService.vailStockCount(code); + int count = invProductDetailService.vailStockCount(code, addOrderRequest.getInvStorageCode(), addOrderRequest.getInvWarehouseCode(), null); if (count <= 0) { return ResultVOUtils.error(500, "当前库存不足，不允许0库存出库"); + } else { + //查询此单据已扫描的条码数量 + WarehouseEntity warehouse = codesTempService.findByUnique(addOrderRequest.getOrderId(), addOrderRequest.getCode()); + if (null != warehouse && warehouse.getCount() > count) { + return ResultVOUtils.error(500, "当前库存不足，不允许0库存出库"); + } } } } @@ -844,7 +852,7 @@ public class WareHouseController { if (udiRelevanceResponse.getBhzxxsbzsl() == 0) { actCount = udiRelevanceResponse.getZxxsbzbhsydysl(); } else { - actCount = udiRelevanceResponse.getBhzxxsbzsl() * udiRelevanceResponse.getBhzxxsbzsl(); + actCount = udiRelevanceResponse.getBhzxxsbzsl() * udiRelevanceResponse.getZxxsbzbhsydysl(); } } else { actCount = udiRelevanceResponse.getBhzxxsbzsl(); @@ -928,20 +936,20 @@ public class WareHouseController { if (warehouseEntityList.get(i).getCode().equals(code)) { return drugCodeSelectEntity; } - UdiEntity originUdiEntity = FilterUdiUtils.getUdi(drugCodeSelectEntity.getCode()); - if (!StrUtil.emptyIfNull(originUdiEntity.getUdi()).equals(StrUtil.emptyIfNull(udiEntity.getUdi()))) { +// UdiEntity originUdiEntity = FilterUdiUtils.getUdi(drugCodeSelectEntity.getCode()); + if (!StrUtil.emptyIfNull(drugCodeSelectEntity.getNameCode()).equals(StrUtil.emptyIfNull(udiEntity.getUdi()))) { continue; } - if (!StrUtil.emptyIfNull(originUdiEntity.getBatchNo()).toUpperCase(Locale.ROOT).equals(StrUtil.emptyIfNull(udiEntity.getBatchNo()).toUpperCase(Locale.ROOT))) { + if (!StrUtil.emptyIfNull(drugCodeSelectEntity.getBatchNo()).toUpperCase(Locale.ROOT).equals(StrUtil.emptyIfNull(udiEntity.getBatchNo()).toUpperCase(Locale.ROOT))) { continue; } - if (!StrUtil.emptyIfNull(originUdiEntity.getProduceDate()).equals(StrUtil.emptyIfNull(udiEntity.getProduceDate()))) { + if (!StrUtil.emptyIfNull(drugCodeSelectEntity.getProduceDate()).equals(StrUtil.emptyIfNull(udiEntity.getProduceDate()))) { continue; } - if (!StrUtil.emptyIfNull(originUdiEntity.getExpireDate()).equals(StrUtil.emptyIfNull(udiEntity.getExpireDate()))) { + if (!StrUtil.emptyIfNull(drugCodeSelectEntity.getExpireDate()).equals(StrUtil.emptyIfNull(udiEntity.getExpireDate()))) { continue; } - if (!StrUtil.emptyIfNull(originUdiEntity.getSerialNo()).equals(StrUtil.emptyIfNull(udiEntity.getSerialNo()))) { + if (!StrUtil.emptyIfNull(drugCodeSelectEntity.getSerialNo()).equals(StrUtil.emptyIfNull(udiEntity.getSerialNo()))) { continue; } return drugCodeSelectEntity; @@ -1285,7 +1293,7 @@ public class WareHouseController { continue; } } - if (!isExit) { + if (isExit) { filteBusTypes.put(invBusUserEntity.getUserId(), invBusUserEntity); } } diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/inout/utils/CheckOrderUtils.java b/api-admin/src/main/java/com/glxp/api/admin/controller/inout/utils/CheckOrderUtils.java index 9bd8e247..0d2bf9d3 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/inout/utils/CheckOrderUtils.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/inout/utils/CheckOrderUtils.java @@ -119,7 +119,7 @@ public class CheckOrderUtils { orderEntity.setStatus(ConstantStatus.ORDER_STATUS_SUCCESS); orderEntity.setContrastStatus(ConstantStatus.ORDER_CHECK_SUCCESS); orderEntity.setUpdateTime(new Date()); - + orderService.updateOrder(orderEntity); //更新业务单据为已校验 List erpIds = DataTransUtil.strToErpList(orderEntity.getErpFk()); @@ -138,9 +138,10 @@ public class CheckOrderUtils { } if (status.equals(ConstantStatus.SORDER_DELIVER)) { orderEntity.setReceiveStatus(1); + orderService.updateOrder(orderEntity); invProductsTrService.genInvProducts(orderEntity.getId()); } - orderService.updateOrder(orderEntity); + } else { for (ErpOrderEntity erpOrderEntity : vailOrderEntities) { @@ -280,6 +281,8 @@ public class CheckOrderUtils { return null; } else if (StrUtil.isEmpty(vailOrderEntity.getBatchNo()) && StrUtil.isEmpty(myErpOrder.getBatchNo())) { return null; + } else if (StrUtil.isEmpty(myErpOrder.getBatchNo())) { + return null; } else { return myErpOrder.getCoName() + "批次号不匹配！"; } @@ -292,6 +295,8 @@ public class CheckOrderUtils { return null; } else if (StrUtil.isEmpty(vailOrderEntity.getProductDate()) && StrUtil.isEmpty(myErpOrder.getProductDate())) { return null; + } else if (StrUtil.isEmpty(myErpOrder.getProductDate())) { + return null; } else { return myErpOrder.getCoName() + "生产日期不匹配！"; } @@ -305,6 +310,8 @@ public class CheckOrderUtils { return null; } else if (StrUtil.isEmpty(vailOrderEntity.getExpireDate()) && StrUtil.isEmpty(myErpOrder.getExpireDate())) { return null; + } else if (StrUtil.isEmpty(myErpOrder.getExpireDate())) { + return null; } else { return myErpOrder.getCoName() + "失效日期不匹配！"; } diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/DeviceCollectDetailController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/DeviceCollectDetailController.java index a8ba051e..74155c6e 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/DeviceCollectDetailController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/DeviceCollectDetailController.java @@ -112,4 +112,20 @@ public class DeviceCollectDetailController { return detailService.deleteOrderDetail(detailRequest); } + /** + * 查询设备资产列表 + * + * @param detailRequest + * @return + */ + @GetMapping("/device/collect/order/detail/deviceList") + public BaseResponse deviceList(FilterDeviceCollectOrderDetailRequest detailRequest) { + List list = detailService.getDeviceList(detailRequest); + PageInfo pageInfo = new PageInfo<>(list); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setList(list); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + return ResultVOUtils.success(pageSimpleResponse); + } + } diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/DeviceMAOrderController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/DeviceMAOrderController.java index 5856f1aa..f20931b4 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/DeviceMAOrderController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/DeviceMAOrderController.java @@ -2,6 +2,7 @@ package com.glxp.api.admin.controller.inventory; import com.github.pagehelper.PageInfo; import com.glxp.api.admin.entity.inventory.DeviceMAOrderEntity; +import com.glxp.api.admin.req.inventory.AddDeviceMAOrderRequest; import com.glxp.api.admin.req.inventory.FilterDeviceMAOrderRequest; import com.glxp.api.admin.res.PageSimpleResponse; import com.glxp.api.admin.service.inventory.DeviceMAOrderService; @@ -92,5 +93,20 @@ public class DeviceMAOrderController { return deviceMAOrderService.deleteDeviceMAOrder(filterDeviceMAOrderRequest.getId()); } + /** + * 添加设备养护记录 + * + * @param addDeviceMAOrderRequest + * @param bindingResult + * @return + */ + @PostMapping("/device/MA/order/addDeviceMAOrder") + public BaseResponse addDeviceMAOrder(@RequestBody AddDeviceMAOrderRequest addDeviceMAOrderRequest, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + return deviceMAOrderService.addDeviceMAOrder(addDeviceMAOrderRequest); + } + } diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/DeviceMAOrderDetailCotroller.java b/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/DeviceMAOrderDetailCotroller.java index 14518206..a7d62a83 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/DeviceMAOrderDetailCotroller.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/DeviceMAOrderDetailCotroller.java @@ -1,5 +1,6 @@ package com.glxp.api.admin.controller.inventory; +import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageInfo; import com.glxp.api.admin.entity.inventory.DeviceMAOrderDetailEntity; import com.glxp.api.admin.req.inventory.FilterDeviceMAOrderDetailRequest; @@ -88,4 +89,18 @@ public class DeviceMAOrderDetailCotroller { return deviceMAOrderDetailService.deleteDetail(detailEntity); } + /** + * 养护设备信息接口 + * + * @param code + * @return + */ + @GetMapping("/device/MA/order/detail/filterMAOrderDetail") + public BaseResponse filterMAOrderDetail(String code) { + if (StrUtil.isBlank(code)) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); + } + return deviceMAOrderDetailService.filterMAOrderDetail(code); + } + } diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvCountOrderController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvCountOrderController.java index f4eea918..2a85a0e9 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvCountOrderController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvCountOrderController.java @@ -3,13 +3,21 @@ package com.glxp.api.admin.controller.inventory; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageInfo; import com.glxp.api.admin.annotation.AuthRuleAnnotation; +import com.glxp.api.admin.entity.info.SystemPDFModuleEntity; +import com.glxp.api.admin.entity.info.SystemPDFTemplateEntity; import com.glxp.api.admin.entity.inventory.InvCountOrder; +import com.glxp.api.admin.req.info.SystemPDFModuleRequest; import com.glxp.api.admin.req.inout.DeleteRequest; import com.glxp.api.admin.req.inventory.FilterInvCountOrderRequest; import com.glxp.api.admin.req.inventory.FilterInvCountOrderSaveRequest; +import com.glxp.api.admin.req.inventory.InvCountOrderPrintRequest; +import com.glxp.api.admin.req.itextpdf.InspectionPDFTemplateRequest; import com.glxp.api.admin.res.PageSimpleResponse; import com.glxp.api.admin.res.inventory.InvCountOrderResponse; +import com.glxp.api.admin.service.info.SystemPDFModuleService; +import com.glxp.api.admin.service.info.SystemPDFTemplateService; import com.glxp.api.admin.service.inventory.InvCountOrderService; +import com.glxp.api.admin.util.JasperUtils; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; @@ -20,8 +28,12 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; +import java.util.HashMap; import java.util.List; +import java.util.Map; /** * 盘点单接口 @@ -31,6 +43,10 @@ public class InvCountOrderController { @Resource private InvCountOrderService invCountOrderService; + @Resource + private SystemPDFTemplateService systemPDFTemplateService; + @Resource + private SystemPDFModuleService systemPDFModuleService; /** * 查询盘点单列表 @@ -38,6 +54,7 @@ public class InvCountOrderController { * @param filterInvCountOrderRequest * @return */ + @AuthRuleAnnotation("") @GetMapping("/invCount/order/filter") public BaseResponse filterList(FilterInvCountOrderRequest filterInvCountOrderRequest) { List list = invCountOrderService.filterList(filterInvCountOrderRequest); @@ -54,6 +71,7 @@ public class InvCountOrderController { * @param deleteRequest * @return */ + @AuthRuleAnnotation("") @PostMapping("/invCount/order/delete") public BaseResponse delete(@RequestBody DeleteRequest deleteRequest) { invCountOrderService.deleteOrder(deleteRequest.getId()); @@ -65,6 +83,7 @@ public class InvCountOrderController { * * @return */ + @AuthRuleAnnotation("") @PostMapping("/invCount/order/saveCountOrder") public BaseResponse saveCountOrder(@RequestBody InvCountOrder invCountOrder, BindingResult bindingResult) { if (bindingResult.hasErrors()) { @@ -83,6 +102,7 @@ public class InvCountOrderController { * @param id * @return */ + @AuthRuleAnnotation("") @GetMapping("/invCount/order/submitAudit") public BaseResponse submitAudit(String id) { if (StrUtil.isBlank(id)) { @@ -97,6 +117,7 @@ public class InvCountOrderController { * @param filterInvCountOrderRequest * @return */ + @AuthRuleAnnotation("") @PostMapping("/invCount/order/updateCountOrderStatus") public BaseResponse updateCountOrderStatus(@RequestBody FilterInvCountOrderRequest filterInvCountOrderRequest) { if (null == filterInvCountOrderRequest || StrUtil.isBlank(filterInvCountOrderRequest.getId()) || null == filterInvCountOrderRequest.getStatus()) { @@ -105,6 +126,50 @@ public class InvCountOrderController { return invCountOrderService.updateCountOrderStatus(filterInvCountOrderRequest.getId(), filterInvCountOrderRequest.getStatus()); } + /** + * 校验模板文件 + * + * @param inspectionPDFTemplateRequest + * @return + */ + @AuthRuleAnnotation("") + @PostMapping("/invCount/order/verifyTemplateFile") + public BaseResponse verifyTemplateFile(@RequestBody InspectionPDFTemplateRequest inspectionPDFTemplateRequest) { + if (null == inspectionPDFTemplateRequest) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, "参数不能为空！"); + } + //查询模板文件是否存在 + SystemPDFModuleRequest systemPDFModuleRequest = new SystemPDFModuleRequest(); + systemPDFModuleRequest.setId(inspectionPDFTemplateRequest.getModuleId()); + SystemPDFModuleEntity systemPDFModule = systemPDFModuleService.findSystemPDFModule(systemPDFModuleRequest); + if (null == systemPDFModule) { + return ResultVOUtils.error(ResultEnum.DATA_NOT, "所属模块错误"); + } + + SystemPDFTemplateEntity systemPDFTemplateEntity = systemPDFTemplateService.selectById(String.valueOf(systemPDFModule.getTemplateId())); + if (null == systemPDFTemplateEntity) { + return ResultVOUtils.error(ResultEnum.DATA_NOT, "模板错误"); + } + return ResultVOUtils.success(systemPDFModule.getTemplateId()); + } + + /** + * 打印模板单号标签 + * + * @param invCountOrderPrintRequest + * @param request + * @param response + * @throws Exception + */ + @AuthRuleAnnotation("") + @PostMapping("/invCount/order/printOrder") + public void printOrder(@RequestBody InvCountOrderPrintRequest invCountOrderPrintRequest, HttpServletRequest request, HttpServletResponse response) throws Exception { + SystemPDFTemplateEntity systemPDFTemplateEntity = systemPDFTemplateService.selectById(invCountOrderPrintRequest.getTemplateId()); + //打印单号标签 + Map data = new HashMap<>(1); + data.put("orderId", invCountOrderPrintRequest.getOrderId()); + JasperUtils.jasperReport(request, response, data, systemPDFTemplateEntity.getPath(), "pdf"); + } //------------------------------------------------------手持终端接口--------------------------------------------------------------- diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvMAOrderDetailController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvMAOrderDetailController.java index 3e905834..6be0d63d 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvMAOrderDetailController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvMAOrderDetailController.java @@ -3,6 +3,7 @@ package com.glxp.api.admin.controller.inventory; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageInfo; +import com.glxp.api.admin.annotation.AuthRuleAnnotation; import com.glxp.api.admin.entity.inventory.InvMaintenanceOrderDetailEntity; import com.glxp.api.admin.req.inventory.AddMAOrderDetailRequest; import com.glxp.api.admin.req.inventory.FilterInvMAOrderDetailRequest; @@ -38,6 +39,7 @@ public class InvMAOrderDetailController { * @param filterInvMAOrderDetailRequest * @return */ + @AuthRuleAnnotation("") @GetMapping("/inv/MA/order/detail/filterList") public BaseResponse filterList(FilterInvMAOrderDetailRequest filterInvMAOrderDetailRequest) { List list = invMAOrderDetailService.filterList(filterInvMAOrderDetailRequest); @@ -55,7 +57,8 @@ public class InvMAOrderDetailController { * @param bindingResult * @return */ - @PostMapping(" /inv/MA/order/detail/addOrderDetail") + @AuthRuleAnnotation("") + @PostMapping("/inv/MA/order/detail/addOrderDetail") public BaseResponse addOrderDetail(@RequestBody InvMaintenanceOrderDetailEntity invMaintenanceOrderDetailEntity, BindingResult bindingResult) { if (bindingResult.hasErrors()) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); @@ -72,6 +75,7 @@ public class InvMAOrderDetailController { * @param invProductIds * @return */ + @AuthRuleAnnotation("") @PostMapping("/inv/MA/order/detail/batchAddDetail") public BaseResponse batchAddDetail(@RequestBody AddMAOrderDetailRequest addMAOrderDetailRequest, BindingResult bindingResult) { if (bindingResult.hasErrors()) { @@ -89,6 +93,7 @@ public class InvMAOrderDetailController { * @param filterInvMAOrderDetailRequest * @return */ + @AuthRuleAnnotation("") @PostMapping("/inv/MA/order/detail/delete") public BaseResponse delete(@RequestBody FilterInvMAOrderDetailRequest filterInvMAOrderDetailRequest, BindingResult bindingResult) { if (bindingResult.hasErrors()) { @@ -106,6 +111,7 @@ public class InvMAOrderDetailController { * @param invMaintenanceOrderDetailEntity * @return */ + @AuthRuleAnnotation("") @PostMapping("/inv/MA/order/detail/update") public BaseResponse update(@RequestBody InvMaintenanceOrderDetailEntity invMaintenanceOrderDetailEntity, BindingResult bindingResult) { if (bindingResult.hasErrors()) { diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvProductsController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvProductsController.java index 9e1240d5..1cced17a 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvProductsController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvProductsController.java @@ -431,7 +431,7 @@ public class InvProductsController { @AuthRuleAnnotation("") @GetMapping("spms/inv/products/vailInvCount") public BaseResponse vailInvCount(FilterInvProductDetailRequest filterInvProductDetailRequest) { - int count = invProductDetailService.vailStockCount(filterInvProductDetailRequest.getCode()); + int count = invProductDetailService.vailStockCount(filterInvProductDetailRequest.getCode(), filterInvProductDetailRequest.getInvStorageCode(), filterInvProductDetailRequest.getInvWarehouseCode(), filterInvProductDetailRequest.getInvSpaceCode()); return ResultVOUtils.success(count); } diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvSpaceController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvSpaceController.java index 39f54748..74010160 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvSpaceController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvSpaceController.java @@ -98,7 +98,7 @@ public class InvSpaceController { */ @GetMapping("/spms/inv/space/getSpaceCodeList") public BaseResponse getSpaceCodeList(FilterInvSpaceRequest filterInvSpaceRequest) { - List list = invSpaceService.getSpaceCodeList(filterInvSpaceRequest); + List list = invSpaceService.getSpaceCodeList(filterInvSpaceRequest); return ResultVOUtils.success(list); } diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvSubWarehouseController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvSubWarehouseController.java index fe2abc51..ffa4add1 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvSubWarehouseController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvSubWarehouseController.java @@ -78,38 +78,42 @@ public class InvSubWarehouseController { AuthAdmin authAdmin = customerService.getUserBean(); if (StrUtil.isNotEmpty(filterInvWarehouseRequest.getPcode())) { - if (filterInvWarehouseRequest.getFilter() == null || filterInvWarehouseRequest.getFilter() == 1) { - if (authAdmin.getCustomerId()==110) { + if (filterInvWarehouseRequest.getFilter() == null || filterInvWarehouseRequest.getFilter() == 1 || filterInvWarehouseRequest.getFilter() == 2) { + if (authAdmin.getCustomerId() == 110) { filterInvWarehouseRequest.setUserId(authAdmin.getId().intValue()); - }else { + } else { filterInvWarehouseRequest.setSpUse(true); } } - } else{ - //走这边表示单据选择的是往来单位里面调出调入的库 - //判断单据类型是1就是设置单据需要需要查询除自己以外的分库 - SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey("corp_innor_inv"); - if(systemParamConfigEntity.getParamValue().equals("0")){ - //不允许调拨 - // 查询总库信息 - InvSubWarehouseEntity invSubWarehouseEntity=invSubWarehouseService.filterGroupInvSubAndcode(filterInvWarehouseRequest.getCode()); - //查询仓库信息 - //查询仓库信息 - if(invSubWarehouseEntity!=null){ - InvWarehouseEntity invWarehouseEntity = invWarehouseService.selectByCodeAll(invSubWarehouseEntity.getParentId()); - filterInvWarehouseRequest.setSuperiorCode(invWarehouseEntity.getCode()); - filterInvWarehouseRequest.setSuperiorPcode(invWarehouseEntity.getPcode()); + } else { + if (filterInvWarehouseRequest.getFilter() == 3 && filterInvWarehouseRequest.getFilter() != null) { + filterInvWarehouseRequest.setUserId(authAdmin.getId().intValue()); + } else { + //走这边表示单据选择的是往来单位里面调出调入的库 + //判断单据类型是1就是设置单据需要需要查询除自己以外的分库 + SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey("corp_innor_inv"); + if (systemParamConfigEntity.getParamValue().equals("0")) { + //不允许调拨 + // 查询总库信息 + InvSubWarehouseEntity invSubWarehouseEntity = invSubWarehouseService.filterGroupInvSubAndcode(filterInvWarehouseRequest.getCode()); + //查询仓库信息 + if (invSubWarehouseEntity != null) { + InvWarehouseEntity invWarehouseEntity = invWarehouseService.selectByCodeAll(invSubWarehouseEntity.getParentId()); + filterInvWarehouseRequest.setSuperiorCode(invWarehouseEntity.getCode()); + filterInvWarehouseRequest.setSuperiorPcode(invWarehouseEntity.getPcode()); + filterInvWarehouseRequest.setCode(null); + } else { + return ResultVOUtils.error(999, "分库编号为空！"); + } + + + } else { + //允许调拨 + //查询总库信息 + InvSubWarehouseEntity invSubWarehouseEntity = invSubWarehouseService.filterGroupInvSubAndcode(filterInvWarehouseRequest.getCode()); + filterInvWarehouseRequest.setWarehouseCode(invSubWarehouseEntity.getParentId()); filterInvWarehouseRequest.setCode(null); - }else { - return ResultVOUtils.error(999,"分库编号为空！"); } - - }else { - //允许调拨 - //查询总库信息 - InvSubWarehouseEntity invSubWarehouseEntity=invSubWarehouseService.filterGroupInvSubAndcode(filterInvWarehouseRequest.getCode()); - filterInvWarehouseRequest.setWarehouseCode(invSubWarehouseEntity.getParentId()); - filterInvWarehouseRequest.setCode(null); } } @@ -125,7 +129,7 @@ public class InvSubWarehouseController { // return ResultVOUtils.error(500, "用户或仓库不能未空！"); // } AuthAdmin authAdmin = customerService.getUserBean(); - InvSubWarehouseEntity invSubWarehouseEntity=invSubWarehouseService.filterGroupInvSubAndcode(filterInvWarehouseRequest.getCode()); + InvSubWarehouseEntity invSubWarehouseEntity = invSubWarehouseService.filterGroupInvSubAndcode(filterInvWarehouseRequest.getCode()); filterInvWarehouseRequest.setSubordinateCode(invSubWarehouseEntity.getParentId()); filterInvWarehouseRequest.setCode(null); List invSubWarehouseEntities = invSubWarehouseService.filterGroupInvSubDown(filterInvWarehouseRequest); @@ -141,6 +145,10 @@ public class InvSubWarehouseController { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } + boolean checkResult = invSubWarehouseService.checkDuplicateName(invSubWarehouseEntity.getParentId(), invSubWarehouseEntity.getName()); + if (checkResult) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, "分库名称重复！"); + } FilterInvSubWarehouseRequest filterInvWarehouseRequest = new FilterInvSubWarehouseRequest(); filterInvWarehouseRequest.setParentId(invSubWarehouseEntity.getParentId()); @@ -276,4 +284,17 @@ public class InvSubWarehouseController { return ResultVOUtils.success(); } + /** + * 查询分仓列表 + * + * @param filterInvWarehouseRequest + * @return + */ + @AuthRuleAnnotation("") + @GetMapping("/spms/sub/inv/warehouse/filterSubInvList") + public BaseResponse filterSubInvList(FilterInvWarehouseRequest filterInvWarehouseRequest) { + List responses = invSubWarehouseService.filterSubInvList(filterInvWarehouseRequest); + return ResultVOUtils.success(responses); + } + } diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/purchase/PurApplyController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/purchase/PurApplyController.java index 5c4edc54..371867f1 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/purchase/PurApplyController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/purchase/PurApplyController.java @@ -168,12 +168,7 @@ public class PurApplyController { purPlanEntity.setBillNo(billNo); purPlanEntity.setBillDate(new Date()); purPlanEntity.setStatus(ConstantStatus.APPLY_DRAFT); -// purPlanEntity.setLocStorageCode(purApplyEntity.getTargetInv()); -// purPlanEntity.setInvWarehouseCode(purApplyEntity.getTargetSubInv()); purPlanEntity.setBillType("purPlan"); -// purPlanEntity.setBillType(purApplyEntity.getTargetBillType()); -// purPlanEntity.setDeptCode(purApplyEntity.getDeptCode()); -// purPlanEntity.setCreateBy(purApplyEntity.getAuditBy()); purPlanEntity.setCreateTime(new Date()); purPlanEntity.setUpdateTime(new Date()); purPlanEntity.setApplyBillNo(purApplyEntity.getBillNo()); @@ -182,8 +177,9 @@ public class PurApplyController { purPlanEntity.setApplyAuditBy(purApplyEntity.getAuditBy()); purPlanEntity.setRemark("申购科室：" + purApplyRequest.getSubInvName() + ";申购人：" + purApplyRequest.getCreateByName() + ";申购原因：" + purApplyRequest.getRemark()); - - + purApplyEntity.setPlanBillNo(purPlanEntity.getBillNo()); + purApplyEntity.setGeneratePlan(true); + purApplyService.update(purApplyEntity); purPlanService.insert(purPlanEntity); List purApplyDetailEntities = purApplyDetailService.findByOrderId(purApplyEntity.getId() + ""); if (CollUtil.isNotEmpty(purApplyDetailEntities)) { diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/purchase/SupCompanyController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/purchase/SupCompanyController.java index da8bb5c4..e536bac5 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/purchase/SupCompanyController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/purchase/SupCompanyController.java @@ -78,6 +78,25 @@ public class SupCompanyController { @PostMapping("/api/pur/addCompany") public BaseResponse insertCompany(@RequestBody SupCompanyEntity companyEntity) { + + //查询该用户对应的资质证书 + if(companyEntity.getAuditStatus()==6){ + FilterSupCertRequest filterSupCertRequest = new FilterSupCertRequest(); + filterSupCertRequest.setCustomerId(companyEntity.getCustomerId()); + filterSupCertRequest.setType(ConstantStatus.CERT_COMPANY); + List supCertEntityList = supCertService.filterCompanyCert(filterSupCertRequest); + if(supCertEntityList.size()>0){ + for (SupCertEntity obj:supCertEntityList){ + if (StrUtil.isBlank(obj.getFilePath())){ + return ResultVOUtils.error(999,obj.getName()+"未上传资质证书！"); + } + } + } + } + + + + String customerId = CustomUtil.getId(); //重新生成customerId CustomerContactEntity customerContactEntity = new CustomerContactEntity(); customerContactEntity.setTel(companyEntity.getTel()); @@ -87,7 +106,7 @@ public class SupCompanyController { customerContactEntity.setCustomerId(customerId); customerContactService.insertCustomerContact(customerContactEntity); //更新相关证书对应的customerId - supCertService.updateCustomerId(companyEntity.getCustomerId(), customerId); + supCertService.updateCustomerId(companyEntity.getCustomerId(), customerId,ConstantStatus.AUDIT_UN); companyEntity.setCustomerId(customerId); companyEntity.setCreateTime(new Date()); diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrOrderReceiveController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrOrderReceiveController.java index c05aa2e1..e98caa44 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrOrderReceiveController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrOrderReceiveController.java @@ -55,21 +55,21 @@ public class ThrOrderReceiveController { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } Integer userId = customerService.getUserId(); - ThrOrderEntity stockOrderEntity = new ThrOrderEntity(); - BeanUtils.copyProperties(stockOrderPostRequest, stockOrderEntity); - stockOrderEntity.setCreateUser(userId + ""); - stockOrderEntity.setType(1);//领用单据 - stockOrderEntity.setUpdateTime(new Date()); - stockOrderEntity.setBilldate(DateUtil.parse(stockOrderEntity.getBilldate(), DatePattern.NORM_DATETIME_PATTERN).toString()); + ThrOrderEntity thrOrderEntity = new ThrOrderEntity(); + BeanUtils.copyProperties(stockOrderPostRequest, thrOrderEntity); + thrOrderEntity.setCreateUser(userId + ""); + thrOrderEntity.setType(1);//领用单据 + thrOrderEntity.setUpdateTime(new Date()); + thrOrderEntity.setBilldate(DateUtil.parse(thrOrderEntity.getBilldate(), DatePattern.NORM_DATETIME_PATTERN).toString()); String orderNo = gennerOrderUtils.createStOrderNo(new OrderNoTypeBean(Constant.LIN_YONG, "yyyyMMdd")); - stockOrderEntity.setBillNo(orderNo); - thrOrderService.insertThrOrder(stockOrderEntity); + thrOrderEntity.setBillNo(orderNo); + thrOrderService.insertThrOrder(thrOrderEntity); if (stockOrderPostRequest.getSubErpOrders() != null) { List stockOrderDetailEntityList = stockOrderPostRequest.getSubErpOrders(); for (StockOrderDetailEntity stockOrderDetailEntity : stockOrderDetailEntityList) { ThrOrderDetailEntity thrOrderDetailEntity = new ThrOrderDetailEntity(); BeanUtils.copyProperties(stockOrderDetailEntity, thrOrderDetailEntity); - thrOrderDetailEntity.setOrderIdFk(stockOrderEntity.getId() + ""); + thrOrderDetailEntity.setOrderIdFk(thrOrderEntity.getId() + ""); thrOrderDetailEntity.setReCount( stockOrderDetailEntity.getReCount()); thrOrderDetailEntity.setCount( diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/auth/DeptDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/auth/DeptDao.java index b6c34a88..578de075 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/auth/DeptDao.java +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/auth/DeptDao.java @@ -21,4 +21,5 @@ public interface DeptDao { boolean deleteAll(); + DeptEntity selectByCode(String code); } diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/basic/BasicDownloadDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/basic/BasicDownloadDao.java index d0a5f56d..9429c800 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/basic/BasicDownloadDao.java +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/basic/BasicDownloadDao.java @@ -17,6 +17,8 @@ public interface BasicDownloadDao { boolean deleteById(@Param("id") String id); + boolean deleteByTime(); + boolean updateDownloadStatus(BasicDownloadStatusEntity basicDownloadStatusEntity); diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/basic/BasicExportDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/basic/BasicExportDao.java index 60d6db0e..57df6162 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/basic/BasicExportDao.java +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/basic/BasicExportDao.java @@ -19,6 +19,8 @@ public interface BasicExportDao { boolean deleteById(@Param("id") String id); + boolean deleteByTime(); + boolean updateExportStatus(BasicExportStatusEntity warehouseEntity); diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/basic/BasicUnitMaintainDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/basic/BasicUnitMaintainDao.java index d2310bda..de3d6c8e 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/basic/BasicUnitMaintainDao.java +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/basic/BasicUnitMaintainDao.java @@ -33,4 +33,6 @@ public interface BasicUnitMaintainDao { boolean importBasicUnitMaintain(BasicUnitMaintainEntity basicUnitMaintainEntity); + + List batchSelectByErpIdsAndName(@Param("erpIds") List erpIds, @Param("name") String name); } diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/basic/BussinessLocalTypeDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/basic/BussinessLocalTypeDao.java index 861e7546..d351f7e2 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/basic/BussinessLocalTypeDao.java +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/basic/BussinessLocalTypeDao.java @@ -27,9 +27,6 @@ public interface BussinessLocalTypeDao { List filterAllList(BussinessLocalTypeFilterRequest bussinessTypeFilterRequest); - BussinessLocalTypeEntity findBTByAction(String action); - - BussinessLocalTypeEntity findBTByName(String name); boolean updateBusLocalType(BussinessLocalTypeEntity bussinessTypeEntity); @@ -45,4 +42,6 @@ public interface BussinessLocalTypeDao { * @param action */ Boolean selectPreInByOrderType(String action); + //根据名字查询 + BussinessLocalTypeEntity selectByName(@Param("name") String name,@Param("id") String id); } diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/basic/CompanyProductRelevanceDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/basic/CompanyProductRelevanceDao.java index f2d935d0..3c32fb59 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/basic/CompanyProductRelevanceDao.java +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/basic/CompanyProductRelevanceDao.java @@ -35,4 +35,12 @@ public interface CompanyProductRelevanceDao { boolean deleteById(String id); boolean deleteByRlId(String id); + + /** + * 根据产品ID查询供应商ID + * + * @param udiRlIdFk + * @return + */ + List selectUnitFkByUdiRlIdFk(@Param("udiRlIdFk") String udiRlIdFk); } diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/basic/UdiInfoDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/basic/UdiInfoDao.java index f3097257..a8349cbf 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/basic/UdiInfoDao.java +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/basic/UdiInfoDao.java @@ -58,4 +58,6 @@ public interface UdiInfoDao { */ void updateUdiInfoByUuid(UdiInfoEntity udiInfoEntity); + + } diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/business/InvSpaceDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/business/InvSpaceDao.java index bddca773..f84b81d4 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/business/InvSpaceDao.java +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/business/InvSpaceDao.java @@ -48,7 +48,7 @@ public interface InvSpaceDao { * @param filterInvSpaceRequest * @return */ - List selectSpaceCodeList(FilterInvSpaceRequest filterInvSpaceRequest); + List selectSpaceCodeList(FilterInvSpaceRequest filterInvSpaceRequest); /** * 根据货位码查询此 diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/info/PlatformDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/info/PlatformDao.java deleted file mode 100644 index 297a9503..00000000 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/info/PlatformDao.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.glxp.api.admin.dao.info; - -import com.glxp.api.admin.entity.info.PlatformEntity; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -import java.util.List; -import java.util.Map; - -@Mapper -public interface PlatformDao{ - - int batchSave(List list); - - List list( Map map); - - int count(Map map); - - PlatformEntity get(String id); - - /** - * 根据名称和访问地址查询平台信息 - * - * @param name - * @param host - * @return - */ - List selectByNameAndHost(@Param("name") String name, @Param("host") String host); - - PlatformEntity selectById(@Param("platformId") String platformId); - - int insert(PlatformEntity platformEntity); - - List selectList(@Param("id") String id, @Param("name") String name, @Param("host") String host); - - int deleteById(@Param("id") String id); - - void updateById(PlatformEntity platformEntity); -} diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/inout/CodesDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/inout/CodesDao.java index b4acf000..765301af 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/inout/CodesDao.java +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/inout/CodesDao.java @@ -59,4 +59,7 @@ public interface CodesDao { * @return */ String selectSupIdByCode(String code); + + WarehouseEntity findOrderId(@Param("orderId") String orderId); + } diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/inout/OrderDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/inout/OrderDao.java index 3709369b..ef479b7c 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/inout/OrderDao.java +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/inout/OrderDao.java @@ -92,4 +92,29 @@ public interface OrderDao { * @return */ OrderNoResult selectOrderNos(String id); + + /** + * 根据扫码单据ID和业务单据ID查询已完成单据 + * + * @param billNo + * @return + */ + List selectByBillNoAndStatus(String billNo); + + /** + * 更新单据备注 + * + * @param orderId 单据号 + * @param printRemark 备注信息 + * @return + */ + boolean updatePrintRemark(@Param("orderId") String orderId, @Param("printRemark") String printRemark); + + /** + * 查询单据备注 + * + * @param orderId + * @return + */ + String selectPrintRemarkById(@Param("orderId") String orderId); } diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/inout/OrderDetailDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/inout/OrderDetailDao.java index 16009c4e..eb730e63 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/inout/OrderDetailDao.java +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/inout/OrderDetailDao.java @@ -60,4 +60,12 @@ public interface OrderDetailDao { * @return */ int countByOrderId(@Param("orderId") String orderId); + + /** + * 更新扫码单据详情关联的业务单据号 + * + * @param orderIdFk 扫码单据ID + * @param erpOrderId 关联业务单据号 + */ + void updateErpOrderId(@Param("orderIdFk") String orderIdFk, @Param("erpOrderId") String erpOrderId); } diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/inout/UnitMaintainPlatformDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/inout/UnitMaintainPlatformDao.java deleted file mode 100644 index 3a884e67..00000000 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/inout/UnitMaintainPlatformDao.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.glxp.api.admin.dao.inout; - -import com.glxp.api.admin.entity.inout.UnitMaintainPlatformEntity; -import com.glxp.api.admin.req.inout.PlatformLinkRequest; -import com.glxp.api.admin.res.info.PlatformLinkResponse; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -@Mapper -public interface UnitMaintainPlatformDao{ - - /** - * 查询医院客户列表 - * - * @param page - * @param customerId - * @param key - * @return - */ - List getLinkPlatformList(@Param("customerId") String customerId, @Param("key") String key); - - /** - * 根据客户ID查询关联数据 - * - * @param customerId - * @return - */ - List selectByCustomerId(@Param("customerId") Long customerId); - - void updateById(UnitMaintainPlatformEntity maintainPlatform); - - void insert(UnitMaintainPlatformEntity unitMaintainPlatformEntity); - - List selectList(PlatformLinkRequest platformLinkRequest); - - UnitMaintainPlatformEntity findLinkData(@Param("customerId") long customerId, @Param("action") String action, @Param("unitId") String unitId); - - void deleteById(String id); -} \ No newline at end of file diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/inout/WarehouseBussinessTypeDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/inout/WarehouseBussinessTypeDao.java index 7a1f8c58..b68c323b 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/inout/WarehouseBussinessTypeDao.java +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/inout/WarehouseBussinessTypeDao.java @@ -37,6 +37,8 @@ public interface WarehouseBussinessTypeDao { void deleteByCode(@Param("code") String code); + + /** * 根据单据类型编码查询单据类型列表 * diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/inout/WarehouseUserDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/inout/WarehouseUserDao.java index 7720be50..f57841c7 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/inout/WarehouseUserDao.java +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/inout/WarehouseUserDao.java @@ -8,6 +8,7 @@ import java.util.List; public interface WarehouseUserDao { int deleteByPrimaryKey(Integer id); + int deleteByCodeAndId(@Param("id") Long id,@Param("code") String code); List filterList(FilterInvUserRequest filterInvUserRequest); diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/DeviceCollectOrderDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/DeviceCollectOrderDao.java index b2a3f611..aeae033a 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/DeviceCollectOrderDao.java +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/DeviceCollectOrderDao.java @@ -3,10 +3,12 @@ package com.glxp.api.admin.dao.inventory; import com.glxp.api.admin.entity.inventory.DeviceCollectOrderEntity; import com.glxp.api.admin.req.inventory.FilterDeviceCollectOrderRequest; import com.glxp.api.admin.res.inventory.DeviceCollectOrderResponse; +import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import java.util.List; +@Mapper public interface DeviceCollectOrderDao { int deleteByPrimaryKey(Integer id); diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/DeviceCollectOrderDetailDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/DeviceCollectOrderDetailDao.java index 7103535b..b6651d77 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/DeviceCollectOrderDetailDao.java +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/DeviceCollectOrderDetailDao.java @@ -3,10 +3,12 @@ package com.glxp.api.admin.dao.inventory; import com.glxp.api.admin.entity.inventory.DeviceCollectOrderDetailEntity; import com.glxp.api.admin.req.inventory.FilterDeviceCollectOrderDetailRequest; import com.glxp.api.admin.res.inventory.DeviceCollectOrderDetailResponse; +import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import java.util.List; +@Mapper public interface DeviceCollectOrderDetailDao { int deleteByPrimaryKey(Integer id); @@ -45,4 +47,19 @@ public interface DeviceCollectOrderDetailDao { */ List selectList(FilterDeviceCollectOrderDetailRequest filterDeviceCollectOrderDetailRequest); + /** + * 查询设备资产列表 + * + * @param detailRequest + * @return + */ + List selectDeviceList(FilterDeviceCollectOrderDetailRequest detailRequest); + + /** + * 根据码查询单条设备领用详情 + * + * @param code + * @return + */ + DeviceCollectOrderDetailEntity findOneByCode(@Param("code") String code); } \ No newline at end of file diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/DeviceMAOrderDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/DeviceMAOrderDao.java index d424d856..3f90f8de 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/DeviceMAOrderDao.java +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/DeviceMAOrderDao.java @@ -3,10 +3,13 @@ package com.glxp.api.admin.dao.inventory; import com.glxp.api.admin.entity.inventory.DeviceMAOrderEntity; import com.glxp.api.admin.req.inventory.FilterDeviceMAOrderRequest; +import org.apache.ibatis.annotations.Mapper; import java.util.List; +@Mapper public interface DeviceMAOrderDao { + int deleteByPrimaryKey(Integer id); int insert(DeviceMAOrderEntity record); diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/DeviceMaOrderDetailDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/DeviceMaOrderDetailDao.java index 236ed0cd..d110f5f6 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/DeviceMaOrderDetailDao.java +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/DeviceMaOrderDetailDao.java @@ -3,11 +3,14 @@ package com.glxp.api.admin.dao.inventory; import com.glxp.api.admin.entity.inventory.DeviceMAOrderDetailEntity; import com.glxp.api.admin.req.inventory.FilterDeviceMAOrderDetailRequest; import com.glxp.api.admin.res.inventory.DeviceMAOrderDetailResponse; +import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import java.util.List; +@Mapper public interface DeviceMaOrderDetailDao { + int deleteByPrimaryKey(Integer id); int insert(DeviceMAOrderDetailEntity record); @@ -31,4 +34,12 @@ public interface DeviceMaOrderDetailDao { * @return */ List selectByOrderId(@Param("orderId") String orderId); + + /** + * 查询设备养护记录详情展示信息 + * + * @param productId + * @return + */ + DeviceMAOrderDetailResponse filterMAOrderDetail(String productId); } \ No newline at end of file diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InvCountOrderDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InvCountOrderDao.java index ae8b4c47..92844282 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InvCountOrderDao.java +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InvCountOrderDao.java @@ -65,4 +65,11 @@ public interface InvCountOrderDao { * @return */ InvCountOrder selectByOrderId(@Param("orderId") String orderId); + + /** + * 根据单据号删除单据 + * + * @param orderId + */ + void deleteByOrderId(@Param("orderId") String orderId); } \ No newline at end of file diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InvMaintenanceExplanationDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InvMaintenanceExplanationDao.java index ac5821b7..61efdf30 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InvMaintenanceExplanationDao.java +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InvMaintenanceExplanationDao.java @@ -1,10 +1,12 @@ package com.glxp.api.admin.dao.inventory; import com.glxp.api.admin.entity.inventory.InvMaintenanceExplanationEntity; +import org.apache.ibatis.annotations.Mapper; /** * 养护说明表Dao */ +@Mapper public interface InvMaintenanceExplanationDao { InvMaintenanceExplanationEntity selectByStatus(Integer status); diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InvMaintenanceOrderDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InvMaintenanceOrderDao.java index c83a7d9a..b35eb5c3 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InvMaintenanceOrderDao.java +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InvMaintenanceOrderDao.java @@ -3,10 +3,12 @@ package com.glxp.api.admin.dao.inventory; import com.glxp.api.admin.entity.inventory.InvMaintenanceOrderEntity; import com.glxp.api.admin.req.inventory.FilterInvMAOrderRequest; import com.glxp.api.admin.res.inventory.InvMAOrderResponse; +import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import java.util.List; +@Mapper public interface InvMaintenanceOrderDao { int deleteByPrimaryKey(Integer id); diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InvMaintenanceOrderDetailDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InvMaintenanceOrderDetailDao.java index 8423236a..9a85c550 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InvMaintenanceOrderDetailDao.java +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InvMaintenanceOrderDetailDao.java @@ -3,10 +3,12 @@ package com.glxp.api.admin.dao.inventory; import com.glxp.api.admin.entity.inventory.InvMaintenanceOrderDetailEntity; import com.glxp.api.admin.req.inventory.FilterInvMAOrderDetailRequest; import com.glxp.api.admin.res.inventory.InvMAOrderDetailResponse; +import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import java.util.List; +@Mapper public interface InvMaintenanceOrderDetailDao { int deleteByPrimaryKey(Integer id); diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InvProductDetailDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InvProductDetailDao.java index ee6b892c..9c936941 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InvProductDetailDao.java +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InvProductDetailDao.java @@ -100,6 +100,6 @@ public interface InvProductDetailDao { * @param code * @return */ - String selectSupIdByCode(String code); + List selectSupIdByCode(String code); } diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InvSubWarehouseDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InvSubWarehouseDao.java index 1bd62061..43b6cc72 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InvSubWarehouseDao.java +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InvSubWarehouseDao.java @@ -64,5 +64,11 @@ public interface InvSubWarehouseDao { List filterGroupInvSubDown(FilterInvWarehouseRequest filterInvSubWarehouseRequest); + /** + * 查询分仓列表 + * @param filterInvWarehouseRequest + * @return + */ + List filterSubInvList(FilterInvWarehouseRequest filterInvWarehouseRequest); } diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/purchase/SupCertDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/purchase/SupCertDao.java index 6cc2f723..50a59fa1 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/purchase/SupCertDao.java +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/purchase/SupCertDao.java @@ -23,7 +23,7 @@ public interface SupCertDao { boolean deleteById(String id); - boolean updateCustomerId(@Param("oldId") String oldId, @Param("newId") String newId); + boolean updateCustomerId(@Param("oldId") String oldId, @Param("newId") String newId,@Param("auditStatus") Integer auditStatus); boolean updateManufacturerId(@Param("oldCustomerId") String oldCustomerId, @Param("newCustomerId") String newCustomerId, @Param("oldManufacturerIdFk") String oldManufacturerIdFk, @Param("newManufacturerIdFk") String newManufacturerIdFk); diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/purchase/SupCertSetDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/purchase/SupCertSetDao.java index 849153b8..c6091ea3 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/purchase/SupCertSetDao.java +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/purchase/SupCertSetDao.java @@ -16,4 +16,6 @@ public interface SupCertSetDao { boolean updateCertSet(SupCertSetEntity supCertSetEntity); boolean deleteById(String id); + + boolean deleteAll(); } diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrCorpExportLogDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrCorpExportLogDao.java index 28462cd6..b8d98a8b 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrCorpExportLogDao.java +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrCorpExportLogDao.java @@ -19,5 +19,7 @@ public interface ThrCorpExportLogDao { boolean deleteById(@Param("id") String id); + boolean deleteByTime(); + String selectFilePathById(@Param("id") String id); } diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrCorpImportDetailDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrCorpImportDetailDao.java index dd9a12b0..a5f1209e 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrCorpImportDetailDao.java +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrCorpImportDetailDao.java @@ -20,4 +20,6 @@ public interface ThrCorpImportDetailDao { boolean deleteById(@Param("id") String id); boolean deleteByGenkey(@Param("genKey") String genKey); + + boolean deleteByTime(); } diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrCorpImportLogDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrCorpImportLogDao.java index 873205d6..7ebb8a79 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrCorpImportLogDao.java +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrCorpImportLogDao.java @@ -18,4 +18,6 @@ public interface ThrCorpImportLogDao { boolean deleteById(@Param("id") String id); + boolean deleteByTime(); + } diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrImportLogDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrImportLogDao.java index 277335f7..c0c3e452 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrImportLogDao.java +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrImportLogDao.java @@ -18,5 +18,7 @@ public interface ThrImportLogDao { boolean deleteById(@Param("id") String id); + boolean deleteByTime(); + } diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrOrderDetailDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrOrderDetailDao.java index c15b610f..e81d06cf 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrOrderDetailDao.java +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrOrderDetailDao.java @@ -26,4 +26,6 @@ public interface ThrOrderDetailDao { boolean deleteAll(); + boolean deleteByTime(); + } diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrOrderExportLogDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrOrderExportLogDao.java index 8c0d9b1e..15a95242 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrOrderExportLogDao.java +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrOrderExportLogDao.java @@ -17,4 +17,6 @@ public interface ThrOrderExportLogDao { boolean updateThrOrderExportLog(ThrOrderExportLogEntity thrOrderExportLogEntity); boolean deleteById(@Param("id") String id); + + boolean deleteByTime(); } diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrOrderImportDetailDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrOrderImportDetailDao.java index 60b6f2de..cc252590 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrOrderImportDetailDao.java +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrOrderImportDetailDao.java @@ -21,4 +21,6 @@ public interface ThrOrderImportDetailDao { boolean deleteById(@Param("id") String id); boolean deleteByGenkey(@Param("genKey") String genKey); + + boolean deleteByTime(); } diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrOrderImportLogDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrOrderImportLogDao.java index 04c5abd5..9da9f614 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrOrderImportLogDao.java +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrOrderImportLogDao.java @@ -18,4 +18,6 @@ public interface ThrOrderImportLogDao { boolean deleteById(@Param("id") String id); + boolean deleteByTime(); + } diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrProductsExportLogDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrProductsExportLogDao.java index 90e5d508..a0738f31 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrProductsExportLogDao.java +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrProductsExportLogDao.java @@ -25,4 +25,6 @@ public interface ThrProductsExportLogDao { * @return */ String selectFilePathById(@Param("id") String id); + + boolean deleteByTime(); } diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrProductsImportDetailDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrProductsImportDetailDao.java index af6380eb..5a02e69b 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrProductsImportDetailDao.java +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrProductsImportDetailDao.java @@ -21,6 +21,8 @@ public interface ThrProductsImportDetailDao { boolean deleteById(@Param("id") String id); + + boolean deleteByTime(); boolean deleteByGenkey(@Param("genKey") String genKey); } diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrProductsImportLogDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrProductsImportLogDao.java index e32cbcc9..c1853bbf 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrProductsImportLogDao.java +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrProductsImportLogDao.java @@ -16,4 +16,6 @@ public interface ThrProductsImportLogDao { boolean updateImportLog(ThrProductsImportLogEntity thrProductsImportLogEntity); boolean deleteById(@Param("id") String id); + + boolean deleteByTime(); } diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/basic/UdiInfoEntity.java b/api-admin/src/main/java/com/glxp/api/admin/entity/basic/UdiInfoEntity.java index 97dcaf19..07e136e6 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/basic/UdiInfoEntity.java +++ b/api-admin/src/main/java/com/glxp/api/admin/entity/basic/UdiInfoEntity.java @@ -306,11 +306,11 @@ public class UdiInfoEntity { this.versionNumber = versionNumber; } - public int getDiType() { + public Integer getDiType() { return diType; } - public void setDiType(int diType) { + public void setDiType(Integer diType) { this.diType = diType; } diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/inout/OrderEntity.java b/api-admin/src/main/java/com/glxp/api/admin/entity/inout/OrderEntity.java index 65366f6e..fc467cbc 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/inout/OrderEntity.java +++ b/api-admin/src/main/java/com/glxp/api/admin/entity/inout/OrderEntity.java @@ -88,4 +88,7 @@ public class OrderEntity { private String uploadStatus; private String wzUploadStatus; private String wzUploadResult; + + private String subInvCode; + } diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/inout/UnitMaintainPlatformEntity.java b/api-admin/src/main/java/com/glxp/api/admin/entity/inout/UnitMaintainPlatformEntity.java deleted file mode 100644 index f8bcf925..00000000 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/inout/UnitMaintainPlatformEntity.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.glxp.api.admin.entity.inout; - -import lombok.Data; - -/** - * 医院客户表 - */ -@Data -public class UnitMaintainPlatformEntity { - - private Integer id; - - /** - * 往来单位ID - */ - private String unitId; - - /** - * 客户ID - */ - private Long customerId; - - /** - * 平台ID - */ - private String platformId; - - /** - * 源单据类型 - */ - private String sourceAction; - - /** - * 目标单据类型 - */ - private String targetAction; - - /** - * 仓库码 - */ - private String invCode; - - /** - * 分库码 - */ - private String invSubCode; - - /** - * 应用名称 - */ - private String appid; - - /** - * 秘钥 - */ - private String secretKey; - - /** - * 应用ID - */ - private String apiKey; - -} \ No newline at end of file diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/inventory/DeviceCollectOrderEntity.java b/api-admin/src/main/java/com/glxp/api/admin/entity/inventory/DeviceCollectOrderEntity.java index eaf9c77a..f1fe0152 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/inventory/DeviceCollectOrderEntity.java +++ b/api-admin/src/main/java/com/glxp/api/admin/entity/inventory/DeviceCollectOrderEntity.java @@ -23,7 +23,7 @@ public class DeviceCollectOrderEntity { private String deptCode; /** - * 领用人 + * 创建人 */ private String createUser; @@ -46,4 +46,9 @@ public class DeviceCollectOrderEntity { * 状态 0：草稿 1：未审核 2：已审核 */ private Integer status; + + /** + * 领用人 + */ + private String collectUser; } \ No newline at end of file diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/purchase/PurApplyEntity.java b/api-admin/src/main/java/com/glxp/api/admin/entity/purchase/PurApplyEntity.java index 157e8118..8724afc9 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/purchase/PurApplyEntity.java +++ b/api-admin/src/main/java/com/glxp/api/admin/entity/purchase/PurApplyEntity.java @@ -76,7 +76,7 @@ public class PurApplyEntity { private String targetSubInv; private String targetBillType; - private String planBillNo; //生成采购计划单据号 + private boolean generatePlan; //是否已生成采购计划单 } diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/purchase/SupCertSetEntity.java b/api-admin/src/main/java/com/glxp/api/admin/entity/purchase/SupCertSetEntity.java index 43cb1793..3addcf91 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/purchase/SupCertSetEntity.java +++ b/api-admin/src/main/java/com/glxp/api/admin/entity/purchase/SupCertSetEntity.java @@ -21,9 +21,7 @@ public class SupCertSetEntity { private String remark; private Date updateTime; private Integer type; - private List flbmList; - private boolean isPass; public List getFlbmList() { diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/thrsys/ThrOrderEntity.java b/api-admin/src/main/java/com/glxp/api/admin/entity/thrsys/ThrOrderEntity.java index 6673d884..bad726a2 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/thrsys/ThrOrderEntity.java +++ b/api-admin/src/main/java/com/glxp/api/admin/entity/thrsys/ThrOrderEntity.java @@ -18,6 +18,7 @@ public class ThrOrderEntity { private String billFlag; private String thirdSysFk; private Date updateTime; + private Date thirdPartyDate; private String originType; //增加字段 diff --git a/api-admin/src/main/java/com/glxp/api/admin/httpclient/SpGetHttpClient.java b/api-admin/src/main/java/com/glxp/api/admin/httpclient/SpGetHttpClient.java index ff42b243..cdb2145a 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/httpclient/SpGetHttpClient.java +++ b/api-admin/src/main/java/com/glxp/api/admin/httpclient/SpGetHttpClient.java @@ -6,10 +6,9 @@ import com.alibaba.fastjson.TypeReference; import com.glxp.api.admin.entity.basic.BasicExportStatusEntity; import com.glxp.api.admin.entity.info.SyncDataSetEntity; import com.glxp.api.admin.entity.inout.IOOrderStatusEntity; -import com.glxp.api.admin.httpclient.UHttpClient; import com.glxp.api.admin.req.basic.BasicExportStatusRequest; import com.glxp.api.admin.req.inout.OrderStatusFilterRequest; -import com.glxp.api.admin.req.sync.BasicDataFilterRequest; +import com.glxp.api.admin.req.sync.PostDownloadInfo; import com.glxp.api.admin.res.PageSimpleResponse; import com.glxp.api.admin.res.basic.SpsSyncBusResponse; import com.glxp.api.admin.res.basic.SpsSyncDataResponse; @@ -20,7 +19,6 @@ import com.glxp.api.admin.service.info.SyncDataSetService; import com.glxp.api.admin.util.OkHttpCli; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; -import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -204,5 +202,13 @@ public class SpGetHttpClient { return response; } + public BaseResponse postDownloadInfo(PostDownloadInfo postDownloadInfo) { + String json = JSONUtil.toJsonStr(postDownloadInfo); + String result = okHttpCli.doPostJson(getIpUrl() + "/udisp/sync/downloadNow", json); + BaseResponse response = + JSONObject.parseObject(result, new TypeReference>() { + }); + return response; + } } diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/auth/AuthAdminQueryRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/auth/AuthAdminQueryRequest.java index 9df0874b..df01f03d 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/auth/AuthAdminQueryRequest.java +++ b/api-admin/src/main/java/com/glxp/api/admin/req/auth/AuthAdminQueryRequest.java @@ -23,4 +23,9 @@ public class AuthAdminQueryRequest extends ListPageRequest { //用户名 != private String neUserName; + /** + * 部门编码 + */ + private String deptCode; + } diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/basic/BasicEntrustRecRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/basic/BasicEntrustRecRequest.java index 1656166a..4118cb76 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/basic/BasicEntrustRecRequest.java +++ b/api-admin/src/main/java/com/glxp/api/admin/req/basic/BasicEntrustRecRequest.java @@ -19,4 +19,9 @@ public class BasicEntrustRecRequest extends ListPageRequest { private String entrustSubInv; private String invWarehouseCode; + /** + * 单据类型名称 + */ + private String name; + } diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/basic/BusTypeChangeFilterRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/basic/BusTypeChangeFilterRequest.java index b5fda52d..2d903a34 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/basic/BusTypeChangeFilterRequest.java +++ b/api-admin/src/main/java/com/glxp/api/admin/req/basic/BusTypeChangeFilterRequest.java @@ -8,4 +8,7 @@ public class BusTypeChangeFilterRequest extends ListPageRequest { private String action; private String originAction; + private String name; + private String originName; + private String targetName; } diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/basic/FilterCompanyProductRelevanceRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/basic/FilterCompanyProductRelevanceRequest.java index 8298efae..7fae042b 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/basic/FilterCompanyProductRelevanceRequest.java +++ b/api-admin/src/main/java/com/glxp/api/admin/req/basic/FilterCompanyProductRelevanceRequest.java @@ -12,4 +12,6 @@ public class FilterCompanyProductRelevanceRequest extends ListPageRequest { private String udiRlIdFk; private String unitFk; private String lastUpdateTime; + + private String key; } diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/basic/FilterUdiInfoRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/basic/FilterUdiInfoRequest.java index 025ddf07..30d1bc44 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/basic/FilterUdiInfoRequest.java +++ b/api-admin/src/main/java/com/glxp/api/admin/req/basic/FilterUdiInfoRequest.java @@ -58,5 +58,6 @@ public class FilterUdiInfoRequest extends ListPageRequest { private String unitFk; private String originUuid; private String relId; + private String companyName; } diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/business/StockOrderFilterRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/business/StockOrderFilterRequest.java index a09754b9..6bb0a620 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/business/StockOrderFilterRequest.java +++ b/api-admin/src/main/java/com/glxp/api/admin/req/business/StockOrderFilterRequest.java @@ -47,4 +47,6 @@ public class StockOrderFilterRequest extends ListPageRequest { @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private String endDate; + + private Boolean filterNoSelect; } diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/business/StockOrderPostRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/business/StockOrderPostRequest.java index 8bfd3e6b..9fa33663 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/business/StockOrderPostRequest.java +++ b/api-admin/src/main/java/com/glxp/api/admin/req/business/StockOrderPostRequest.java @@ -30,4 +30,6 @@ public class StockOrderPostRequest { private String deptCode; private BigDecimal price; private String unitIdFk; + + private Integer editStatus; } diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/business/StockSelectDataEntity.java b/api-admin/src/main/java/com/glxp/api/admin/req/business/StockSelectDataEntity.java index 5636ef78..b6de7bd7 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/business/StockSelectDataEntity.java +++ b/api-admin/src/main/java/com/glxp/api/admin/req/business/StockSelectDataEntity.java @@ -9,4 +9,6 @@ public class StockSelectDataEntity { private String expireDate; private String productDate; private String supId; + private String zczbhhzbapzbh; + private Integer count; } diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/inout/AddOrderRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/inout/AddOrderRequest.java index 539fddaa..3b395885 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/inout/AddOrderRequest.java +++ b/api-admin/src/main/java/com/glxp/api/admin/req/inout/AddOrderRequest.java @@ -35,5 +35,7 @@ public class AddOrderRequest { private boolean codeFillCheck; private String deptCode; + private String subInvCode; + private String invStorageCode; } diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/inout/OrderFilterRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/inout/OrderFilterRequest.java index a974b6fc..541c2bef 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/inout/OrderFilterRequest.java +++ b/api-admin/src/main/java/com/glxp/api/admin/req/inout/OrderFilterRequest.java @@ -48,5 +48,7 @@ public class OrderFilterRequest extends ListPageRequest { private boolean entrust; private String invWarehouseCode; + private String erpFk; + } diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/inout/PlatformLinkRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/inout/PlatformLinkRequest.java deleted file mode 100644 index 0f776867..00000000 --- a/api-admin/src/main/java/com/glxp/api/admin/req/inout/PlatformLinkRequest.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.glxp.api.admin.req.inout; - -import com.glxp.api.admin.req.ListPageRequest; -import lombok.Data; - -/** - * 医院客户请求参数 - */ -@Data -public class PlatformLinkRequest extends ListPageRequest { - - private Integer id; - - private String unitId; - - private String corpName; - - private String platformId; - - private String platformUsername; - - private String platformPassword; - - private String appid; - - private String apiKey; - - private String secretKey; - - private String sourceAction; - - private String targetAction; - - private String invCode; - - private String invSubCode; - - private String key; - - private String customerId; -} diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/inout/PostUdimsOrderDetailRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/inout/PostUdimsOrderDetailRequest.java deleted file mode 100644 index c4e247a7..00000000 --- a/api-admin/src/main/java/com/glxp/api/admin/req/inout/PostUdimsOrderDetailRequest.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.glxp.api.admin.req.inout; - -import lombok.Data; - -import java.math.BigDecimal; - -/** - * udims单据上传，单据详情参数 - */ -@Data -public class PostUdimsOrderDetailRequest { - - //uuid - private String uuidFk; - - //批次号 - private String batchNo; - - //价格 - private BigDecimal price; - - //销售发票号（第一票） - private String firstSalesInvNo; - - //销售发票号（第二票） - private String secSalesInvNo; - - //销售清单号（第二票） - private String secSalesListNo; - - //开票日期 - private String invoiceDate; - - -} diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/inout/PostUdimsOrderRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/inout/PostUdimsOrderRequest.java deleted file mode 100644 index afa7c6f8..00000000 --- a/api-admin/src/main/java/com/glxp/api/admin/req/inout/PostUdimsOrderRequest.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.glxp.api.admin.req.inout; - -import lombok.Data; - -import java.util.List; - -@Data -public class PostUdimsOrderRequest { - - List orderBeans; - private String customerId; - - - @Data - public static class OrderBean { - private String orderId; - private String corpOrderId; - private String action; - private String actDate; - private String actor; - private String mainAction; - private String fromCorpId; - private String fromCorp; - private String remark; - private String invStorageCode; - private String invWarehouseCode; - private List orderDetails; - private List codes; - - @Data - public static class CodeBean { - private String action; - private String mainAction; - private String code; - private String corpOrderId; - private String actor; - private String actDate; - private String fromCorpId; - private String fromCorp; - private String orderId; - private String batchNo; - private String produceDate; - private String expireDate; - private String serialNo; - private Integer count; - private String packageLevel; - private String warehouseCode; - - private String customerId; - private String nameCode; - private String supId;//供应商ID - private String invStorageCode; - private String invWarehouseCode; - private String relId; - private Integer status; - private String locStorageCode; - } - } - - -} diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/inventory/AddDeviceMAOrderRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/inventory/AddDeviceMAOrderRequest.java new file mode 100644 index 00000000..6ad348e7 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/req/inventory/AddDeviceMAOrderRequest.java @@ -0,0 +1,45 @@ +package com.glxp.api.admin.req.inventory; + +import lombok.Data; + +/** + * 添加设备养护记录请求参数 + */ +@Data +public class AddDeviceMAOrderRequest { + + /** + * 设备号 + */ + private String code; + + /** + * 创建人 + */ + private String createUser; + + /** + * 部门编码 + */ + private String deptCode; + + /** + * 创建时间 + */ + private String createTime; + + /** + * 养护状态 + */ + private Integer maintenanceStatus; + + /** + * 设备状态 + */ + private Integer deviceStatus; + + /** + * 备注 + */ + private String remark; +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/inventory/FilterDeviceCollectOrderDetailRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/inventory/FilterDeviceCollectOrderDetailRequest.java index 6565daaf..c02c852f 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/inventory/FilterDeviceCollectOrderDetailRequest.java +++ b/api-admin/src/main/java/com/glxp/api/admin/req/inventory/FilterDeviceCollectOrderDetailRequest.java @@ -24,4 +24,19 @@ public class FilterDeviceCollectOrderDetailRequest extends ListPageRequest { */ private String code; + /** + * DI + */ + private String nameCode; + + /** + * 部门编码 + */ + private String deptCode; + + /** + * 领用人 + */ + private String collectUser; + } diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/inventory/FilterInvProductRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/inventory/FilterInvProductRequest.java index d4d17780..6da60fc4 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/inventory/FilterInvProductRequest.java +++ b/api-admin/src/main/java/com/glxp/api/admin/req/inventory/FilterInvProductRequest.java @@ -44,4 +44,9 @@ public class FilterInvProductRequest extends ListPageRequest { private String supName; private String orderIdFk; + + /** + * 产品类别 + */ + private String cplb; } diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/inventory/InnerOrderRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/inventory/InnerOrderRequest.java index 920e1da2..b192c1e8 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/inventory/InnerOrderRequest.java +++ b/api-admin/src/main/java/com/glxp/api/admin/req/inventory/InnerOrderRequest.java @@ -6,6 +6,9 @@ import lombok.Data; @Data public class InnerOrderRequest extends ListPageRequest { - private String recordKey; + + private String startDate; + + private String endDate; } diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/inventory/InvCountOrderPrintRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/inventory/InvCountOrderPrintRequest.java new file mode 100644 index 00000000..aea0222f --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/req/inventory/InvCountOrderPrintRequest.java @@ -0,0 +1,21 @@ +package com.glxp.api.admin.req.inventory; + +import lombok.Data; + +/** + * 盘点单据打印参数 + */ +@Data +public class InvCountOrderPrintRequest { + + /** + * 盘点单号 + */ + private String orderId; + + /** + * 模板ID + */ + private String templateId; + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/purchase/FilterCertSetsRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/purchase/FilterCertSetsRequest.java index eacdfe96..f3442c1b 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/purchase/FilterCertSetsRequest.java +++ b/api-admin/src/main/java/com/glxp/api/admin/req/purchase/FilterCertSetsRequest.java @@ -10,5 +10,7 @@ public class FilterCertSetsRequest extends ListPageRequest { private Integer type; private Integer need; + private String lastUpdateTime; + } diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/purchase/PurApplyRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/purchase/PurApplyRequest.java index c112a398..8f9b09cd 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/purchase/PurApplyRequest.java +++ b/api-admin/src/main/java/com/glxp/api/admin/req/purchase/PurApplyRequest.java @@ -17,6 +17,7 @@ import java.util.Date; public class PurApplyRequest extends ListPageRequest { + /** * */ @@ -102,7 +103,9 @@ public class PurApplyRequest extends ListPageRequest { private String startDate; private String endDate; - + private Integer generatePlan; private boolean audtoPlan; + private Integer applyType; + } diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/sync/PostDownloadInfo.java b/api-admin/src/main/java/com/glxp/api/admin/req/sync/PostDownloadInfo.java new file mode 100644 index 00000000..c04aff5d --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/req/sync/PostDownloadInfo.java @@ -0,0 +1,16 @@ +package com.glxp.api.admin.req.sync; + +import lombok.Data; + +/** + * 下载任务信息 + */ +@Data +public class PostDownloadInfo { + + /** + * 下载类型 + */ + private Integer type; + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/basic/BussinessTypResponse.java b/api-admin/src/main/java/com/glxp/api/admin/res/basic/BussinessTypResponse.java index e284ef2b..4a756742 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/res/basic/BussinessTypResponse.java +++ b/api-admin/src/main/java/com/glxp/api/admin/res/basic/BussinessTypResponse.java @@ -76,4 +76,8 @@ public class BussinessTypResponse { private boolean secCheckCopy; private boolean checkSelect; //判断多选框是否勾选 + + private boolean checkSp; + + private boolean secCheckSp; //自助平台同步 } diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/basic/SpsSyncDataResponse.java b/api-admin/src/main/java/com/glxp/api/admin/res/basic/SpsSyncDataResponse.java index b11ac78d..ad300b19 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/res/basic/SpsSyncDataResponse.java +++ b/api-admin/src/main/java/com/glxp/api/admin/res/basic/SpsSyncDataResponse.java @@ -8,10 +8,7 @@ import com.glxp.api.admin.entity.inout.WarehouseUserEntity; import com.glxp.api.admin.entity.inventory.InvBusUserEntity; import com.glxp.api.admin.entity.inventory.InvSubWarehouseEntity; import com.glxp.api.admin.entity.inventory.InvWarehouseEntity; -import com.glxp.api.admin.entity.purchase.SupCertEntity; -import com.glxp.api.admin.entity.purchase.SupCompanyEntity; -import com.glxp.api.admin.entity.purchase.SupManufacturerEntity; -import com.glxp.api.admin.entity.purchase.SupProductEntity; +import com.glxp.api.admin.entity.purchase.*; import com.glxp.api.admin.entity.thrsys.*; import lombok.Data; @@ -55,5 +52,6 @@ public class SpsSyncDataResponse { List supManufacturerEntities; List supProductEntities; List supCertEntities; + List supCertSetEntities; } diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/basic/SupCertSetResponse.java b/api-admin/src/main/java/com/glxp/api/admin/res/basic/SupCertSetResponse.java new file mode 100644 index 00000000..db620807 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/res/basic/SupCertSetResponse.java @@ -0,0 +1,22 @@ +package com.glxp.api.admin.res.basic; + +import lombok.Data; + +import java.util.Date; + +@Data +public class SupCertSetResponse { + private Integer id; + private String name; + private boolean need; + private Integer foreign; + private String cplx; + private String hchzsb; + private String flbm; + private Integer imports; + private String remark; + private Date updateTime; + private Integer type; + private boolean isPass; + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/inout/StockOrderResponse.java b/api-admin/src/main/java/com/glxp/api/admin/res/inout/StockOrderResponse.java index 1e2282d8..33de8e80 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/res/inout/StockOrderResponse.java +++ b/api-admin/src/main/java/com/glxp/api/admin/res/inout/StockOrderResponse.java @@ -21,4 +21,7 @@ public class StockOrderResponse extends StockOrderEntity { //当前分库名称 private String invWarehouseName; + //单据备注 + private String printRemark; + } diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/inventory/DeviceCollectOrderDetailResponse.java b/api-admin/src/main/java/com/glxp/api/admin/res/inventory/DeviceCollectOrderDetailResponse.java index 53ae48e8..42948328 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/res/inventory/DeviceCollectOrderDetailResponse.java +++ b/api-admin/src/main/java/com/glxp/api/admin/res/inventory/DeviceCollectOrderDetailResponse.java @@ -49,4 +49,9 @@ public class DeviceCollectOrderDetailResponse extends DeviceCollectOrderDetailEn */ private Boolean editSerialNo; + /** + * 部门名称 + */ + private String deptName; + } diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/purchase/PurApplyResponse.java b/api-admin/src/main/java/com/glxp/api/admin/res/purchase/PurApplyResponse.java index 990f25aa..0a97e1f0 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/res/purchase/PurApplyResponse.java +++ b/api-admin/src/main/java/com/glxp/api/admin/res/purchase/PurApplyResponse.java @@ -8,6 +8,7 @@ import java.util.Date; public class PurApplyResponse { + /** * */ @@ -69,7 +70,11 @@ public class PurApplyResponse { private String subInvName; private String auditRemark; - private String planBillNo; //生成采购计划单据号 + private String targetInv; + private String targetSubInv; + private String targetBillType; - private boolean audtoPlan; + private String planBillNo; //生成采购计划单据号 + private boolean generatePlan; + private boolean audtoPlan; /// } diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/auth/DeptService.java b/api-admin/src/main/java/com/glxp/api/admin/service/auth/DeptService.java index 21514b48..e4fa6706 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/auth/DeptService.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/auth/DeptService.java @@ -23,4 +23,5 @@ public interface DeptService { boolean deleteAll(); + DeptEntity findByDeptCode(String dept); } diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/auth/impl/DeptServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/auth/impl/DeptServiceImpl.java index ee886a54..30e4c137 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/auth/impl/DeptServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/auth/impl/DeptServiceImpl.java @@ -87,4 +87,9 @@ public class DeptServiceImpl implements DeptService { public boolean deleteAll() { return deptDao.deleteAll(); } + + @Override + public DeptEntity findByDeptCode(String deptCode) { + return deptDao.selectByCode(deptCode); + } } diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/basic/BasicDownloadService.java b/api-admin/src/main/java/com/glxp/api/admin/service/basic/BasicDownloadService.java index 287b1e3a..efeee8be 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/basic/BasicDownloadService.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/basic/BasicDownloadService.java @@ -15,5 +15,9 @@ public interface BasicDownloadService { boolean deleteById(String id); + boolean deleteByTime(); + + + boolean updateDownloadStatus(BasicDownloadStatusEntity basicDownloadStatusEntity); } diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/basic/BasicExportService.java b/api-admin/src/main/java/com/glxp/api/admin/service/basic/BasicExportService.java index 5bfacd72..f1f3a885 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/basic/BasicExportService.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/basic/BasicExportService.java @@ -17,5 +17,7 @@ public interface BasicExportService { boolean deleteById(String id); + boolean deleteByTime(); + boolean updateExportStatus(BasicExportStatusEntity warehouseEntity); } diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/basic/BasicUnitMaintainService.java b/api-admin/src/main/java/com/glxp/api/admin/service/basic/BasicUnitMaintainService.java index 9b920472..276b00ec 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/basic/BasicUnitMaintainService.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/basic/BasicUnitMaintainService.java @@ -3,7 +3,6 @@ package com.glxp.api.admin.service.basic; import com.glxp.api.admin.entity.basic.BasicUnitMaintainEntity; import com.glxp.api.admin.req.basic.BasicUnitMaintainFilterRequest; -import com.glxp.api.admin.req.basic.BasicUnitMaintainSaveRequest; import java.util.List; @@ -38,4 +37,5 @@ public interface BasicUnitMaintainService { List batchSelectByErpIds(List erpIds); + List batchSelectByErpIdsAndName(List erpIds, String name); } diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/basic/BussinessLocalTypeService.java b/api-admin/src/main/java/com/glxp/api/admin/service/basic/BussinessLocalTypeService.java index f9e7b380..21644161 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/basic/BussinessLocalTypeService.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/basic/BussinessLocalTypeService.java @@ -31,7 +31,7 @@ public interface BussinessLocalTypeService { BussinessLocalTypeEntity findByAction(String action); BussinessLocalTypeEntity findBTByAction(String action); - BussinessLocalTypeEntity findBTByName(String name); + BussinessLocalTypeEntity findBTByName(String name,String id); boolean insertBussinessType(BussinessLocalTypeEntity bussinessLocalTypeEntity); diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/BasicDownloadServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/BasicDownloadServiceImpl.java index 01ee543f..f46a91ed 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/BasicDownloadServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/BasicDownloadServiceImpl.java @@ -52,6 +52,11 @@ public class BasicDownloadServiceImpl implements BasicDownloadService { return basicDownloadDao.deleteById(id); } + @Override + public boolean deleteByTime() { + return basicDownloadDao.deleteByTime(); + } + @Override public boolean updateDownloadStatus(BasicDownloadStatusEntity basicDownloadStatusEntity) { return basicDownloadDao.updateDownloadStatus(basicDownloadStatusEntity); diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/BasicExportServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/BasicExportServiceImpl.java index 012841da..2db1d687 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/BasicExportServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/BasicExportServiceImpl.java @@ -54,6 +54,10 @@ public class BasicExportServiceImpl implements BasicExportService { return basicExportDao.deleteById(id); } + @Override + public boolean deleteByTime() { + return basicExportDao.deleteByTime(); + } @Override public boolean updateExportStatus(BasicExportStatusEntity basicExportStatusEntity) { return basicExportDao.updateExportStatus(basicExportStatusEntity); diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/BasicUnitMaintainServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/BasicUnitMaintainServiceImpl.java index bf843ee3..83c206f6 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/BasicUnitMaintainServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/BasicUnitMaintainServiceImpl.java @@ -87,6 +87,11 @@ public class BasicUnitMaintainServiceImpl implements BasicUnitMaintainService { return basicUnitMaintainDao.batchSelectByErpIds(erpIds); } + @Override + public List batchSelectByErpIdsAndName(List erpIds, String name) { + return basicUnitMaintainDao.batchSelectByErpIdsAndName(erpIds, name); + } + @Override public BasicUnitMaintainEntity selectById(String id) { return basicUnitMaintainDao.selectById(id); diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/BussinessLocalTypeServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/BussinessLocalTypeServiceImpl.java index 392a1853..2c18193e 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/BussinessLocalTypeServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/BussinessLocalTypeServiceImpl.java @@ -147,17 +147,12 @@ public class BussinessLocalTypeServiceImpl implements BussinessLocalTypeService } @Override - public BussinessLocalTypeEntity findBTByName(String name) { + public BussinessLocalTypeEntity findBTByName(String name,String id) { if (StrUtil.isEmpty(name)) { return null; } - BussinessLocalTypeFilterRequest bussinessTypeFilterRequest = new BussinessLocalTypeFilterRequest(); - bussinessTypeFilterRequest.setName(name); - List data = bussinessLocalTypeDao.filterList(bussinessTypeFilterRequest); - if (data != null && data.size() > 0) { - return data.get(0); - } - return null; + BussinessLocalTypeEntity bussinessLocalTypeEntity=bussinessLocalTypeDao.selectByName(name,id); + return bussinessLocalTypeEntity; } @Override diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/business/impl/StockOrderServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/business/impl/StockOrderServiceImpl.java index a4b375f0..5b3c3924 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/business/impl/StockOrderServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/business/impl/StockOrderServiceImpl.java @@ -16,6 +16,7 @@ import com.glxp.api.admin.dao.business.StockOrderDao; import com.glxp.api.admin.dao.business.StockOrderDetailDao; import com.glxp.api.admin.dao.inout.CodesDao; import com.glxp.api.admin.dao.inout.OrderDao; +import com.glxp.api.admin.dao.inout.OrderDetailDao; import com.glxp.api.admin.dao.inventory.InvPreInProductDao; import com.glxp.api.admin.dao.inventory.InvPreInProductDetailDao; import com.glxp.api.admin.dao.inventory.InvProductDao; @@ -92,6 +93,8 @@ public class StockOrderServiceImpl implements StockOrderService { @Resource BussinessTypeService bussinessTypeService; + @Resource + private OrderDetailDao orderDetailDao; @Override @@ -300,7 +303,18 @@ public class StockOrderServiceImpl implements StockOrderService { //查询业务单据 StockOrderEntity stockOrderEntity = stockOrderDao.selectByBillNo(billNo); //查询扫码单据 - OrderEntity orderEntity = orderDao.selectByBillNo(billNo); + OrderEntity orderEntity=new OrderEntity(); + List orderEntityList = orderDao.selectByBillNoAndStatus(billNo); + if(orderEntityList.size()>1){ + for (OrderEntity obj:orderEntityList){ + if(obj.getErpFk().equals(billNo)){ + orderEntity=obj; + break; + } + } + }else{ + orderEntity=orderEntityList.get(0); + } BussinessTypeEntity bussinessTypeEntity = bussinessTypeService.findBTByAction(orderEntity.getAction()); if (stockOrderEntity.getStatus().equals(ConstantStatus.SORDER_CHECKED)) { //回退未验收单据 @@ -319,19 +333,23 @@ public class StockOrderServiceImpl implements StockOrderService { orderEntity.setErpFk(""); stockOrderDao.updateById(stockOrderEntity); orderDao.updateOrder(orderEntity); + //置空扫码单据详情关联的业务单据号 + orderDetailDao.updateErpOrderId(orderEntity.getId(), null); + } else { orderEntity.setErpFk(""); stockOrderDao.deleteById(stockOrderEntity.getId()); orderEntity.setStatus(ConstantStatus.ORDER_STATUS_PROCESS); orderDao.updateOrder(orderEntity); + //置空扫码单据详情关联的业务单据号 + orderDetailDao.updateErpOrderId(orderEntity.getId(), null); + List warehouseEntityList = codesDao.findByReceiptId(orderEntity.getId()); if (CollUtil.isNotEmpty(warehouseEntityList)) { codesTempService.insertCodesTemp(warehouseEntityList); codesDao.deleteByOrderId(orderEntity.getId()); } } - - } else { //回退已完成单据 @@ -451,7 +469,7 @@ public class StockOrderServiceImpl implements StockOrderService { orderEntity.setStatus(ConstantStatus.ORDER_STATUS_CHECK); orderEntity.setErpFk(""); stockOrderDao.updateById(stockOrderEntity); - orderDao.updateOrder(orderEntity); +// orderDao.updateOrder(orderEntity); } else { orderEntity.setErpFk(""); stockOrderDao.deleteById(stockOrderEntity.getId()); @@ -460,7 +478,7 @@ public class StockOrderServiceImpl implements StockOrderService { List warehouseEntityList = codesDao.findByReceiptId(orderEntity.getId()); if (CollUtil.isNotEmpty(warehouseEntityList)) { codesTempService.insertCodesTemp(warehouseEntityList); - codesDao.deleteByOrderId(orderEntity.getId()); +// codesDao.deleteByOrderId(orderEntity.getId()); } } } diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/info/PlatformService.java b/api-admin/src/main/java/com/glxp/api/admin/service/info/PlatformService.java deleted file mode 100644 index 0a7b22e2..00000000 --- a/api-admin/src/main/java/com/glxp/api/admin/service/info/PlatformService.java +++ /dev/null @@ -1,101 +0,0 @@ -package com.glxp.api.admin.service.info; - - -import com.glxp.api.admin.entity.info.PlatformEntity; -import com.glxp.api.admin.entity.inout.UnitMaintainPlatformEntity; -import com.glxp.api.admin.req.inout.PlatformLinkRequest; -import com.glxp.api.admin.res.info.PlatformLinkResponse; -import com.glxp.api.common.res.BaseResponse; - -import java.util.List; -import java.util.Map; - -public interface PlatformService { - - - public int save(PlatformEntity platformEntity); - - public int remove(String id); - - public BaseResponse update(PlatformEntity platformEntity); - - List list(Map map); - - int count(Map map); - - PlatformEntity get(String id); - - /** - * 查询往来单位和自助平台关联数据 - * - * @param platformLinkRequest - * @return - */ - List getLinkPlatformList(PlatformLinkRequest platformLinkRequest); - - /** - * 往来单位和自助平台解绑 - * - * @param id - */ - void unbindPlatform(String id); - - /** - * 获取自助平台单据类型 - * - * @param platformId - * @return - */ - BaseResponse getTargetActions(String platformId, String invSubCode); - - - //获取自助平台一级仓库 - BaseResponse getTargetInv(String platformId); - - - //获取自助平台一级仓库所属分库 - BaseResponse getTargetSubInv(String platformId, String invCode); - - /** - * 测试自助平台连通性 - * - * @param host - * @return - */ - BaseResponse testPlatformConnection(String host); - - /** - * 根据ID查询自助平台信息 - * - * @param platformId - * @return - */ - PlatformEntity getPlatformById(String platformId); - - /** - * 保存医院客户关联关系 - * - * @param unitMaintainPlatform - */ - void saveUnitPlatform(UnitMaintainPlatformEntity unitMaintainPlatform); - - /** - * 校验关联数据 - * - * @param platformLinkRequest - * @return - */ - public String verifyUnitMaintainPlatform(PlatformLinkRequest platformLinkRequest); - - /** - * 查询关联数据 - * - * @param customerId - * @param action - * @param unitId - * @return - */ - UnitMaintainPlatformEntity findLinkData(long customerId, String action, String unitId); - - -} diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/info/impl/PlatformServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/info/impl/PlatformServiceImpl.java deleted file mode 100644 index 7b04b9e2..00000000 --- a/api-admin/src/main/java/com/glxp/api/admin/service/info/impl/PlatformServiceImpl.java +++ /dev/null @@ -1,272 +0,0 @@ -package com.glxp.api.admin.service.info.impl; - -import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.util.IdUtil; -import cn.hutool.core.util.StrUtil; -import cn.hutool.http.HttpUtil; -import cn.hutool.json.JSONUtil; -import com.alibaba.fastjson.JSON; -import com.github.pagehelper.PageHelper; -import com.glxp.api.admin.dao.info.PlatformDao; -import com.glxp.api.admin.dao.inout.UnitMaintainPlatformDao; -import com.glxp.api.admin.entity.info.PlatformEntity; -import com.glxp.api.admin.entity.inout.UnitMaintainPlatformEntity; -import com.glxp.api.admin.req.inout.PlatformLinkRequest; -import com.glxp.api.admin.res.info.PlatformLinkResponse; -import com.glxp.api.admin.service.info.PlatformService; -import com.glxp.api.admin.util.HttpClient; -import com.glxp.api.common.enums.ResultEnum; -import com.glxp.api.common.res.BaseResponse; -import com.glxp.api.common.util.ResultVOUtils; -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.StringUtils; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import javax.annotation.Resource; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -@Slf4j -@Service -@Transactional(rollbackFor = Exception.class) -public class PlatformServiceImpl implements PlatformService { - - @Resource - private PlatformDao platformDao; - @Resource - private UnitMaintainPlatformDao unitMaintainPlatformDao; - - public int save(PlatformEntity platformEntity) { - if (StringUtils.isEmpty(platformEntity.getId())) { - platformEntity.setId(String.valueOf(IdUtil.getSnowflake().nextId())); - } - return platformDao.insert(platformEntity); - } - - public int remove(String id) { - return platformDao.deleteById(id); - } - - public BaseResponse update(PlatformEntity platformEntity) { - if (StrUtil.isBlank(platformEntity.getId())) { - if (!verifyPlatformExist(platformEntity)) { - save(platformEntity); - return ResultVOUtils.success("添加成功"); - } else { - return ResultVOUtils.error(500, "已存在相同数据"); - } - } - platformDao.updateById(platformEntity); - return ResultVOUtils.success("更新成功"); - } - - private boolean verifyPlatformExist(PlatformEntity platformEntity) { - //校验名称和地址是否重复 - List list = platformDao.selectByNameAndHost(platformEntity.getName(), platformEntity.getHost()); - if (CollUtil.isEmpty(list)) { - return false; - } - return true; - } - - public List list(Map map) { - if (map.get("page") != null && map.get("limit") != null) { - Integer page = Integer.valueOf(String.valueOf(map.get("page"))); - Integer limit = Integer.valueOf(String.valueOf(map.get("limit"))); - PageHelper.offsetPage((page - 1) * limit, limit); - } - List list = platformDao.selectList(String.valueOf(map.get("id")), String.valueOf(map.get("name")), String.valueOf(map.get("host"))); - return list; - } - - public int count(Map map) { - return platformDao.count(map); - } - - public PlatformEntity get(String id) { - return platformDao.get(id); - } - - /** - * 查询往来单位和自助平台关联数据 - * - * @param platformLinkRequest - * @return - */ - public List getLinkPlatformList(PlatformLinkRequest platformLinkRequest) { - if (null == platformLinkRequest) { - return Collections.emptyList(); - } - if (null != platformLinkRequest.getPage() && null != platformLinkRequest.getLimit()) { - PageHelper.offsetPage((platformLinkRequest.getPage() - 1) * platformLinkRequest.getLimit(), platformLinkRequest.getLimit()); - } - return unitMaintainPlatformDao.getLinkPlatformList(platformLinkRequest.getCustomerId(), platformLinkRequest.getKey()); - } - - /** - * 往来单位和自助平台解绑 - * - * @param id - */ - public void unbindPlatform(String id) { - unitMaintainPlatformDao.deleteById(id); - } - - /** - * 获取自助平台单据类型 - * - * @param platformId - * @return - */ - public BaseResponse getTargetActions(String platformId, String invSubCode) { - PlatformEntity platformEntity = platformDao.get(platformId); - if (null == platformEntity) { - return ResultVOUtils.success(); - } - String host = platformEntity.getHost(); - Map paramMap = new HashMap<>(); - paramMap.put("invSubCode", invSubCode); - String resp = HttpClient.mipsGet(host + "/udiwms/bussinessType/udimsFilter", paramMap); - if (StrUtil.isNotBlank(resp) && resp.contains("20000")) { - return JSON.parseObject(resp, BaseResponse.class); - } else { - log.error("获取自助平台单据类型异常"); - return ResultVOUtils.error(500, "获取自助平台接口异常"); - } - } - - //获取自助平台一级仓库 - public BaseResponse getTargetInv(String platformId) { - PlatformEntity platformEntity = platformDao.get(platformId); - if (null == platformEntity) { - return ResultVOUtils.success(); - } - String host = platformEntity.getHost(); - String url = host + "/spms/inv/warehouse/filterInv/forUdims"; - log.info("拉取自助平台仓库数据：" + url); - String resp = HttpUtil.get(url); - log.info("拉取结果：" + resp); - if (StrUtil.isNotBlank(resp) && resp.contains("20000")) { - try { - return JSON.parseObject(resp, BaseResponse.class); - } catch (Exception e) { - log.error("格式化自助平台仓库信息异常", e); - return ResultVOUtils.error(500, "调用自助平台接口异常"); - } - } else { - log.error("获取自助平台仓库失败"); - return ResultVOUtils.error(500, "调用自助平台接口异常"); - } - } - - - //获取自助平台一级仓库所属分库 - public BaseResponse getTargetSubInv(String platformId, String invCode) { - PlatformEntity platformEntity = platformDao.get(platformId); - if (null == platformEntity) { - return ResultVOUtils.success(); - } - String host = platformEntity.getHost(); - Map paramMap = new HashMap<>(); - paramMap.put("invCode", invCode); - String resp = HttpClient.mipsGet(host + "/spms/sub/inv/warehouse/getSubInvForUdims", paramMap); - if (StrUtil.isNotBlank(resp) && resp.contains("20000")) { - return JSON.parseObject(resp, BaseResponse.class); - } else { - log.error("获取自助平台分库失败"); - return ResultVOUtils.error(500, "获取自助平台接口异常"); - } - } - - /** - * 测试自助平台连通性 - * - * @param host - * @return - */ - public BaseResponse testPlatformConnection(String host) { - String testUrl = host + "/udiwms/auth/device/connect"; - String response = HttpUtil.get(testUrl); - if (StrUtil.isNotBlank(response)) { - try { - BaseResponse result = JSONUtil.toBean(response, BaseResponse.class); - if (result.getCode() == 20000) { - return ResultVOUtils.success(); - } - return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); - } catch (Exception e) { - return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); - } - } else { - return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); - } - } - - /** - * 根据ID查询自助平台信息 - * - * @param platformId - * @return - */ - public PlatformEntity getPlatformById(String platformId) { - return platformDao.selectById(platformId); - } - - /** - * 保存医院客户关联关系 - * - * @param unitMaintainPlatformEntity - */ - public void saveUnitPlatform(UnitMaintainPlatformEntity unitMaintainPlatformEntity) { - if (null != unitMaintainPlatformEntity.getId()) { - unitMaintainPlatformDao.updateById(unitMaintainPlatformEntity); - } else { - unitMaintainPlatformDao.insert(unitMaintainPlatformEntity); - } - - //更新当前客户关联数据的所有key - List list = unitMaintainPlatformDao.selectByCustomerId(unitMaintainPlatformEntity.getCustomerId()); - if (CollUtil.isNotEmpty(list)) { - for (UnitMaintainPlatformEntity maintainPlatform : list) { - maintainPlatform.setAppid(unitMaintainPlatformEntity.getAppid()); - maintainPlatform.setApiKey(unitMaintainPlatformEntity.getApiKey()); - maintainPlatform.setSecretKey(unitMaintainPlatformEntity.getSecretKey()); - unitMaintainPlatformDao.updateById(maintainPlatform); - } - } - - } - - @Override - public String verifyUnitMaintainPlatform(PlatformLinkRequest platformLinkRequest) { - List list = unitMaintainPlatformDao.selectList(platformLinkRequest); - if (CollUtil.isEmpty(list)) { - return "success"; - } else { - for (UnitMaintainPlatformEntity maintainPlatform : list) { - if (maintainPlatform.getId().equals(platformLinkRequest.getId())) { - return "success"; - } else { - return "重复添加"; - } - } - } - return "重复添加"; - } - - /** - * 查询关联数据 - * - * @param customerId - * @param action - * @param unitId - * @return - */ - public UnitMaintainPlatformEntity findLinkData(long customerId, String action, String unitId) { - return unitMaintainPlatformDao.findLinkData(customerId, action, unitId); - } - -} diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inout/OrderService.java b/api-admin/src/main/java/com/glxp/api/admin/service/inout/OrderService.java index 6c14a45c..acfce749 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/inout/OrderService.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/inout/OrderService.java @@ -138,4 +138,21 @@ public interface OrderService { * @param responseList */ void queryInvName(List responseList); + + /** + * 更新单据备注 + * + * @param id + * @param printRemark + * @return + */ + boolean updatePrintRemark(String id, String printRemark); + + /** + * 查询单据备注 + * + * @param resultList + */ + void queryPrintRemark(List resultList); + } diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inout/WarehouseUserService.java b/api-admin/src/main/java/com/glxp/api/admin/service/inout/WarehouseUserService.java index 42242e83..81c79011 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/inout/WarehouseUserService.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/inout/WarehouseUserService.java @@ -5,6 +5,7 @@ import com.glxp.api.admin.entity.auth.AuthAdmin; import com.glxp.api.admin.entity.inout.WarehouseUserEntity; import com.glxp.api.admin.req.inventory.FilterInvLinkDataRequest; import com.glxp.api.admin.req.inventory.FilterInvUserRequest; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -49,6 +50,8 @@ public interface WarehouseUserService { */ void deleteWarehouseUser(Integer id); + void deleteByCodeAndId(Long id, String code); + /** * 查询分仓关联的用户列表 * diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inout/impl/CodesServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/inout/impl/CodesServiceImpl.java index 39b443b7..5c0e5d44 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/inout/impl/CodesServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/inout/impl/CodesServiceImpl.java @@ -225,7 +225,8 @@ public class CodesServiceImpl implements CodesService { } else { filterInvProductRequest.setBatchNo(invProductDetailEntity.getBatchNo()); } - InvProductEntity invProductEntity = invProductDao.filterInvProduct(filterInvProductRequest).get(0); + List invProductEntityList=invProductDao.filterInvProduct(filterInvProductRequest); + InvProductEntity invProductEntity = invProductEntityList.get(0); if (invProductDetailEntity.getMainAction().equals(ConstantType.TYPE_PUT)) { //入库 invProductEntity.setInCount(invProductEntity.getInCount() - 1); @@ -278,7 +279,7 @@ public class CodesServiceImpl implements CodesService { StockOrderDetailEntity stockOrderDetailEntity = stockOrderDetailEntities.get(0); if (stockOrderDetailEntity.getReCount() > 1) { stockOrderDetailEntity.setReCount(stockOrderDetailEntity.getReCount()- 1); //实际数量 - 1 - stockOrderDetailEntity.setSweepCount(stockOrderDetailEntity.getSweepCount() -1); //扫码数量 -1 + stockOrderDetailEntity.setSweepCount(stockOrderDetailEntity.getSweepCount()==null?0:stockOrderDetailEntity.getSweepCount() -1); //扫码数量 -1 //更新业务单据详情 stockOrderDetailDao.updateById(stockOrderDetailEntity); } else { diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inout/impl/OrderServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/inout/impl/OrderServiceImpl.java index 33f962a2..1e8f0d00 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/inout/impl/OrderServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/inout/impl/OrderServiceImpl.java @@ -336,8 +336,6 @@ public class OrderServiceImpl implements OrderService { supplementOrder.setMainAction(supplementType.getMainAction()); supplementOrder.setAction(supplementType.getAction()); supplementOrder.setErpFk(null); -// String time = DateUtil.getBeforeMinute(supplementOrder.getActDate(), 5); -// supplementOrder.setActDate(time); //复制码表 List codes = codesDao.findByReceiptId(order.getId()); @@ -373,6 +371,7 @@ public class OrderServiceImpl implements OrderService { return ResultVOUtils.success(); } + @Override public List checkSupplementOrder(List stockOrderEntityList) { if (CollUtil.isEmpty(stockOrderEntityList)) { @@ -407,10 +406,6 @@ public class OrderServiceImpl implements OrderService { @Override public List checkSubmitOrder(List orderResponseList) { - if (CollUtil.isEmpty(orderResponseList)) { - return Collections.emptyList(); - } - //查询第三方系统的 List actions = new ArrayList<>(); for (StockOrderResponse stockOrderResponse : orderResponseList) { @@ -540,6 +535,19 @@ public class OrderServiceImpl implements OrderService { } } + @Override + public boolean updatePrintRemark(String orderId, String printRemark) { + return orderDao.updatePrintRemark(orderId, printRemark); + } + + @Override + public void queryPrintRemark(List resultList) { + for (StockOrderResponse stockOrderResponse : resultList) { + String printRemark = orderDao.selectPrintRemarkById(stockOrderResponse.getOrderIdFk()); + stockOrderResponse.setPrintRemark(printRemark); + } + } + @Transactional(rollbackFor = Exception.class) @Override public void deleteOrders(List ids) { diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inout/impl/WarehouseUserServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/inout/impl/WarehouseUserServiceImpl.java index 8cc8f8b6..b5670a16 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/inout/impl/WarehouseUserServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/inout/impl/WarehouseUserServiceImpl.java @@ -105,6 +105,13 @@ public class WarehouseUserServiceImpl implements WarehouseUserService { } } + @Override + public void deleteByCodeAndId(Long id, String code) { + if(null !=id && null !=code){ + warehouseUserDao.deleteByCodeAndId(id,code); + } + } + @Override public List getWarehouseUserList(FilterInvLinkDataRequest filterInvLinkDataRequest) { if (filterInvLinkDataRequest == null) { diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/DeviceCollectOrderDetailService.java b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/DeviceCollectOrderDetailService.java index 66ed5f94..2dc0ce23 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/DeviceCollectOrderDetailService.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/DeviceCollectOrderDetailService.java @@ -52,4 +52,12 @@ public interface DeviceCollectOrderDetailService { * @return */ BaseResponse checkCode(String code); + + /** + * 查询设备资产列表 + * + * @param detailRequest + * @return + */ + List getDeviceList(FilterDeviceCollectOrderDetailRequest detailRequest); } diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/DeviceMAOrderDetailService.java b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/DeviceMAOrderDetailService.java index 1b7c92f3..e0fe0467 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/DeviceMAOrderDetailService.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/DeviceMAOrderDetailService.java @@ -21,4 +21,11 @@ public interface DeviceMAOrderDetailService { BaseResponse deleteDetail(DeviceMAOrderDetailEntity detailEntity); + /** + * 根据条码查询养护设备展示信息 + * + * @param code + * @return + */ + BaseResponse filterMAOrderDetail(String code); } diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/DeviceMAOrderService.java b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/DeviceMAOrderService.java index 8be29d71..5f4fc68c 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/DeviceMAOrderService.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/DeviceMAOrderService.java @@ -1,6 +1,7 @@ package com.glxp.api.admin.service.inventory; import com.glxp.api.admin.entity.inventory.DeviceMAOrderEntity; +import com.glxp.api.admin.req.inventory.AddDeviceMAOrderRequest; import com.glxp.api.admin.req.inventory.FilterDeviceMAOrderRequest; import com.glxp.api.common.res.BaseResponse; @@ -43,4 +44,11 @@ public interface DeviceMAOrderService { */ BaseResponse deleteDeviceMAOrder(Integer id); + /** + * 添加设备养护记录 + * + * @param addDeviceMAOrderRequest + * @return + */ + BaseResponse addDeviceMAOrder(AddDeviceMAOrderRequest addDeviceMAOrderRequest); } diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/InvProductDetailService.java b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/InvProductDetailService.java index c34abdfe..4d785eb6 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/InvProductDetailService.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/InvProductDetailService.java @@ -38,7 +38,7 @@ public interface InvProductDetailService { InvProductDetailEntity statInvPreInDetail(String code); - int vailStockCount(String code); + int vailStockCount(String code, String invStorageCode, String invWarehouseCode, String invSpaceCode); /** * 查询货物摆放数据列表 diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/InvSpaceService.java b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/InvSpaceService.java index 7605c177..2ce2a25d 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/InvSpaceService.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/InvSpaceService.java @@ -41,7 +41,7 @@ public interface InvSpaceService { */ BaseResponse updateSpace(InvSpace invSpace); - List getSpaceCodeList(FilterInvSpaceRequest filterInvSpaceRequest); + List getSpaceCodeList(FilterInvSpaceRequest filterInvSpaceRequest); /** * 根据分库编码查询货位信息 diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/InvSubWarehouseService.java b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/InvSubWarehouseService.java index 57170108..ca3c657a 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/InvSubWarehouseService.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/InvSubWarehouseService.java @@ -60,4 +60,12 @@ public interface InvSubWarehouseService { /** 查询仓库下级*/ List filterGroupInvSubDown(FilterInvWarehouseRequest filterInvSubWarehouseRequest); + /** + * 查询分仓列表 + * + * @param filterInvWarehouseRequest + * @return + */ + List filterSubInvList(FilterInvWarehouseRequest filterInvWarehouseRequest); + } diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/DeviceCollectOrderDetailServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/DeviceCollectOrderDetailServiceImpl.java index b2620d6f..223b30db 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/DeviceCollectOrderDetailServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/DeviceCollectOrderDetailServiceImpl.java @@ -57,7 +57,7 @@ public class DeviceCollectOrderDetailServiceImpl implements DeviceCollectOrderDe List list = deviceCollectOrderDetailDao.filterList(detailRequest); //设置是否可以自定义序列号标识 list.forEach(item -> { - item.setEditSerialNo(StrUtil.isBlank(item.getCode()) ? true : false); + item.setEditSerialNo(StrUtil.isBlank(item.getCode())); }); return list; } @@ -244,4 +244,16 @@ public class DeviceCollectOrderDetailServiceImpl implements DeviceCollectOrderDe } return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, "此条码在库存中不存在，无法领用！"); } + + @Override + public List getDeviceList(FilterDeviceCollectOrderDetailRequest detailRequest) { + if (null == detailRequest) { + return Collections.emptyList(); + } + if (null != detailRequest.getPage() && null != detailRequest.getLimit()) { + PageHelper.offsetPage((detailRequest.getPage() - 1) * detailRequest.getLimit(), detailRequest.getLimit()); + } + return deviceCollectOrderDetailDao.selectDeviceList(detailRequest); + } + } diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/DeviceCollectOrderServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/DeviceCollectOrderServiceImpl.java index 7e7aea81..5d3081b7 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/DeviceCollectOrderServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/DeviceCollectOrderServiceImpl.java @@ -77,7 +77,7 @@ public class DeviceCollectOrderServiceImpl implements DeviceCollectOrderService return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); } deviceCollectOrderEntity.setUpdateTime(DateUtil.getDateTime()); - deviceCollectOrderDao.updateByPrimaryKey(deviceCollectOrderEntity); + deviceCollectOrderDao.updateByPrimaryKeySelective(deviceCollectOrderEntity); return ResultVOUtils.success("更新成功"); } diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/DeviceMAOrderDetailServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/DeviceMAOrderDetailServiceImpl.java index 5a680250..0dd18ad6 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/DeviceMAOrderDetailServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/DeviceMAOrderDetailServiceImpl.java @@ -2,7 +2,9 @@ package com.glxp.api.admin.service.inventory.impl; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageHelper; +import com.glxp.api.admin.dao.inventory.DeviceCollectOrderDetailDao; import com.glxp.api.admin.dao.inventory.DeviceMaOrderDetailDao; +import com.glxp.api.admin.entity.inventory.DeviceCollectOrderDetailEntity; import com.glxp.api.admin.entity.inventory.DeviceMAOrderDetailEntity; import com.glxp.api.admin.req.inventory.FilterDeviceMAOrderDetailRequest; import com.glxp.api.admin.res.inventory.DeviceMAOrderDetailResponse; @@ -25,6 +27,8 @@ public class DeviceMAOrderDetailServiceImpl implements DeviceMAOrderDetailServic @Resource private DeviceMaOrderDetailDao deviceMaOrderDetailDao; + @Resource + private DeviceCollectOrderDetailDao deviceCollectOrderDetailDao; @Override public List filterList(FilterDeviceMAOrderDetailRequest detailRequest) { @@ -71,4 +75,14 @@ public class DeviceMAOrderDetailServiceImpl implements DeviceMAOrderDetailServic } return ResultVOUtils.success("删除成功"); } + + @Override + public BaseResponse filterMAOrderDetail(String code) { + DeviceCollectOrderDetailEntity deviceCollectOrderDetail = deviceCollectOrderDetailDao.findOneByCode(code); + DeviceMAOrderDetailResponse response = deviceMaOrderDetailDao.filterMAOrderDetail(deviceCollectOrderDetail.getProductId()); + response.setCode(code); + response.setDeviceStatus(1); + response.setMaintenanceStatus(0); + return ResultVOUtils.success(response); + } } diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/DeviceMAOrderServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/DeviceMAOrderServiceImpl.java index ee543267..89bf388f 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/DeviceMAOrderServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/DeviceMAOrderServiceImpl.java @@ -9,6 +9,7 @@ import com.glxp.api.admin.dao.inventory.DeviceMaOrderDetailDao; import com.glxp.api.admin.entity.inventory.DeviceCollectOrderDetailEntity; import com.glxp.api.admin.entity.inventory.DeviceMAOrderDetailEntity; import com.glxp.api.admin.entity.inventory.DeviceMAOrderEntity; +import com.glxp.api.admin.req.inventory.AddDeviceMAOrderRequest; import com.glxp.api.admin.req.inventory.FilterDeviceMAOrderRequest; import com.glxp.api.admin.service.auth.CustomerService; import com.glxp.api.admin.service.inventory.DeviceMAOrderService; @@ -98,7 +99,7 @@ public class DeviceMAOrderServiceImpl implements DeviceMAOrderService { } if (deviceMAOrderEntity.getStatus() == 1) { //完成养护记录更新，查询此条养护记录详情中是否存在未养护完成设备 - List detailList = deviceMaOrderDetailDao.selectByOrderId(deviceMAOrderEntity.getOrderId()); + List detailList = deviceMaOrderDetailDao.selectByOrderId(deviceMAOrderEntity.getOrderId()); for (DeviceMAOrderDetailEntity deviceMAOrderDetailEntity : detailList) { if (deviceMAOrderDetailEntity.getMaintenanceStatus() == 0) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, "存在未养护设备，请完成该设备养护！"); @@ -124,4 +125,42 @@ public class DeviceMAOrderServiceImpl implements DeviceMAOrderService { return ResultVOUtils.success("删除成功！"); } + @Override + public BaseResponse addDeviceMAOrder(AddDeviceMAOrderRequest addDeviceMAOrderRequest) { + if (null == addDeviceMAOrderRequest) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); + } + if (StrUtil.isBlank(addDeviceMAOrderRequest.getCode())) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); + } + //生成设备养护记录和详情 + DeviceMAOrderEntity deviceMAOrderEntity = new DeviceMAOrderEntity(); + deviceMAOrderEntity.setOrderId(gennerOrderUtils.createStOrderNo(new OrderNoTypeBean(Constant.DEVICE_MA_ORDER, "yyyyMMdd"))); + deviceMAOrderEntity.setCreateUser(addDeviceMAOrderRequest.getCreateUser()); + deviceMAOrderEntity.setCreateTime(addDeviceMAOrderRequest.getCreateTime()); + deviceMAOrderEntity.setUpdateTime(DateUtil.getDateTime()); + deviceMAOrderEntity.setStatus(1); + + //查询领用详情表中此条码的数据 + DeviceCollectOrderDetailEntity deviceCollectOrderDetail = deviceCollectOrderDetailDao.findOneByCode(addDeviceMAOrderRequest.getCode()); + //详情 + DeviceMAOrderDetailEntity detailEntity = new DeviceMAOrderDetailEntity(); + detailEntity.setCreateTime(addDeviceMAOrderRequest.getCreateTime()); + detailEntity.setOrderIdFk(deviceMAOrderEntity.getOrderId()); + detailEntity.setCreateUser(detailEntity.getCreateUser()); + detailEntity.setCode(addDeviceMAOrderRequest.getCode()); + detailEntity.setNameCode(deviceCollectOrderDetail.getNameCode()); + detailEntity.setBatchNo(deviceCollectOrderDetail.getBatchNo()); + detailEntity.setProductId(deviceCollectOrderDetail.getProductId()); + detailEntity.setProduceDate(deviceCollectOrderDetail.getProduceDate()); + detailEntity.setExpireDate(deviceCollectOrderDetail.getExpireDate()); + detailEntity.setSerialNo(deviceCollectOrderDetail.getSerialNo()); + detailEntity.setMaintenanceStatus(addDeviceMAOrderRequest.getMaintenanceStatus()); + detailEntity.setDeviceStatus(addDeviceMAOrderRequest.getDeviceStatus()); + + deviceMAOrderDao.insert(deviceMAOrderEntity); + deviceMaOrderDetailDao.insert(detailEntity); + return ResultVOUtils.success(); + } + } diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvCountOrderServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvCountOrderServiceImpl.java index d01d875a..a72e3173 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvCountOrderServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvCountOrderServiceImpl.java @@ -11,6 +11,7 @@ import com.glxp.api.admin.constant.Constant; import com.glxp.api.admin.constant.ConstantStatus; import com.glxp.api.admin.constant.ConstantType; import com.glxp.api.admin.dao.basic.BussinessTypeDao; +import com.glxp.api.admin.dao.basic.CompanyProductRelevanceDao; import com.glxp.api.admin.dao.basic.UnitMaintainDao; import com.glxp.api.admin.dao.inout.CodesDao; import com.glxp.api.admin.dao.inout.CodesTempDao; @@ -73,6 +74,8 @@ public class InvCountOrderServiceImpl implements InvCountOrderService { private InvCountCodesService invCountCodesService; @Resource private CodesDao codesDao; + @Resource + private CompanyProductRelevanceDao companyProductRelevanceDao; @Override public List filterList(FilterInvCountOrderRequest filterInvCountOrderRequest) { @@ -88,9 +91,15 @@ public class InvCountOrderServiceImpl implements InvCountOrderService { @Override public void deleteOrder(String id) { String orderId = invCountOrderDao.selectOrderIdById(id); - invCountOrderDao.deleteByPrimaryKey(Integer.valueOf(id)); - invCountOrderDetailDao.deleteByOrderId(orderId); - invCountCodesDao.deleteByOrderId(orderId); + log.info("开始删除盘点单据，盘点单号： {}", orderId); + invCountOrderDao.deleteByOrderId(orderId); + if (invCountOrderDetailDao.countByOrderIdFk(orderId) > 0) { + invCountOrderDetailDao.deleteByOrderId(orderId); + } + if (invCountCodesDao.countByOrderIdFk(orderId) > 0) { + invCountCodesDao.deleteByOrderId(orderId); + } + log.info("盘点单据删除完成"); } @Override @@ -293,7 +302,7 @@ public class InvCountOrderServiceImpl implements InvCountOrderService { warehouseEntity.setReCount(codeNum); //设置供应商信息 - setSupInfo(warehouseEntity); + setSupInfo(warehouseEntity, "loss"); outOrderCodes.add(warehouseEntity); } else { for (InvProductDetailEntity invProductDetailEntity : invProductDetailEntities) { @@ -309,10 +318,15 @@ public class InvCountOrderServiceImpl implements InvCountOrderService { int codeNum = invCountOrderDetail.getLossNum() / actCount; warehouseEntity.setCount(codeNum); warehouseEntity.setReCount(codeNum); + } else { + //修改实际数量 + int actCount = invCountCodesService.getActCount(udi.getUdi()); + warehouseEntity.setCount(actCount); + warehouseEntity.setReCount(actCount); } //设置供应商信息 - setSupInfo(warehouseEntity); + setSupInfo(warehouseEntity, "loss"); outOrderCodes.add(warehouseEntity); } } @@ -351,11 +365,11 @@ public class InvCountOrderServiceImpl implements InvCountOrderService { UdiEntity udi = FilterUdiUtils.getUdi(countCodesList.get(0)); //修改码数量 int actCount = invCountCodesService.getActCount(udi.getUdi()); - //使用此盘点单据详情的盘亏数量 / 实际数量，计算得出扫码数量 + //使用此盘点单据详情的盘盈数量 / 实际数量，计算得出扫码数量 int codeNum = invCountOrderDetail.getProfitNum() / actCount; warehouseEntity.setCount(codeNum); warehouseEntity.setReCount(codeNum); - setSupInfo(warehouseEntity); + setSupInfo(warehouseEntity, "profit"); inOrderCodes.add(warehouseEntity); } else { for (String code : profitCodes) { @@ -367,12 +381,17 @@ public class InvCountOrderServiceImpl implements InvCountOrderService { if ((StrUtil.isBlank(udi.getBatchNo()) && StrUtil.isBlank(udi.getSerialNo())) || (StrUtil.isBlank(udi.getSerialNo()) && StrUtil.isNotBlank(udi.getBatchNo()))) { //修改码数量 int actCount = invCountCodesService.getActCount(udi.getUdi()); - //使用此盘点单据详情的盘亏数量 / 实际数量，计算得出扫码数量 + //使用此盘点单据详情的盘盈数量 / 实际数量，计算得出扫码数量 int codeNum = invCountOrderDetail.getProfitNum() / actCount; warehouseEntity.setCount(codeNum); warehouseEntity.setReCount(codeNum); + } else { + //修改实际数量 + int actCount = invCountCodesService.getActCount(udi.getUdi()); + warehouseEntity.setCount(actCount); + warehouseEntity.setReCount(actCount); } - setSupInfo(warehouseEntity); + setSupInfo(warehouseEntity, "profit"); inOrderCodes.add(warehouseEntity); } } @@ -428,16 +447,41 @@ public class InvCountOrderServiceImpl implements InvCountOrderService { /** * 对条码添加供应商信息 * - * @param warehouseEntity + * @param warehouseEntity 码明细 + * @param countStatus 盈亏状态 */ - private void setSupInfo(WarehouseEntity warehouseEntity) { - //设置供应商参数 - String supId = invProductDetailDao.selectSupIdByCode(warehouseEntity.getCode()); - if (StrUtil.isNotEmpty(supId)) { - warehouseEntity.setSupId(supId); - //查询供应商名称 - String name = unitMaintainDao.selectNameByErpId(supId); - warehouseEntity.setSupName(name); + private void setSupInfo(WarehouseEntity warehouseEntity, String countStatus) { + /** + * 根据此码明细的盈亏状态，使用不同的逻辑生成供应商信息 + * 盘盈：此条码不存在于库存详情中，需要从供应商产品信息表查询供应商信息 + * 盘亏：此条码在库存中存在，但是盘点中没有此条码，直接查询库存详情表中的供应商ID + * + * 若查询出的供应商信息多余1条，则表明此产品被多个供应商绑定，在此处不进行绑定，单据生成之后会进入异常单据页面，在异常单据页面手动指定供应商 + */ + if (countStatus.equals("loss")) { + log.info("生成盘亏单据条码供应商详情，条码信息：{}", warehouseEntity.getCode()); + List supIds = invProductDetailDao.selectSupIdByCode(warehouseEntity.getCode()); + if (CollUtil.isNotEmpty(supIds)) { + if (supIds.size() == 1) { + //此产品只绑定了一个供应商，若绑定了多个供应商，则不填供应商ID字段，生成单据之后会进入异常单据页面，手动指定供应商 + warehouseEntity.setSupId(supIds.get(0)); + //查询供应商名称 + String name = unitMaintainDao.selectNameByErpId(supIds.get(0)); + warehouseEntity.setSupName(name); + } + } + } else { + log.info("生成盘盈单据条码供应商详情，条码信息：{}", warehouseEntity.getCode()); + List unitFkList = companyProductRelevanceDao.selectUnitFkByUdiRlIdFk(warehouseEntity.getRelId()); + if (CollUtil.isNotEmpty(unitFkList)) { + if (unitFkList.size() == 1) { + //此产品只绑定了一个供应商，若绑定了多个供应商，则不填供应商ID字段，生成单据之后会进入异常单据页面，手动指定供应商 + warehouseEntity.setSupId(unitFkList.get(0)); + //查询供应商名称 + String name = unitMaintainDao.selectNameByErpId(unitFkList.get(0)); + warehouseEntity.setSupName(name); + } + } } } diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvMAOrderDetailServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvMAOrderDetailServiceImpl.java index 853b0358..2bbea5bc 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvMAOrderDetailServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvMAOrderDetailServiceImpl.java @@ -116,9 +116,10 @@ public class InvMAOrderDetailServiceImpl implements InvMAOrderDetailService { if (invMaintenanceOrderDetailEntity.getCount() > 1) { invMaintenanceOrderDetailEntity.setCount(invMaintenanceOrderDetailEntity.getCount() - 1); invMAOrderDetailDao.updateByPrimaryKey(invMaintenanceOrderDetailEntity); + } else { + //养护数量为1，直接删除养护记录详情 + invMAOrderDetailDao.deleteByPrimaryKey(id); } - //养护数量为1，直接删除养护记录详情 - invMAOrderDetailDao.deleteByPrimaryKey(id); return ResultVOUtils.success(); } @@ -144,15 +145,23 @@ public class InvMAOrderDetailServiceImpl implements InvMAOrderDetailService { codeList.forEach(code -> codeMap.put(code, 0)); //计算当前在库存中的码明细 for (InvProductDetailEntity invProductDetailEntity : invProductDetailEntities) { - Integer count = codeMap.get(invProductDetailEntity.getOriginCode()); - if (invProductDetailEntity.getMainAction().equals(ConstantType.TYPE_OUT)) { - //出库 - count = count - 1; + UdiEntity udi = FilterUdiUtils.getUdi(invProductDetailEntity.getOriginCode()); + if (StrUtil.isNotBlank(udi.getSerialNo())) { + //有序列号产品，根据产品数量计算即可 + Integer count = codeMap.get(invProductDetailEntity.getOriginCode()); + if (invProductDetailEntity.getMainAction().equals(ConstantType.TYPE_OUT)) { + //出库 + count = count - 1; + } else { + //入库 + count = count + 1; + } + codeMap.put(invProductDetailEntity.getOriginCode(), count); } else { - //入库 - count = count + 1; + //无序列号产品条码，直接查询库存，使用此库存信息计算出养护数量 + int count = invProductEntity.getInCount() - invProductEntity.getOutCount(); + codeMap.put(invProductDetailEntity.getOriginCode(), count); } - codeMap.put(invProductDetailEntity.getOriginCode(), count); } //根据库存中的码明细，生成库存养护记录详情 diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvPreInProductDetailServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvPreInProductDetailServiceImpl.java index 8d50dcfd..96577890 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvPreInProductDetailServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvPreInProductDetailServiceImpl.java @@ -119,14 +119,9 @@ public class InvPreInProductDetailServiceImpl implements InvPreInProductDetailSe if (CollUtil.isNotEmpty(datas)) { InvProductDetailEntity invProductDetailEntity = datas.get(0); - String bacthNo = null; - if (StrUtil.isEmpty(invProductDetailEntity.getBatchNo())) { - bacthNo = "empty"; - } else { - bacthNo = invProductDetailEntity.getBatchNo(); + for (int i = 1; i < datas.size(); i++) { + invProductDetailEntity.setCount(invProductDetailEntity.getCount() + datas.get(i).getCount()); } -// InvProductEntity invProductEntity = invPreInProductDao.selectByUuid(invProductDetailEntity.getProductIdFk(), bacthNo, invProductDetailEntity.getSupId(), invProductDetailEntity.getInvStorageCode(), invProductDetailEntity.getInvWarehouseCode()); -// invProductDetailEntity.setCount(invProductEntity.getInCount() - invProductEntity.getOutCount()); return invProductDetailEntity; } return null; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvProductDetailServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvProductDetailServiceImpl.java index fcc5e7df..bb109dfa 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvProductDetailServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvProductDetailServiceImpl.java @@ -141,12 +141,15 @@ public class InvProductDetailServiceImpl implements InvProductDetailService { @Override - public int vailStockCount(String code) { + public int vailStockCount(String code, String invStorageCode, String invWarehouseCode, String invSpaceCode) { if (StrUtil.isEmpty(code)) { return 0; } FilterInvProductDetailRequest filterInvProductDetailRequest = new FilterInvProductDetailRequest(); filterInvProductDetailRequest.setOriginCode(code); + filterInvProductDetailRequest.setInvStorageCode(invStorageCode); + filterInvProductDetailRequest.setInvWarehouseCode(invWarehouseCode); + filterInvProductDetailRequest.setInvSpaceCode(invSpaceCode); List datas = invProductDetailDao.filterInvProductDetail(filterInvProductDetailRequest); if (CollUtil.isEmpty(datas)) { filterInvProductDetailRequest.setOriginCode(null); diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvProductServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvProductServiceImpl.java index dd8e1e12..c4d6a35a 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvProductServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvProductServiceImpl.java @@ -12,8 +12,8 @@ import com.glxp.api.admin.service.inventory.InvProductService; import org.springframework.stereotype.Service; import javax.annotation.Resource; -import java.util.*; -import java.util.stream.Collectors; +import java.util.Collections; +import java.util.List; @Service public class InvProductServiceImpl implements InvProductService { @@ -86,58 +86,18 @@ public class InvProductServiceImpl implements InvProductService { if (filterInvProductRequest == null) { return Collections.emptyList(); } + + if (null != filterInvProductRequest.getPage() && null != filterInvProductRequest.getLimit()) { + PageHelper.offsetPage((filterInvProductRequest.getPage() - 1) * filterInvProductRequest.getLimit(), filterInvProductRequest.getLimit()); + } + List data = invProductDao.stockStatistics(filterInvProductRequest); if (CollUtil.isNotEmpty(data)) { - //默认根据产品id分组 - Set relIdFkSet = new HashSet<>(); - data.forEach(invProductResponse -> { - relIdFkSet.add(invProductResponse.getRelIdFk()); + data.forEach(item -> { + item.setReCount(item.getInCount() - item.getOutCount()); }); - - //按照产品批次分组 - Set batchNoSet = new HashSet<>(); - data.forEach(invProductResponse -> { - batchNoSet.add(invProductResponse.getBatchNo()); - }); - - List result = new ArrayList<>(); - - for (String relIdFk : relIdFkSet) { - if (CollUtil.isNotEmpty(batchNoSet)) { - for (String batchNo : batchNoSet) { - List list = - data.stream().filter(product -> product.getRelIdFk().equals(relIdFk)) - .filter(product -> StrUtil.trimToEmpty(product.getBatchNo()).equals(StrUtil.trimToEmpty(batchNo))) - .collect(Collectors.toList()); - if (CollUtil.isNotEmpty(list)) { - InvProductResponse invProductResponse = list.get(0); - int inCount = data.stream() - .filter(product -> product.getRelIdFk().equals(relIdFk)) - .filter(product -> StrUtil.trimToEmpty(product.getBatchNo()).equals(StrUtil.trimToEmpty(batchNo))) - .mapToInt(InvProductResponse::getInCount).sum(); - int outCount = data.stream() - .filter(product -> product.getRelIdFk().equals(relIdFk)) - .filter(product -> StrUtil.trimToEmpty(product.getBatchNo()).equals(StrUtil.trimToEmpty(batchNo))) - .mapToInt(InvProductResponse::getOutCount).sum(); - invProductResponse.setInCount(inCount); - invProductResponse.setOutCount(outCount); - invProductResponse.setReCount(inCount - outCount); - result.add(invProductResponse); - } - } - } else { - InvProductResponse invProductResponse = data.stream().filter(product -> product.getRelIdFk().equals(relIdFk)).collect(Collectors.toList()).get(0); - int inCount = data.stream().filter(product -> product.getRelIdFk().equals(relIdFk)).mapToInt(InvProductResponse::getInCount).sum(); - int outCount = data.stream().filter(product -> product.getRelIdFk().equals(relIdFk)).mapToInt(InvProductResponse::getOutCount).sum(); - invProductResponse.setInCount(inCount); - invProductResponse.setOutCount(outCount); - invProductResponse.setReCount(inCount - outCount); - result.add(invProductResponse); - } - } - return result; } - return Collections.emptyList(); + return data; } @Override diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvSpaceServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvSpaceServiceImpl.java index 81eb1c97..85d2e0d6 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvSpaceServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvSpaceServiceImpl.java @@ -125,7 +125,7 @@ public class InvSpaceServiceImpl implements InvSpaceService { } @Override - public List getSpaceCodeList(FilterInvSpaceRequest filterInvSpaceRequest) { + public List getSpaceCodeList(FilterInvSpaceRequest filterInvSpaceRequest) { return invSpaceDao.selectSpaceCodeList(filterInvSpaceRequest); } diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvSubWarehouseServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvSubWarehouseServiceImpl.java index 781aaf06..a4fb5f8c 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvSubWarehouseServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvSubWarehouseServiceImpl.java @@ -202,4 +202,9 @@ public class InvSubWarehouseServiceImpl implements InvSubWarehouseService { public List filterGroupInvSubDown(FilterInvWarehouseRequest filterInvSubWarehouseRequest) { return invSubWarehouseDao.filterGroupInvSubDown(filterInvSubWarehouseRequest); } + + @Override + public List filterSubInvList(FilterInvWarehouseRequest filterInvWarehouseRequest) { + return invSubWarehouseDao.filterSubInvList(filterInvWarehouseRequest); + } } diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/purchase/SupCertService.java b/api-admin/src/main/java/com/glxp/api/admin/service/purchase/SupCertService.java index b61f84b8..4d1fa69c 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/purchase/SupCertService.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/purchase/SupCertService.java @@ -23,7 +23,7 @@ public interface SupCertService { boolean updateCompanyCert(SupCertEntity supCertEntity); - boolean updateCustomerId(String oldId, String newId); + boolean updateCustomerId(String oldId, String newId,Integer auditStatus); boolean updateManufacturerId(String oldCustomerId, String newCustomerId, String oldManufacturerIdFk, String newManufacturerIdFk); diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/purchase/SupCertSetService.java b/api-admin/src/main/java/com/glxp/api/admin/service/purchase/SupCertSetService.java index b24ababa..6356dbcf 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/purchase/SupCertSetService.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/purchase/SupCertSetService.java @@ -17,4 +17,6 @@ public interface SupCertSetService { boolean deleteById(String id); + boolean deleteAll(); + } diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/purchase/SupCompanyService.java b/api-admin/src/main/java/com/glxp/api/admin/service/purchase/SupCompanyService.java index 5778819d..c2ee954e 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/purchase/SupCompanyService.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/purchase/SupCompanyService.java @@ -24,6 +24,5 @@ public interface SupCompanyService { boolean insertCompany(SupCompanyEntity companyEntity); - boolean deleteCompany(Long customerId); } diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/purchase/impl/SupCertServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/purchase/impl/SupCertServiceImpl.java index 236330e1..a592e0b7 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/purchase/impl/SupCertServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/purchase/impl/SupCertServiceImpl.java @@ -94,8 +94,8 @@ public class SupCertServiceImpl implements SupCertService { } @Override - public boolean updateCustomerId(String oldId, String newId) { - return supCertDao.updateCustomerId(oldId, newId); + public boolean updateCustomerId(String oldId, String newId,Integer auditStatus) { + return supCertDao.updateCustomerId(oldId, newId,auditStatus); } @Override diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/purchase/impl/SupCertSetServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/purchase/impl/SupCertSetServiceImpl.java index 411ecf0b..c5c03487 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/purchase/impl/SupCertSetServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/purchase/impl/SupCertSetServiceImpl.java @@ -45,4 +45,9 @@ public class SupCertSetServiceImpl implements SupCertSetService { public boolean deleteById(String id) { return supCertSetDao.deleteById(id); } + + @Override + public boolean deleteAll() { + return supCertSetDao.deleteAll(); + } } diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrCorpExportLogService.java b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrCorpExportLogService.java index 6bab1325..894189fe 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrCorpExportLogService.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrCorpExportLogService.java @@ -20,4 +20,6 @@ public interface ThrCorpExportLogService { boolean deleteById(String id); + boolean deleteByTime(); + } diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrCorpImportDetailService.java b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrCorpImportDetailService.java index ad557dcc..87072524 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrCorpImportDetailService.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrCorpImportDetailService.java @@ -22,4 +22,6 @@ public interface ThrCorpImportDetailService { boolean deleteByGenkey( String genKey); + boolean deleteByTime(); + } diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrCorpImportLogService.java b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrCorpImportLogService.java index 3cb510d5..4d09e777 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrCorpImportLogService.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrCorpImportLogService.java @@ -17,4 +17,6 @@ public interface ThrCorpImportLogService { boolean deleteById(String id); + boolean deleteByTime(); + } diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrImportLogService.java b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrImportLogService.java index 23988cd2..f49f4524 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrImportLogService.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrImportLogService.java @@ -16,5 +16,7 @@ public interface ThrImportLogService { boolean deleteById(String id); + boolean deleteByTime(); + ThrImportLogEntity selectByGenKey(String genKey); } diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrOrderDetailService.java b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrOrderDetailService.java index af25b7b2..acebe70b 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrOrderDetailService.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrOrderDetailService.java @@ -22,4 +22,6 @@ public interface ThrOrderDetailService { boolean deleteAll(); + boolean deleteByTime(); + } diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrOrderExportLogService.java b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrOrderExportLogService.java index 64180d7a..b60cf943 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrOrderExportLogService.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrOrderExportLogService.java @@ -16,4 +16,6 @@ public interface ThrOrderExportLogService { boolean updateThrOrderExportLog(ThrOrderExportLogEntity thrOrderExportLogEntity); boolean deleteById(String id); + + boolean deleteByTime(); } diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrOrderImportDetailService.java b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrOrderImportDetailService.java index 8c79c10f..bb4f9158 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrOrderImportDetailService.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrOrderImportDetailService.java @@ -17,5 +17,7 @@ public interface ThrOrderImportDetailService { boolean deleteById(String id); + boolean deleteByTime(); + boolean deleteByGenkey(String genKey); } diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrOrderImportLogService.java b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrOrderImportLogService.java index ad67abb3..57c92a92 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrOrderImportLogService.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrOrderImportLogService.java @@ -16,4 +16,6 @@ public interface ThrOrderImportLogService { boolean deleteById(String id); + boolean deleteByTime(); + } diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrProductsExportLogService.java b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrProductsExportLogService.java index 5011baea..a51fb6ca 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrProductsExportLogService.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrProductsExportLogService.java @@ -17,4 +17,6 @@ public interface ThrProductsExportLogService { boolean deleteById(String id); + boolean deleteByTime(); + } diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrProductsImportDetailService.java b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrProductsImportDetailService.java index 230ac442..b4901fd1 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrProductsImportDetailService.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrProductsImportDetailService.java @@ -16,6 +16,8 @@ public interface ThrProductsImportDetailService { boolean deleteById(String id); + boolean deleteByTime(); + boolean deleteByGenkey(String genKey); } diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrProductsImportLogService.java b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrProductsImportLogService.java index 1157d28e..9c8e8360 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrProductsImportLogService.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrProductsImportLogService.java @@ -14,5 +14,7 @@ public interface ThrProductsImportLogService { boolean deleteById(String id); + boolean deleteByTime(); + ThrProductsImportLogEntity selectByGenKey(String genKey); } diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrCorpExportLogServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrCorpExportLogServiceImpl.java index d037714f..9b50530a 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrCorpExportLogServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrCorpExportLogServiceImpl.java @@ -61,4 +61,9 @@ public class ThrCorpExportLogServiceImpl implements ThrCorpExportLogService { } return thrCorpExportLogDao.deleteById(id); } + + @Override + public boolean deleteByTime() { + return thrCorpExportLogDao.deleteByTime(); + } } diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrCorpImportDetailServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrCorpImportDetailServiceImpl.java index 6a25f41d..05d025a7 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrCorpImportDetailServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrCorpImportDetailServiceImpl.java @@ -54,4 +54,9 @@ public class ThrCorpImportDetailServiceImpl implements ThrCorpImportDetailServic public boolean deleteByGenkey(String genKey) { return thrCorpImportDetailDao.deleteByGenkey(genKey); } + + @Override + public boolean deleteByTime() { + return thrCorpImportDetailDao.deleteByTime(); + } } diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrCorpImportLogServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrCorpImportLogServiceImpl.java index 84f35797..572b7687 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrCorpImportLogServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrCorpImportLogServiceImpl.java @@ -55,4 +55,10 @@ public class ThrCorpImportLogServiceImpl implements ThrCorpImportLogService { public boolean deleteById(String id) { return thrCorpImportLogDao.deleteById(id); } + + @Override + public boolean deleteByTime() { + return thrCorpImportLogDao.deleteByTime(); + } + } diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrImportLogServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrImportLogServiceImpl.java index cb8be72a..e5d28817 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrImportLogServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrImportLogServiceImpl.java @@ -45,6 +45,11 @@ public class ThrImportLogServiceImpl implements ThrImportLogService { return thrImportLogDao.deleteById(id); } + @Override + public boolean deleteByTime() { + return thrImportLogDao.deleteByTime(); + } + @Override public ThrImportLogEntity selectByGenKey(String genKey) { FilterUdiIpLogRequest filterUdiIpLogRequest = new FilterUdiIpLogRequest(); diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrOrderDetailServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrOrderDetailServiceImpl.java index cc428160..be137ec7 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrOrderDetailServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrOrderDetailServiceImpl.java @@ -60,4 +60,9 @@ public class ThrOrderDetailServiceImpl implements ThrOrderDetailService { public boolean deleteAll() { return thrOrderDetailDao.deleteAll(); } + + @Override + public boolean deleteByTime() { + return thrOrderDetailDao.deleteByTime(); + } } diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrOrderExportLogServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrOrderExportLogServiceImpl.java index bbd7d455..b7698494 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrOrderExportLogServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrOrderExportLogServiceImpl.java @@ -55,4 +55,9 @@ public class ThrOrderExportLogServiceImpl implements ThrOrderExportLogService { public boolean deleteById(String id) { return thrOrderExportLogDao.deleteById(id); } + + @Override + public boolean deleteByTime() { + return thrOrderExportLogDao.deleteByTime(); + } } diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrOrderImportDetailServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrOrderImportDetailServiceImpl.java index 30920cd2..6db942d6 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrOrderImportDetailServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrOrderImportDetailServiceImpl.java @@ -50,6 +50,11 @@ public class ThrOrderImportDetailServiceImpl implements ThrOrderImportDetailServ return thrOrderImportDetailDao.deleteById(id); } + @Override + public boolean deleteByTime() { + return thrOrderImportDetailDao.deleteByTime(); + } + @Override public boolean deleteByGenkey(String genKey) { return thrOrderImportDetailDao.deleteByGenkey(genKey); diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrOrderImportLogServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrOrderImportLogServiceImpl.java index 16a55bac..49eb7906 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrOrderImportLogServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrOrderImportLogServiceImpl.java @@ -57,4 +57,10 @@ public class ThrOrderImportLogServiceImpl implements ThrOrderImportLogService { public boolean deleteById(String id) { return thrOrderImportLogDao.deleteById(id); } + + @Override + public boolean deleteByTime() { + return thrOrderImportLogDao.deleteByTime(); + } + } diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrProductsExportLogServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrProductsExportLogServiceImpl.java index b10c8e77..3caf00d1 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrProductsExportLogServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrProductsExportLogServiceImpl.java @@ -61,4 +61,9 @@ public class ThrProductsExportLogServiceImpl implements ThrProductsExportLogServ } return thrProductsExportLogDao.deleteById(id); } + + @Override + public boolean deleteByTime() { + return thrProductsExportLogDao.deleteByTime(); + } } diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrProductsImportDetailServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrProductsImportDetailServiceImpl.java index 9a9fb98c..2c14f8f5 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrProductsImportDetailServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrProductsImportDetailServiceImpl.java @@ -50,6 +50,11 @@ public class ThrProductsImportDetailServiceImpl implements ThrProductsImportDeta return thrProductsImportDetailDao.deleteById(id); } + @Override + public boolean deleteByTime() { + return thrProductsImportDetailDao.deleteByTime(); + } + @Override public boolean deleteByGenkey(String genKey) { return thrProductsImportDetailDao.deleteByGenkey(genKey); diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrProductsImportLogServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrProductsImportLogServiceImpl.java index afa49ec9..5212f4a2 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrProductsImportLogServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrProductsImportLogServiceImpl.java @@ -44,6 +44,11 @@ public class ThrProductsImportLogServiceImpl implements ThrProductsImportLogServ return thrProductsImportLogDao.deleteById(id); } + @Override + public boolean deleteByTime() { + return thrProductsImportLogDao.deleteByTime(); + } + @Override public ThrProductsImportLogEntity selectByGenKey(String genKey) { FilterUdiIpLogRequest filterUdiIpLogRequest = new FilterUdiIpLogRequest(); diff --git a/api-admin/src/main/java/com/glxp/api/admin/thread/CleanDataTask.java b/api-admin/src/main/java/com/glxp/api/admin/thread/CleanDataTask.java new file mode 100644 index 00000000..1ce8b48c --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/thread/CleanDataTask.java @@ -0,0 +1,95 @@ +package com.glxp.api.admin.thread; + +import com.glxp.api.admin.dao.schedule.ScheduledDao; +import com.glxp.api.admin.entity.info.ScheduledEntity; +import com.glxp.api.admin.req.info.ScheduledRequest; +import com.glxp.api.admin.service.basic.BasicDownloadService; +import com.glxp.api.admin.service.basic.BasicExportService; +import com.glxp.api.admin.service.thrsys.*; +import lombok.extern.slf4j.Slf4j; +import org.springframework.scheduling.annotation.EnableScheduling; +import org.springframework.scheduling.annotation.SchedulingConfigurer; +import org.springframework.scheduling.config.ScheduledTaskRegistrar; +import org.springframework.scheduling.support.CronTrigger; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; + +/** + * 删除数据 + */ +@Slf4j +@Component +@EnableScheduling +public class CleanDataTask implements SchedulingConfigurer { + + @Resource + private ScheduledDao scheduledDao; + @Resource + private BasicExportService basicExportService; + @Resource + private BasicDownloadService basicDownloadService; + @Resource + private ThrCorpExportLogService thrCorpExportLogService; + @Resource + private ThrCorpImportDetailService thrCorpImportDetailService; + @Resource + private ThrCorpImportLogService thrCorpImportLogService; + @Resource + private ThrImportLogService thrImportLogService; + @Resource + private ThrOrderDetailService thrOrderDetailService; + @Resource + private ThrOrderExportLogService thrOrderExportLogService; + @Resource + private ThrOrderImportDetailService thrOrderImportDetailService; + @Resource + private ThrOrderImportLogService thrOrderImportLogService; + @Resource + private ThrProductsImportLogService thrProductsImportLogService; + @Resource + private ThrProductsExportLogService thrProductsExportLogService; + @Resource + private ThrProductsImportDetailService thrProductsImportDetailService; + + @Override + public void configureTasks(ScheduledTaskRegistrar taskRegistrar) { + taskRegistrar.addTriggerTask(() -> process(), + triggerContext -> { + ScheduledRequest scheduledRequest = new ScheduledRequest(); + scheduledRequest.setCronName("ScheduledDeletion"); + ScheduledEntity scheduledEntity = scheduledDao.findScheduled(scheduledRequest); + String cron = scheduledEntity.getCron(); + if (cron.isEmpty()) { + log.error("cron is null"); + } + return new CronTrigger(cron).nextExecutionTime(triggerContext); + }); + } + + private void process() { + log.info("开始清理 30 天前的历史数据"); + //删除同步任务 + log.info("开始删除同步任务历史记录"); + basicExportService.deleteByTime(); + //删除下载记录 + log.info("开始删除下载记录"); + basicDownloadService.deleteByTime(); + //删除第三方数据 + log.info("开始删除第三方数据"); + thrCorpExportLogService.deleteByTime(); + thrCorpImportDetailService.deleteByTime(); + thrCorpImportLogService.deleteByTime(); + thrImportLogService.deleteByTime(); + thrOrderDetailService.deleteByTime(); + thrOrderExportLogService.deleteByTime(); + thrOrderImportDetailService.deleteByTime(); + thrOrderImportLogService.deleteByTime(); + thrProductsImportLogService.deleteByTime(); + thrProductsExportLogService.deleteByTime(); + thrProductsImportDetailService.deleteByTime(); + log.info("历史数据清理完成"); + } + + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/thread/DlBasicService.java b/api-admin/src/main/java/com/glxp/api/admin/thread/DlBasicService.java index 377b1f03..da3e2344 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/thread/DlBasicService.java +++ b/api-admin/src/main/java/com/glxp/api/admin/thread/DlBasicService.java @@ -1,9 +1,11 @@ package com.glxp.api.admin.thread; import cn.hutool.core.collection.CollUtil; +import cn.hutool.json.JSONUtil; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.TypeReference; import com.glxp.api.admin.constant.BasicProcessStatus; +import com.glxp.api.admin.constant.Constant; import com.glxp.api.admin.constant.ConstantStatus; import com.glxp.api.admin.dao.auth.AuthAdminDao; import com.glxp.api.admin.dao.basic.*; @@ -27,33 +29,27 @@ import com.glxp.api.admin.entity.inout.WarehouseUserEntity; import com.glxp.api.admin.entity.inventory.InvBusUserEntity; import com.glxp.api.admin.entity.inventory.InvSubWarehouseEntity; import com.glxp.api.admin.entity.inventory.InvWarehouseEntity; -import com.glxp.api.admin.entity.purchase.SupCertEntity; -import com.glxp.api.admin.entity.purchase.SupCompanyEntity; -import com.glxp.api.admin.entity.purchase.SupManufacturerEntity; -import com.glxp.api.admin.entity.purchase.SupProductEntity; +import com.glxp.api.admin.entity.purchase.*; import com.glxp.api.admin.entity.thrsys.*; import com.glxp.api.admin.httpclient.SpGetHttpClient; import com.glxp.api.admin.req.basic.BasicExportStatusRequest; -import com.glxp.api.admin.res.basic.SpSyncUdiResponse; -import com.glxp.api.admin.res.basic.SpsSyncBusResponse; -import com.glxp.api.admin.res.basic.SpsSyncDataResponse; -import com.glxp.api.admin.res.basic.SpsSyncOrderResponse; +import com.glxp.api.admin.req.purchase.FilterCertSetsRequest; +import com.glxp.api.admin.req.sync.PostDownloadInfo; +import com.glxp.api.admin.res.basic.*; import com.glxp.api.admin.service.auth.DeptService; import com.glxp.api.admin.service.basic.*; -import com.glxp.api.admin.service.info.SystemParamConfigService; import com.glxp.api.admin.service.inout.OrderService; import com.glxp.api.admin.service.inventory.InvBusUserService; import com.glxp.api.admin.service.inventory.InvSubWarehouseService; import com.glxp.api.admin.service.inventory.InvWarehouseService; -import com.glxp.api.admin.service.purchase.SupCertService; -import com.glxp.api.admin.service.purchase.SupCompanyService; -import com.glxp.api.admin.service.purchase.SupManufacturerService; -import com.glxp.api.admin.service.purchase.SupProductService; +import com.glxp.api.admin.service.purchase.*; import com.glxp.api.admin.service.thrsys.ThrInvWarehouseService; import com.glxp.api.admin.util.CustomUtil; import com.glxp.api.admin.util.DateUtil; import com.glxp.api.admin.util.RedisUtil; import com.glxp.api.common.res.BaseResponse; +import com.glxp.api.common.util.ResultVOUtils; +import lombok.extern.slf4j.Slf4j; import org.apache.ibatis.session.ExecutorType; import org.apache.ibatis.session.SqlSession; import org.apache.ibatis.session.SqlSessionFactory; @@ -65,8 +61,11 @@ import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.util.Date; +import java.util.HashMap; import java.util.List; +import java.util.Map; +@Slf4j @Service public class DlBasicService { @@ -123,6 +122,8 @@ public class DlBasicService { SupProductService supProductService; @Resource SupCertService supCertService; + @Resource + SupCertSetService supCertSetService; private static final Logger logger = LoggerFactory.getLogger(DlBasicService.class); @@ -142,7 +143,6 @@ public class DlBasicService { if (response.getCode() == 20000 && response.getData() != null) { SpsSyncDataResponse syncDataResponse = response.getData(); - //构造下载记录 BasicDownloadStatusEntity basicDownloadStatusEntity = new BasicDownloadStatusEntity(); basicDownloadStatusEntity.setId(CustomUtil.getId()); @@ -378,6 +378,8 @@ public class DlBasicService { supCompanyEntity.setUpdateTime(null); supCompanyService.insertCompany(supCompanyEntity); } + + remark.append("配送企业证书：").append(syncDataResponse.getSupCompanyEntities().size()).append("条\n"); } //生产企业首营资质 @@ -387,6 +389,7 @@ public class DlBasicService { supManufacturerEntity.setUpdateTime(null); supManufacturerService.insertCompany(supManufacturerEntity); } + remark.append("生产企业证书：").append(syncDataResponse.getSupManufacturerEntities().size()).append("条\n"); } @@ -397,6 +400,7 @@ public class DlBasicService { supProductEntity.setUpdateTime(null); supProductService.insertRegistration(supProductEntity); } + remark.append("产品资质证书：").append(syncDataResponse.getSupProductEntities().size()).append("条\n"); } //所有证书提交 @@ -404,6 +408,21 @@ public class DlBasicService { for (SupCertEntity supCertEntity : syncDataResponse.getSupCertEntities()) { supCertService.insertCompanyCert(supCertEntity); } + remark.append("相关证书总数：").append(syncDataResponse.getSupCertEntities().size()).append("条\n"); + + } + + + //资质证书设置 + if (CollUtil.isNotEmpty(syncDataResponse.getSupCertSetEntities())) { + List backs = supCertSetService.filterCertSets(new FilterCertSetsRequest()); + supCertSetService.deleteAll(); + for (SupCertSetResponse supCertSetResponse : syncDataResponse.getSupCertSetEntities()) { + SupCertSetEntity supCertSetEntity = new SupCertSetEntity(); + BeanUtils.copyProperties(supCertSetResponse, supCertSetEntity); + supCertSetService.insertCertSet(supCertSetEntity); + } + remark.append("证书设置：").append(syncDataResponse.getSupCertSetEntities().size()).append("条\n"); } spGetHttp.postBasicStatus(basicExportStatusEntity.getId()); @@ -730,4 +749,54 @@ public class DlBasicService { } + /** + * 发送通知到自助平台，生成同步任务 + * + * @param type + * @return + */ + public BaseResponse downloadNow(Integer type) { + Object o = redisUtil.get(Constant.SPS_SYNC_DOWNLOAD_INFO); + if (null != o) { + return ResultVOUtils.error(500, "已存在下载任务，请等待下载完成！"); + } + + String downloadInfo = null; + if (null != type) { + switch (type) { + case 1: + downloadInfo = "基础信息"; + break; + case 2: + downloadInfo = "单据类型"; + break; + case 3: + downloadInfo = "扫码单据"; + break; + case 4: + downloadInfo = "国家库信息"; + break; + default: + break; + } + } + PostDownloadInfo postDownloadInfo = new PostDownloadInfo(); + postDownloadInfo.setType(type); + BaseResponse response = spGetHttp.postDownloadInfo(postDownloadInfo); + if (null == response) { + log.error("创建下载任务失败！"); + return ResultVOUtils.error(500, response.getMessage()); + } else if (response.getCode() != 20000) { + log.error(response.getMessage()); + return ResultVOUtils.error(500, response.getMessage()); + } else { + log.info("创建：{} 下载任务成功", downloadInfo); + //在Redis中创建下载任务标识 + Map map = new HashMap<>(2); + map.put("type", postDownloadInfo.getType()); + map.put("time", cn.hutool.core.date.DateUtil.offsetMinute(new Date(), 2).getTime()); + redisUtil.set(Constant.SPS_SYNC_DOWNLOAD_INFO, JSONUtil.toJsonStr(map)); + return ResultVOUtils.success(); + } + } } diff --git a/api-admin/src/main/java/com/glxp/api/admin/thread/DownloadSpDataTask.java b/api-admin/src/main/java/com/glxp/api/admin/thread/DownloadSpDataTask.java new file mode 100644 index 00000000..fb93bce9 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/thread/DownloadSpDataTask.java @@ -0,0 +1,79 @@ +package com.glxp.api.admin.thread; + +import cn.hutool.core.date.DateTime; +import cn.hutool.core.date.DateUtil; +import cn.hutool.core.util.StrUtil; +import cn.hutool.json.JSONUtil; +import com.glxp.api.admin.constant.Constant; +import com.glxp.api.admin.dao.schedule.ScheduledDao; +import com.glxp.api.admin.entity.info.ScheduledEntity; +import com.glxp.api.admin.req.info.ScheduledRequest; +import com.glxp.api.admin.util.RedisUtil; +import lombok.extern.slf4j.Slf4j; +import org.springframework.scheduling.annotation.EnableScheduling; +import org.springframework.scheduling.annotation.SchedulingConfigurer; +import org.springframework.scheduling.config.ScheduledTaskRegistrar; +import org.springframework.scheduling.support.CronTrigger; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; +import java.util.Map; + +@Slf4j +@Component +@EnableScheduling +public class DownloadSpDataTask implements SchedulingConfigurer { + + @Resource + private ScheduledDao scheduledDao; + @Resource + private RedisUtil redisUtil; + @Resource + private DlBasicService dlBasicService; + + @Override + public void configureTasks(ScheduledTaskRegistrar taskRegistrar) { + taskRegistrar.addTriggerTask(this::process, triggerContext -> { + ScheduledRequest scheduledRequest = new ScheduledRequest(); + scheduledRequest.setCronName("downloadSpDataTask"); + ScheduledEntity scheduled = scheduledDao.findScheduled(scheduledRequest); + String cron = scheduled.getCron(); + if (StrUtil.isBlank(cron)) { + log.error("cron is null"); + } + return new CronTrigger(cron).nextExecutionTime(triggerContext); + }); + } + + private void process() { + Object result = redisUtil.get(Constant.SPS_SYNC_DOWNLOAD_INFO); + if (null != result) { + //解析下载参数 + Map map = JSONUtil.toBean(String.valueOf(result), Map.class); + DateTime taskTime = DateUtil.date(Long.valueOf(String.valueOf(map.get("time")))); + if (DateUtil.date().getTime() <= taskTime.getTime()) { + Integer type = Integer.valueOf(String.valueOf(map.get("type"))); + if (type == 1) { + log.info("开始下载基础信息"); + dlBasicService.dlAllData(); + log.info("基础信息下载完毕"); + } else if (type == 2) { + log.info("开始下载单据类型"); + dlBasicService.dlAllBus(); + log.info("单据类型下载完毕"); + } else if ((type == 3)) { + log.info("开始下载扫码单据"); + dlBasicService.dlAllOrder(); + log.info("扫码单据下载完毕"); + } else if (type == 4) { + log.info("开始下载国家库数据"); + dlBasicService.dlAllUDI(); + log.info("国家库数据下载完毕"); + } + //删除标记 + redisUtil.del(Constant.SPS_SYNC_DOWNLOAD_INFO); + } + } + } + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/thread/HeartService.java b/api-admin/src/main/java/com/glxp/api/admin/thread/HeartService.java index 93757ce5..23aa58ec 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/thread/HeartService.java +++ b/api-admin/src/main/java/com/glxp/api/admin/thread/HeartService.java @@ -190,7 +190,9 @@ public class HeartService { && CollUtil.isEmpty(syncDataResponse.getSupCompanyEntities()) && CollUtil.isEmpty(syncDataResponse.getSupManufacturerEntities()) && CollUtil.isEmpty(syncDataResponse.getSupProductEntities()) - && CollUtil.isEmpty(syncDataResponse.getSupCertEntities())) { + && CollUtil.isEmpty(syncDataResponse.getSupCertEntities()) + && CollUtil.isEmpty(syncDataResponse.getSupCertSetEntities()) + ) { //数据不记录日志 return ResultVOUtils.success("无数据"); } @@ -266,6 +268,8 @@ public class HeartService { logs = logs + "产品资质证书：" + syncDataResponse.getSupProductEntities().size() + "条\n"; if (CollUtil.isNotEmpty(syncDataResponse.getSupCertEntities())) logs = logs + "相关资质证书总数：" + syncDataResponse.getSupCertEntities().size() + "条\n"; + if (CollUtil.isNotEmpty(syncDataResponse.getSupCertSetEntities())) + logs = logs + "证书设置：" + syncDataResponse.getSupCertEntities().size() + "条\n"; basicExportStatusEntity3.setRemark(logs); basicExportStatusEntity3.setUpdateTime(new Date()); basicExportService.updateExportStatus(basicExportStatusEntity3); diff --git a/api-admin/src/main/java/com/glxp/api/admin/thread/InvProductsTrService.java b/api-admin/src/main/java/com/glxp/api/admin/thread/InvProductsTrService.java index 868a2608..07460303 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/thread/InvProductsTrService.java +++ b/api-admin/src/main/java/com/glxp/api/admin/thread/InvProductsTrService.java @@ -210,7 +210,7 @@ public class InvProductsTrService { //单据流转 BussinessChangeTypeEntity bussinessChangeTypeEntity = bussinessChangeTypeService.findOriginAction(bussinessLocalTypeEntity.getLocalAction()); - if (bussinessChangeTypeEntity != null && bussinessLocalTypeEntity.isChangeEnable()) { + if (bussinessChangeTypeEntity != null) { addUseOutOrder(orderEntity, mInvProductDetailEntities, bussinessChangeTypeEntity); @@ -263,9 +263,12 @@ public class InvProductsTrService { } } else { if (locWarehouseEntity.getLevel() > 1) { + + InvSubWarehouseEntity subWarehouseEntity = invSubWarehouseService.findByInvSubByCode(bussinessChangeTypeEntity.getDefaultSubInv()); for (WarehouseEntity tempEntity : warehouseEntities) { - tempEntity.setFromCorp(bussinessChangeTypeEntity.getDefaultInv()); - tempEntity.setFromCorpId(bussinessChangeTypeEntity.getDefaultSubInv()); + tempEntity.setFromCorp(subWarehouseEntity.getName()); + tempEntity.setFromCorpId(subWarehouseEntity.getParentId()); + tempEntity.setFromSubInvCode(subWarehouseEntity.getCode()); inList.add(tempEntity); } } else { @@ -320,7 +323,7 @@ public class InvProductsTrService { preiInList.add(warehouseEntity); } else if (warehouseEntity.getSerialNo() == null) { //无序列号（多级包装无序列号的已在上一步被排除），补齐数量 int lea = count - invCount; - warehouseEntity.setCount(lea / (warehouseEntity.getCount())); // + warehouseEntity.setCount(lea / (actCount)); // preiInList.add(warehouseEntity); } } @@ -366,7 +369,7 @@ public class InvProductsTrService { inList.add(warehouseEntity); } else if (warehouseEntity.getSerialNo() == null) { //无序列号（多级包装无序列号的已在上一步被排除），补齐数量 int lea = count - invCount; - warehouseEntity.setCount(lea / (warehouseEntity.getCount())); // + warehouseEntity.setCount(lea / (actCount)); // inList.add(warehouseEntity); } } @@ -436,7 +439,7 @@ public class InvProductsTrService { prePutList.add(warehouseEntity); } else if (warehouseEntity.getSerialNo() == null) { //无序列号（多级包装无序列号的已在上一步被排除），补齐数量 int lea = count - invCount; - warehouseEntity.setCount(lea / (warehouseEntity.getCount())); // + warehouseEntity.setCount(lea / (actCount)); // prePutList.add(warehouseEntity); } } diff --git a/api-admin/src/main/java/com/glxp/api/admin/thread/IoTransInoutService.java b/api-admin/src/main/java/com/glxp/api/admin/thread/IoTransInoutService.java index b39909c4..29051f2a 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/thread/IoTransInoutService.java +++ b/api-admin/src/main/java/com/glxp/api/admin/thread/IoTransInoutService.java @@ -7,16 +7,15 @@ import com.glxp.api.admin.constant.Constant; import com.glxp.api.admin.constant.ConstantStatus; import com.glxp.api.admin.constant.ConstantType; import com.glxp.api.admin.controller.inout.utils.CheckOrderUtils; -import com.glxp.api.admin.controller.inout.utils.ContrastErpUtil; -import com.glxp.api.admin.controller.inout.utils.DataTransUtil; import com.glxp.api.admin.controller.inout.utils.InoutUtils; import com.glxp.api.admin.dao.business.StockOrderRemakDao; -import com.glxp.api.admin.entity.basic.*; +import com.glxp.api.admin.entity.basic.BasicUnitMaintainEntity; +import com.glxp.api.admin.entity.basic.BussinessTypeEntity; +import com.glxp.api.admin.entity.basic.CompanyProductRelevanceEntity; +import com.glxp.api.admin.entity.basic.UdiEntity; import com.glxp.api.admin.entity.business.StockOrderDetailEntity; import com.glxp.api.admin.entity.business.StockOrderEntity; import com.glxp.api.admin.entity.business.StockOrderRemakEntity; -import com.glxp.api.admin.entity.info.CompanyEntity; -import com.glxp.api.admin.entity.info.SystemParamConfigEntity; import com.glxp.api.admin.entity.inout.ErpOrderEntity; import com.glxp.api.admin.entity.inout.FilterErpOrderRequest; import com.glxp.api.admin.entity.inout.OrderEntity; @@ -24,41 +23,33 @@ import com.glxp.api.admin.entity.inout.WarehouseEntity; import com.glxp.api.admin.entity.inventory.InvProductDetailEntity; import com.glxp.api.admin.entity.inventory.InvProductEntity; import com.glxp.api.admin.entity.inventory.InvWarehouseEntity; -import com.glxp.api.admin.httpclient.ErpOrderClient; -import com.glxp.api.admin.httpclient.UdiDlHttpClient; import com.glxp.api.admin.req.basic.CompanyProductRelevanceRequest; import com.glxp.api.admin.req.basic.FilterCompanyProductRelevanceRequest; -import com.glxp.api.admin.req.basic.FilterUdiInfoRequest; import com.glxp.api.admin.req.business.StockOrderFilterRequest; import com.glxp.api.admin.req.inout.CommitRequest; import com.glxp.api.admin.req.inout.OrderFilterRequest; import com.glxp.api.admin.req.inout.PostOrderRequest; import com.glxp.api.admin.req.inout.WarehouseQueryRequest; -import com.glxp.api.admin.req.inventory.FilterInvProductDetailRequest; import com.glxp.api.admin.req.inventory.FilterInvProductRequest; import com.glxp.api.admin.req.inventory.FilterInvWarehouseRequest; -import com.glxp.api.admin.res.basic.BussinessOriginTypeResponse; import com.glxp.api.admin.res.basic.UdiRelevanceResponse; import com.glxp.api.admin.res.info.CompanyProductRelevanceResponse; -import com.glxp.api.admin.service.basic.*; +import com.glxp.api.admin.service.basic.BasicUnitMaintainService; +import com.glxp.api.admin.service.basic.BussinessTypeService; +import com.glxp.api.admin.service.basic.UdiInfoService; +import com.glxp.api.admin.service.basic.UdiRelevanceService; import com.glxp.api.admin.service.business.StockOrderDetailService; import com.glxp.api.admin.service.business.StockOrderService; import com.glxp.api.admin.service.info.CompanyProductRelevanceService; -import com.glxp.api.admin.service.info.CompanyService; -import com.glxp.api.admin.service.info.SystemParamConfigService; import com.glxp.api.admin.service.inout.CodesService; import com.glxp.api.admin.service.inout.CodesTempService; import com.glxp.api.admin.service.inout.OrderDetailService; import com.glxp.api.admin.service.inout.OrderService; import com.glxp.api.admin.service.inventory.*; -import com.glxp.api.admin.service.thrsys.ThrDataService; -import com.glxp.api.admin.service.thrsys.ThrOrderService; import com.glxp.api.admin.util.*; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.beans.BeanUtils; -import org.springframework.beans.factory.annotation.Value; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; @@ -528,7 +519,7 @@ public class IoTransInoutService { if (originSupId != null) { warehouseEntity.setSupId(originSupId); } - if (udiRelevanceEntities != null && udiRelevanceEntities.size() > 1 && warehouseEntity.getRelId() == null) {//同一个DI绑定多个产品西信息 + if (udiRelevanceEntities != null && udiRelevanceEntities.size() > 1 && warehouseEntity.getRelId() == null) {//同一个DI绑定多个产品信息 warehouseEntity.setRelId(null); warehouseEntity.setStatus(ConstantStatus.ORDER_DETAIL_DI_MUTI); } else if (udiRelevanceEntities == null || udiRelevanceEntities.size() == 0) {//未找到产品信息，一般不会出现 diff --git a/api-admin/src/main/java/com/glxp/api/admin/thread/UpBasicService.java b/api-admin/src/main/java/com/glxp/api/admin/thread/UpBasicService.java index d0f02f5d..f1814910 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/thread/UpBasicService.java +++ b/api-admin/src/main/java/com/glxp/api/admin/thread/UpBasicService.java @@ -14,10 +14,7 @@ import com.glxp.api.admin.entity.inout.*; import com.glxp.api.admin.entity.inventory.InvBusUserEntity; import com.glxp.api.admin.entity.inventory.InvSubWarehouseEntity; import com.glxp.api.admin.entity.inventory.InvWarehouseEntity; -import com.glxp.api.admin.entity.purchase.SupCertEntity; -import com.glxp.api.admin.entity.purchase.SupCompanyEntity; -import com.glxp.api.admin.entity.purchase.SupManufacturerEntity; -import com.glxp.api.admin.entity.purchase.SupProductEntity; +import com.glxp.api.admin.entity.purchase.*; import com.glxp.api.admin.entity.thrsys.*; import com.glxp.api.admin.req.auth.AuthAdminQueryRequest; import com.glxp.api.admin.req.auth.FilterDeptRequest; @@ -26,6 +23,7 @@ import com.glxp.api.admin.req.inout.OrderFilterRequest; import com.glxp.api.admin.req.inout.OrderQueryRequest; import com.glxp.api.admin.req.inventory.FilterInvUserRequest; import com.glxp.api.admin.req.inventory.FilterInvWarehouseRequest; +import com.glxp.api.admin.req.purchase.FilterCertSetsRequest; import com.glxp.api.admin.req.purchase.FilterPoductRequest; import com.glxp.api.admin.req.purchase.FilterSupCompanyRequest; import com.glxp.api.admin.req.purchase.FilterSupManufacturerRequest; @@ -34,6 +32,7 @@ import com.glxp.api.admin.req.thrsys.*; import com.glxp.api.admin.res.basic.SpsSyncBusResponse; import com.glxp.api.admin.res.basic.SpsSyncDataResponse; import com.glxp.api.admin.res.basic.SpsSyncOrderResponse; +import com.glxp.api.admin.res.basic.SupCertSetResponse; import com.glxp.api.admin.res.info.SyncDataSetResponse; import com.glxp.api.admin.service.auth.AuthAdminService; import com.glxp.api.admin.service.auth.DeptService; @@ -44,17 +43,16 @@ import com.glxp.api.admin.service.inout.*; import com.glxp.api.admin.service.inventory.InvBusUserService; import com.glxp.api.admin.service.inventory.InvSubWarehouseService; import com.glxp.api.admin.service.inventory.InvWarehouseService; -import com.glxp.api.admin.service.purchase.SupCertService; -import com.glxp.api.admin.service.purchase.SupCompanyService; -import com.glxp.api.admin.service.purchase.SupManufacturerService; -import com.glxp.api.admin.service.purchase.SupProductService; +import com.glxp.api.admin.service.purchase.*; import com.glxp.api.admin.service.thrsys.*; +import groovy.transform.WithReadLock; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.util.ArrayList; import java.util.List; +import java.util.stream.Collectors; @Service public class UpBasicService { @@ -107,6 +105,8 @@ public class UpBasicService { SupProductService supProductService; @Resource SupCertService supCertService; + @Resource + SupCertSetService supCertSetService; public SpsSyncDataResponse upAllData(SpsSyncDataRequest spsSyncDataRequest) { SpsSyncDataResponse syncDataResponse = new SpsSyncDataResponse(); @@ -280,56 +280,78 @@ public class UpBasicService { //资质证书 List supCertEntityList = new ArrayList<>(); - //获取供应商资质证书 - FilterSupCompanyRequest filterSupCompanyRequest = new FilterSupCompanyRequest(); - BeanUtils.copyProperties(spsSyncDataRequest, filterSupCompanyRequest); - filterSupCompanyRequest.setAuditStatus(ConstantStatus.AUDIT_PASS); - List supCompanyEntities = supCompanyService.filterCompany(filterSupCompanyRequest); - syncDataResponse.setSupCompanyEntities(supCompanyEntities); - if (CollUtil.isNotEmpty(supCompanyEntities)) { - for (SupCompanyEntity supCompanyEntity : supCompanyEntities) { - List tempsList = supCertService.findAll(supCompanyEntity.getCustomerId()); - if (CollUtil.isNotEmpty(tempsList)) { - supCertEntityList.addAll(tempsList); + + if (syncDataSetEntity.isCompanyCert()) { + + //获取供应商资质证书 + FilterSupCompanyRequest filterSupCompanyRequest = new FilterSupCompanyRequest(); + BeanUtils.copyProperties(spsSyncDataRequest, filterSupCompanyRequest); + filterSupCompanyRequest.setAuditStatus(ConstantStatus.AUDIT_PASS); + List supCompanyEntities = supCompanyService.filterCompany(filterSupCompanyRequest); + syncDataResponse.setSupCompanyEntities(supCompanyEntities); + if (CollUtil.isNotEmpty(supCompanyEntities)) { + for (SupCompanyEntity supCompanyEntity : supCompanyEntities) { + List tempsList = supCertService.findAll(supCompanyEntity.getCustomerId()); + if (CollUtil.isNotEmpty(tempsList)) { + supCertEntityList.addAll(tempsList); + } } } } - //获取生产企业资质证书 - FilterSupManufacturerRequest filterSupManufacturerRequest = new FilterSupManufacturerRequest(); - BeanUtils.copyProperties(spsSyncDataRequest, filterSupManufacturerRequest); - filterSupManufacturerRequest.setAuditStatus(ConstantStatus.AUDIT_PASS); - List supManufacturerEntities = supManufacturerService.getCompany(filterSupManufacturerRequest); - syncDataResponse.setSupManufacturerEntities(supManufacturerEntities); - if (CollUtil.isNotEmpty(supManufacturerEntities)) { - for (SupManufacturerEntity supManufacturerEntity : supManufacturerEntities) { - List tempsList = supCertService.findAll(supManufacturerEntity.getCustomerId(), supManufacturerEntity.getManufacturerId()); - if (CollUtil.isNotEmpty(tempsList)) { - supCertEntityList.addAll(tempsList); + if (syncDataSetEntity.isManufacturerCert()) { + //获取生产企业资质证书 + FilterSupManufacturerRequest filterSupManufacturerRequest = new FilterSupManufacturerRequest(); + BeanUtils.copyProperties(spsSyncDataRequest, filterSupManufacturerRequest); + filterSupManufacturerRequest.setAuditStatus(ConstantStatus.AUDIT_PASS); + List supManufacturerEntities = supManufacturerService.getCompany(filterSupManufacturerRequest); + syncDataResponse.setSupManufacturerEntities(supManufacturerEntities); + if (CollUtil.isNotEmpty(supManufacturerEntities)) { + for (SupManufacturerEntity supManufacturerEntity : supManufacturerEntities) { + List tempsList = supCertService.findAll(supManufacturerEntity.getCustomerId(), supManufacturerEntity.getManufacturerId()); + if (CollUtil.isNotEmpty(tempsList)) { + supCertEntityList.addAll(tempsList); + } } } } - - //获取产品资质证书 - FilterPoductRequest filterPoductRequest = new FilterPoductRequest(); - BeanUtils.copyProperties(spsSyncDataRequest, filterPoductRequest); - filterPoductRequest.setAuditStatus(ConstantStatus.AUDIT_PASS); - List supProductEntities = supProductService.filterProducts(filterPoductRequest); - syncDataResponse.setSupProductEntities(supProductEntities); - - if (CollUtil.isNotEmpty(supProductEntities)) { - for (SupProductEntity supProductEntity : supProductEntities) { - List tempsList = supCertService.findAll(supProductEntity.getCustomerId(), supProductEntity.getManufacturerIdFk(), supProductEntity.getProductId()); - if (CollUtil.isNotEmpty(tempsList)) { - supCertEntityList.addAll(tempsList); + if (syncDataSetEntity.isProductCert()) { + //获取产品资质证书 + FilterPoductRequest filterPoductRequest = new FilterPoductRequest(); + BeanUtils.copyProperties(spsSyncDataRequest, filterPoductRequest); + filterPoductRequest.setAuditStatus(ConstantStatus.AUDIT_PASS); + List supProductEntities = supProductService.filterProducts(filterPoductRequest); + syncDataResponse.setSupProductEntities(supProductEntities); + + if (CollUtil.isNotEmpty(supProductEntities)) { + for (SupProductEntity supProductEntity : supProductEntities) { + List tempsList = supCertService.findAll(supProductEntity.getCustomerId(), supProductEntity.getManufacturerIdFk(), supProductEntity.getProductId()); + if (CollUtil.isNotEmpty(tempsList)) { + supCertEntityList.addAll(tempsList); + } } } + syncDataResponse.setSupCertEntities(supCertEntityList); } - syncDataResponse.setSupCertEntities(supCertEntityList); + //企业证书设置 + FilterCertSetsRequest filterCertSetsRequest = new FilterCertSetsRequest(); + BeanUtils.copyProperties(spsSyncDataRequest, filterCertSetsRequest); + List supCertSetEntities = supCertSetService.filterCertSets(filterCertSetsRequest); + if (CollUtil.isNotEmpty(supCertSetEntities)) { + List temps = supCertSetService.filterCertSets(new FilterCertSetsRequest()); + List supCertSetResponses = temps.stream().map(item -> + { + SupCertSetResponse supCertSetResponse = new SupCertSetResponse(); + BeanUtils.copyProperties(item, supCertSetResponse); + return supCertSetResponse; + }).collect(Collectors.toList()); + syncDataResponse.setSupCertSetEntities(supCertSetResponses); + } + return syncDataResponse; } diff --git a/api-admin/src/main/java/com/glxp/api/admin/util/DateUtil.java b/api-admin/src/main/java/com/glxp/api/admin/util/DateUtil.java index 30866f5f..29078b1c 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/util/DateUtil.java +++ b/api-admin/src/main/java/com/glxp/api/admin/util/DateUtil.java @@ -543,4 +543,14 @@ public class DateUtil extends org.apache.commons.lang3.time.DateUtils { } return null; } + + public static String formatExpireTime(String str) { + try { + Date date = DateUtil.parseDate(str, "yyyyMMdd"); + return formatDate(date, "yyyy-MM-dd"); + } catch (ParseException e) { + e.printStackTrace(); + } + return str; + } } \ No newline at end of file diff --git a/api-admin/src/main/java/com/glxp/api/admin/util/HttpClient.java b/api-admin/src/main/java/com/glxp/api/admin/util/HttpClient.java index b9e24e6c..1d2754c4 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/util/HttpClient.java +++ b/api-admin/src/main/java/com/glxp/api/admin/util/HttpClient.java @@ -1,9 +1,6 @@ package com.glxp.api.admin.util; -import cn.hutool.json.JSONUtil; import lombok.extern.slf4j.Slf4j; -import org.springframework.http.HttpEntity; -import org.springframework.http.HttpHeaders; import org.springframework.web.client.RestTemplate; import java.io.UnsupportedEncodingException; @@ -91,19 +88,4 @@ public class HttpClient { return restTemplate.getForObject(accessTokenRequestUrl, String.class); } - - public static String uCloudPostSmp(String url, Object object, String appKey, String secretKey) { - RestTemplate restTemplate = new RestTemplate(); - String json = JSONUtil.toJsonStr(object); - log.info(url + "\n" + json); - HttpHeaders headers = new HttpHeaders(); - headers.add("Content-Type", "application/json"); - headers.add("api_key", appKey); - headers.add("secret_key", secretKey); - HttpEntity httpEntity = new HttpEntity<>(json, headers); - log.info(httpEntity.toString()); - String response = restTemplate.postForObject(url, httpEntity, String.class); - return response; - } - } diff --git a/api-admin/src/main/resources/application-dev.properties b/api-admin/src/main/resources/application-dev.properties index 2c87aee0..49ca51d6 100644 --- a/api-admin/src/main/resources/application-dev.properties +++ b/api-admin/src/main/resources/application-dev.properties @@ -1,4 +1,4 @@ -server.port=9991 +server.port=9992 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver spring.datasource.jdbc-url=jdbc:mysql://127.0.0.1:3306/udiwms_ph1?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true spring.datasource.username=root 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 6db6f2d7..72cc7cad 100644 --- a/api-admin/src/main/resources/mybatis/mapper/auth/AuthAdminDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/auth/AuthAdminDao.xml @@ -26,6 +26,9 @@ = DATE_FORMAT(#{lastUpdateTime}, '%Y-%m-%d %H:%i:%S') ]]> + + AND dept = #{deptCode} + ORDER BY id DESC diff --git a/api-admin/src/main/resources/mybatis/mapper/auth/DeptDao.xml b/api-admin/src/main/resources/mybatis/mapper/auth/DeptDao.xml index 38db043e..881e591c 100644 --- a/api-admin/src/main/resources/mybatis/mapper/auth/DeptDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/auth/DeptDao.xml @@ -57,4 +57,7 @@ from auth_dept + \ No newline at end of file diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/BasicDownloadDao.xml b/api-admin/src/main/resources/mybatis/mapper/basic/BasicDownloadDao.xml index 4c66913a..6c0f6345 100644 --- a/api-admin/src/main/resources/mybatis/mapper/basic/BasicDownloadDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/basic/BasicDownloadDao.xml @@ -68,5 +68,9 @@ FROM basic_download_status WHERE id = #{id} + + Delete From basic_download_status + where date(startTime) <= date(DATE_SUB(NOW(),INTERVAL 30 day)) + \ No newline at end of file diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/BasicExportDao.xml b/api-admin/src/main/resources/mybatis/mapper/basic/BasicExportDao.xml index f44bc8a6..e8e1d098 100644 --- a/api-admin/src/main/resources/mybatis/mapper/basic/BasicExportDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/basic/BasicExportDao.xml @@ -71,4 +71,9 @@ WHERE id = #{id} + + Delete From basic_export_status + where date(startTime) <= date(DATE_SUB(NOW(),INTERVAL 30 day)) + + \ No newline at end of file diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/BasicUnitMaintainDao.xml b/api-admin/src/main/resources/mybatis/mapper/basic/BasicUnitMaintainDao.xml index 7558e9c2..0cf4012d 100644 --- a/api-admin/src/main/resources/mybatis/mapper/basic/BasicUnitMaintainDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/basic/BasicUnitMaintainDao.xml @@ -257,4 +257,20 @@ #{outType} ) + + diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/BussinessChangeTypeDao.xml b/api-admin/src/main/resources/mybatis/mapper/basic/BussinessChangeTypeDao.xml index 99f42f0d..f499bfd6 100644 --- a/api-admin/src/main/resources/mybatis/mapper/basic/BussinessChangeTypeDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/basic/BussinessChangeTypeDao.xml @@ -20,18 +20,23 @@ + + diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/BussinessTypeDao.xml b/api-admin/src/main/resources/mybatis/mapper/basic/BussinessTypeDao.xml index 58ba333c..fc13cf7b 100644 --- a/api-admin/src/main/resources/mybatis/mapper/basic/BussinessTypeDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/basic/BussinessTypeDao.xml @@ -327,12 +327,14 @@ checkPc=#{checkPc}, checkWebNew=#{checkWebNew}, checkChange=#{checkChange}, + checkSp=#{checkSp}, secCheckUdims=#{secCheckUdims}, secCheckPdaEd=#{secCheckPdaEd}, secCheckPdaUn=#{secCheckPdaUn}, secCheckPc=#{secCheckPc}, secCheckWebNew=#{secCheckWebNew}, secCheckChange=#{secCheckChange}, + secCheckSp=#{secCheckSp}, checkBalacne=#{checkBalacne}, secCheckBalacne=#{secCheckBalacne}, index=#{index}, diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/CompanyProductRelevanceDao.xml b/api-admin/src/main/resources/mybatis/mapper/basic/CompanyProductRelevanceDao.xml index 8735c9ca..1a99b4de 100644 --- a/api-admin/src/main/resources/mybatis/mapper/basic/CompanyProductRelevanceDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/basic/CompanyProductRelevanceDao.xml @@ -141,7 +141,7 @@ AND basic_udirel.id = #{id} - AND customer_info.companyName = #{companyName} + AND basic_corp.name = #{companyName} AND basic_udirel.lockStatus = #{lockStatus} @@ -155,9 +155,6 @@ AND (basic_udirel.isDisable is null or basic_udirel.isDisable = false ) - - AND basic_corp.name = #{companyName} - ORDER BY basic_udirel.updateTime DESC @@ -300,4 +297,7 @@ WHERE udiRlIdFk = #{id} + \ No newline at end of file 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 7e810ab5..de114485 100644 --- a/api-admin/src/main/resources/mybatis/mapper/basic/EntrustReceDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/basic/EntrustReceDao.xml @@ -73,8 +73,8 @@ - + select inv_space.code, inv_space.name, iws.name invSubStorageName, iw.name invStorageName from inv_space + left join inv_warehouse_sub iws on iws.code = inv_space.invWarehouseCode + left join inv_warehouse iw on iw.code = inv_space.invStorageCode - AND invStorageCode = #{invStorageCode} + AND inv_space.invStorageCode = #{invStorageCode} - AND invWarehouseCode = #{invWarehouseCode} + AND inv_space.invWarehouseCode = #{invWarehouseCode} - AND status = #{status} + AND inv_space.status = #{status} diff --git a/api-admin/src/main/resources/mybatis/mapper/business/StockOrderDao.xml b/api-admin/src/main/resources/mybatis/mapper/business/StockOrderDao.xml index 3cab13e7..a9e8a789 100644 --- a/api-admin/src/main/resources/mybatis/mapper/business/StockOrderDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/business/StockOrderDao.xml @@ -95,7 +95,8 @@ UPDATE stock_order - SET `status` = #{status},`updateTime` = #{updateTime} + SET `status` = #{status}, + `updateTime` = #{updateTime} where id = #{orderId} @@ -216,9 +217,13 @@ and inv_warehouse_user.userId =#{userId} + + + and stock_order.orderIdFk is null + group by stock_order.id - ORDER BY updateTime DESC + ORDER BY stock_order.billdate DESC diff --git a/api-admin/src/main/resources/mybatis/mapper/info/PlatformDao.xml b/api-admin/src/main/resources/mybatis/mapper/info/PlatformDao.xml deleted file mode 100644 index 46b57f29..00000000 --- a/api-admin/src/main/resources/mybatis/mapper/info/PlatformDao.xml +++ /dev/null @@ -1,106 +0,0 @@ - - - - - - replace into auth_platform - (id, name, host) - values - - (#{item.id}, #{item.name,jdbcType=VARCHAR}, #{item.host,jdbcType=VARCHAR}) - - - - - - - - - - - - - - - insert into auth_platform(id, name, host) - VALUES (#{id}, #{name}, #{host}) - - - - - - delete - from auth_platform - where id = #{id} - - - - update auth_platform - - - name = #{name}, - - - host = #{host}, - - - where id = #{id} - - diff --git a/api-admin/src/main/resources/mybatis/mapper/inout/CodesDao.xml b/api-admin/src/main/resources/mybatis/mapper/inout/CodesDao.xml index b85e24d3..c9398987 100644 --- a/api-admin/src/main/resources/mybatis/mapper/inout/CodesDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/inout/CodesDao.xml @@ -200,4 +200,16 @@ + + + \ No newline at end of file diff --git a/api-admin/src/main/resources/mybatis/mapper/inout/OrderDao.xml b/api-admin/src/main/resources/mybatis/mapper/inout/OrderDao.xml index c4e840d3..e44d966d 100644 --- a/api-admin/src/main/resources/mybatis/mapper/inout/OrderDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/inout/OrderDao.xml @@ -68,7 +68,7 @@ receiveStatus, erpFk, stockCheckFk, thirdBillNo, supId, exportFilePath, locStorageCode, supplementNo, ullageSupNo, createUser, reviewUser, outChangeEnable, originUllageSupNo, preCheck, updateTime, replicateNo, invWarehouseCode, - fromSubInvCode, createTime, originFromType, invStorageCode, deptCode, printRemark, codeFillCheck,preInBillNo,preOutBillNo) + fromSubInvCode,subInvCode, createTime, originFromType, invStorageCode, deptCode, printRemark, codeFillCheck,preInBillNo,preOutBillNo) values ( #{id}, #{action}, @@ -102,6 +102,7 @@ #{replicateNo}, #{invWarehouseCode}, #{fromSubInvCode}, + #{subInvCode}, #{createTime}, #{originFromType}, #{invStorageCode}, @@ -150,6 +151,7 @@ auditTime=#{auditTime}, replicateNo=#{replicateNo}, fromSubInvCode=#{fromSubInvCode}, + subInvCode=#{subInvCode}, createTime=#{createTime}, originFromType=#{originFromType}, deptCode=#{deptCode}, @@ -661,4 +663,19 @@ where id = #{id} + + + + update io_order set printRemark = #{printRemark} where id = #{orderId} + + + \ No newline at end of file diff --git a/api-admin/src/main/resources/mybatis/mapper/inout/OrderDetailDao.xml b/api-admin/src/main/resources/mybatis/mapper/inout/OrderDetailDao.xml index 624b9597..4bb19cd6 100644 --- a/api-admin/src/main/resources/mybatis/mapper/inout/OrderDetailDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/inout/OrderDetailDao.xml @@ -272,4 +272,9 @@ where orderIdFk = #{orderId} + + update io_order_detail + set erpOrderId = #{erpOrderId} + where orderIdFk = #{orderIdFk} + \ No newline at end of file diff --git a/api-admin/src/main/resources/mybatis/mapper/inout/UnitMaintainPlatformDao.xml b/api-admin/src/main/resources/mybatis/mapper/inout/UnitMaintainPlatformDao.xml deleted file mode 100644 index 8efe4521..00000000 --- a/api-admin/src/main/resources/mybatis/mapper/inout/UnitMaintainPlatformDao.xml +++ /dev/null @@ -1,133 +0,0 @@ - - - - - - - - - update io_unit_maintain_platform - - - unitId = #{unitId}, - - - customerId = #{customerId}, - - - platformId = #{platformId}, - - - sourceAction = #{sourceAction}, - - - targetAction = #{targetAction}, - - - invCode = #{invCode}, - - - invSubCode = #{invSubCode}, - - - appid = #{appid}, - - - apiKey = #{apiKey}, - - - secretKey = #{secretKey} - - - where id = #{id} - - - - insert into io_unit_maintain_platform (unitId, customerId, platformId, sourceAction, targetAction, invCode, - invSubCode, appid, apiKey, secretKey) - VALUES (#{unitId}, #{customerId}, #{platformId}, #{sourceAction}, #{targetAction}, #{invCode}, #{invSubCode}, - #{appid}, #{apiKey}, #{secretKey}) - - - - - - - - delete from io_unit_maintain_platform where id = #{id} - - \ No newline at end of file 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 3c361699..18559df6 100644 --- a/api-admin/src/main/resources/mybatis/mapper/inout/WarehouseBussinessTypeDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/inout/WarehouseBussinessTypeDao.xml @@ -25,6 +25,7 @@ delete from inv_warehouse_bussiness_type where id = #{id,jdbcType=INTEGER} + diff --git a/api-admin/src/main/resources/mybatis/mapper/inout/WarehouseUserDao.xml b/api-admin/src/main/resources/mybatis/mapper/inout/WarehouseUserDao.xml index 90b22a52..28ef981b 100644 --- a/api-admin/src/main/resources/mybatis/mapper/inout/WarehouseUserDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/inout/WarehouseUserDao.xml @@ -9,10 +9,11 @@ + - id, code, userId, userName, isDirector + id, code, userId, userName, isDirector,locSubInvCode @@ -40,10 +42,10 @@ parameterType="com.glxp.api.admin.entity.inventory.DeviceCollectOrderEntity" useGeneratedKeys="true"> insert into device_collect_order (orderId, deptCode, `createUser`, auditUser, createTime, updateTime, - `status`) + `status`, collectUser) values (#{orderId,jdbcType=VARCHAR}, #{deptCode,jdbcType=VARCHAR}, #{createUser,jdbcType=VARCHAR}, #{auditUser,jdbcType=VARCHAR}, #{createTime,jdbcType=VARCHAR}, #{updateTime,jdbcType=VARCHAR}, - #{status,jdbcType=INTEGER}) + #{status,jdbcType=INTEGER}, #{collectUser,jdbcType=VARCHAR}) `status`, + + collectUser, + @@ -94,6 +99,9 @@ #{status,jdbcType=INTEGER}, + + #{collectUser,jdbcType=VARCHAR}, + @@ -122,6 +130,9 @@ `status` = #{status,jdbcType=INTEGER}, + + collectUser = #{collectUser,jdbcType=VARCHAR}, + where id = #{id,jdbcType=INTEGER} @@ -134,22 +145,24 @@ auditUser = #{auditUser,jdbcType=VARCHAR}, createTime = #{createTime,jdbcType=VARCHAR}, updateTime = #{updateTime,jdbcType=VARCHAR}, - `status` = #{status,jdbcType=INTEGER} + `status` = #{status,jdbcType=INTEGER}, + collectUser = #{collectUser,jdbcType=VARCHAR} where id = #{id,jdbcType=INTEGER} + + + + \ No newline at end of file diff --git a/api-admin/src/main/resources/mybatis/mapper/inventory/DeviceMAOrderDetailDao.xml b/api-admin/src/main/resources/mybatis/mapper/inventory/DeviceMAOrderDetailDao.xml index 46da97d1..233b10ed 100644 --- a/api-admin/src/main/resources/mybatis/mapper/inventory/DeviceMAOrderDetailDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/inventory/DeviceMAOrderDetailDao.xml @@ -266,4 +266,18 @@ select from device_ma_order_detail where orderIdFk = #{orderId} + + \ No newline at end of file diff --git a/api-admin/src/main/resources/mybatis/mapper/inventory/InnerOrderDao.xml b/api-admin/src/main/resources/mybatis/mapper/inventory/InnerOrderDao.xml index d1bcffdc..bcf1da8b 100644 --- a/api-admin/src/main/resources/mybatis/mapper/inventory/InnerOrderDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/inventory/InnerOrderDao.xml @@ -12,8 +12,11 @@ AND recordKey = #{recordKey} + + AND date_format(inv_inner_order.createTime, '%Y-%m-%d') between date_format(#{startDate}, + '%Y-%m-%d') and date_format(#{endDate}, '%Y-%m-%d') + - + + + delete from inv_count_order + where orderId = #{orderId} + \ No newline at end of file diff --git a/api-admin/src/main/resources/mybatis/mapper/inventory/InvMaintenanceOrderDao.xml b/api-admin/src/main/resources/mybatis/mapper/inventory/InvMaintenanceOrderDao.xml index daf7eaf7..17324435 100644 --- a/api-admin/src/main/resources/mybatis/mapper/inventory/InvMaintenanceOrderDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/inventory/InvMaintenanceOrderDao.xml @@ -192,7 +192,8 @@ inv_space.name invSpaceName from inv_maintenance_order ma left join inv_warehouse_sub on ma.invWarehouseCode = inv_warehouse_sub.code - left join inv_space on ma.invSpaceCode = inv_space.code + left join inv_space + on ma.invSpaceCode = inv_space.code and inv_warehouse_sub.code = inv_space.invWarehouseCode AND ma.id = #{id} diff --git a/api-admin/src/main/resources/mybatis/mapper/inventory/InvMaintenanceOrderDetailDao.xml b/api-admin/src/main/resources/mybatis/mapper/inventory/InvMaintenanceOrderDetailDao.xml index 658398f1..b6b8e780 100644 --- a/api-admin/src/main/resources/mybatis/mapper/inventory/InvMaintenanceOrderDetailDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/inventory/InvMaintenanceOrderDetailDao.xml @@ -241,7 +241,7 @@ mad.createTime, mad.updateTime, basic_products.cpmctymc productName, - ip.ggxh, + basic_products.ggxh, basic_products.zczbhhzbapzbh, basic_products.ylqxzcrbarmc FROM inv_maintenance_order_detail mad diff --git a/api-admin/src/main/resources/mybatis/mapper/inventory/InvPreInProductDao.xml b/api-admin/src/main/resources/mybatis/mapper/inventory/InvPreInProductDao.xml index f0d8d70d..93aad7ac 100644 --- a/api-admin/src/main/resources/mybatis/mapper/inventory/InvPreInProductDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/inventory/InvPreInProductDao.xml @@ -122,8 +122,8 @@ inv_prein_product.batchNo ,inv_prein_product.productionDate,inv_prein_product.expireDate, basic_products.ylqxzcrbarmc,basic_products.zczbhhzbapzbh, - inv_prein_product.inCount,inv_prein_product.outCount - ,inv_prein_product.reCount,inv_prein_product.customerId, + sum(inv_prein_product.inCount) as inCount,sum(inv_prein_product.outCount) as outCount, + sum(inv_prein_product.reCount) as reCount,inv_prein_product.customerId, basic_corp.name companyName,inv_prein_product.supId,inv_prein_product.unitFk ,inv_warehouse.name invStorageName,inv_prein_product.invStorageCode,inv_prein_product.price,inv_warehouse_sub.name invSubStorageName ,inv_prein_product.invWarehouseCode,inv_prein_product.orderIdFk @@ -200,7 +200,7 @@ GROUP BY #{groupType} - group by inv_prein_product.id + group by inv_prein_product.orderIdFk order by inv_prein_product.updateTime desc AND inv_product.ggxh like concat('%', #{ggxh}, '%') - + AND inv_product.batchNo like concat('%', #{batchNo}, '%') + + AND inv_product.batchNo is NULL + AND inv_product.productionDate = #{productionDate} @@ -219,8 +222,8 @@ ip.supId, ip.price, iw.name invStorageName, - inCount, - outCount + sum(ip.inCount) inCount, + sum(ip.outCount) outCount from inv_product ip inner join basic_udirel bu on ip.relIdFk = bu.id inner join basic_products bp on bu.uuid = bp.uuid @@ -256,6 +259,7 @@ AND ip.batchNo like concat('%', #{batchNo,jdbcType=VARCHAR}, '%') + group by ip.relIdFk, ip.batchNo @@ -442,6 +446,9 @@ AND ipd.invSpaceCode = #{invSpaceCode} + + AND bp.cplb = #{cplb} + group by ip.id diff --git a/api-admin/src/main/resources/mybatis/mapper/inventory/InvProductDetailDao.xml b/api-admin/src/main/resources/mybatis/mapper/inventory/InvProductDetailDao.xml index 4959ec2a..933c1db1 100644 --- a/api-admin/src/main/resources/mybatis/mapper/inventory/InvProductDetailDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/inventory/InvProductDetailDao.xml @@ -434,6 +434,6 @@ \ No newline at end of file diff --git a/api-admin/src/main/resources/mybatis/mapper/inventory/InvSubWarehouseDao.xml b/api-admin/src/main/resources/mybatis/mapper/inventory/InvSubWarehouseDao.xml index b184fb97..891c93ea 100644 --- a/api-admin/src/main/resources/mybatis/mapper/inventory/InvSubWarehouseDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/inventory/InvSubWarehouseDao.xml @@ -230,4 +230,31 @@ group by inv_warehouse_sub.id + + \ No newline at end of file diff --git a/api-admin/src/main/resources/mybatis/mapper/purchase/PurApplyDao.xml b/api-admin/src/main/resources/mybatis/mapper/purchase/PurApplyDao.xml index 12bf3d66..dceadf42 100644 --- a/api-admin/src/main/resources/mybatis/mapper/purchase/PurApplyDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/purchase/PurApplyDao.xml @@ -47,6 +47,9 @@ AND createBy = #{createBy} + + AND generatePlan = 1 + @@ -57,7 +60,7 @@ INTO pur_apply ( billNo,billDate,status,billType,remark,locStorageCode,invWarehouseCode, - deptCode,createBy,createTime,auditBy,auditTime,updateTime,auditRemark,targetInv,targetSubInv,targetBillType,planBillNo + deptCode,createBy,createTime,auditBy,auditTime,updateTime,auditRemark,targetInv,targetSubInv,targetBillType,planBillNo,generatePlan ) values ( #{billNo}, @@ -77,7 +80,7 @@ #{targetInv}, #{targetSubInv}, #{targetBillType}, - #{planBillNo} + #{planBillNo},#{generatePlan} ) @@ -117,6 +120,7 @@ targetSubInv=#{targetSubInv}, targetBillType=#{targetBillType}, planBillNo=#{planBillNo}, + generatePlan=#{generatePlan}, WHERE id = #{id} diff --git a/api-admin/src/main/resources/mybatis/mapper/purchase/PurApplyDetailDao.xml b/api-admin/src/main/resources/mybatis/mapper/purchase/PurApplyDetailDao.xml index bdb115fc..45c0910f 100644 --- a/api-admin/src/main/resources/mybatis/mapper/purchase/PurApplyDetailDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/purchase/PurApplyDetailDao.xml @@ -33,7 +33,6 @@ AND orderIdFk = #{orderIdFk} - AND basic_products.diType=1 AND productId = #{productId} diff --git a/api-admin/src/main/resources/mybatis/mapper/purchase/SupCertDao.xml b/api-admin/src/main/resources/mybatis/mapper/purchase/SupCertDao.xml index d602bd61..6b8253c7 100644 --- a/api-admin/src/main/resources/mybatis/mapper/purchase/SupCertDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/purchase/SupCertDao.xml @@ -88,7 +88,11 @@ UPDATE sup_cert set customerId = #{newId} + + ,auditStatus = #{auditStatus} + WHERE customerId = #{oldId} + diff --git a/api-admin/src/main/resources/mybatis/mapper/purchase/SupCertSetDao.xml b/api-admin/src/main/resources/mybatis/mapper/purchase/SupCertSetDao.xml index c6492ba7..2a6c88c9 100644 --- a/api-admin/src/main/resources/mybatis/mapper/purchase/SupCertSetDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/purchase/SupCertSetDao.xml @@ -16,7 +16,9 @@ and `need` = #{need} - + + = DATE_FORMAT(#{lastUpdateTime}, '%Y-%m-%d %H:%i:%S') ]]> + ORDER BY id DESC @@ -60,5 +62,8 @@ #{imports}, #{type}) - + + DELETE + FROM sup_cert_set + \ No newline at end of file diff --git a/api-admin/src/main/resources/mybatis/mapper/purchase/SupManufacturerDao.xml b/api-admin/src/main/resources/mybatis/mapper/purchase/SupManufacturerDao.xml index 9b6bfaea..777e09ac 100644 --- a/api-admin/src/main/resources/mybatis/mapper/purchase/SupManufacturerDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/purchase/SupManufacturerDao.xml @@ -102,7 +102,7 @@ - INSERT INTO sup_manufacturer(companyName, creditCode, companyType, + replace INTO sup_manufacturer(companyName, creditCode, companyType, placeArea, placeAreaCode, placeAddress, legalPersonName, legalPersonPapersType, legalPersonPapersCode, productionArea, productionAreaCode, productionAddress, @@ -128,8 +128,8 @@ diff --git a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrCorpExportLogDao.xml b/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrCorpExportLogDao.xml index 4e45e881..b831e27c 100644 --- a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrCorpExportLogDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrCorpExportLogDao.xml @@ -53,4 +53,9 @@ WHERE genKey = #{genKey} + + Delete From thr_corp_export_log + where date(updateTime) <= date(DATE_SUB(NOW(),INTERVAL 30 day)) + + \ No newline at end of file diff --git a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrCorpImportDetailDao.xml b/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrCorpImportDetailDao.xml index 597678f0..39150627 100644 --- a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrCorpImportDetailDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrCorpImportDetailDao.xml @@ -89,4 +89,9 @@ WHERE id = #{id} + + Delete From thr_corp_import_detail + where date(updateTime) <= date(DATE_SUB(NOW(),INTERVAL 30 day)) + + \ No newline at end of file diff --git a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrCorpImportLogDao.xml b/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrCorpImportLogDao.xml index 85afe623..830ddb0f 100644 --- a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrCorpImportLogDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrCorpImportLogDao.xml @@ -55,4 +55,9 @@ WHERE genKey = #{genKey} + + Delete From thr_corp_import_log + where date(updateTime) <= date(DATE_SUB(NOW(),INTERVAL 30 day)) + + \ No newline at end of file diff --git a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrImportLogDao.xml b/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrImportLogDao.xml index 66b8bc69..630c16b2 100644 --- a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrImportLogDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrImportLogDao.xml @@ -59,4 +59,9 @@ WHERE genKey = #{genKey} + + Delete From thr_import_log + where date(updateTime) <= date(DATE_SUB(NOW(),INTERVAL 30 day)) + + \ No newline at end of file diff --git a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrOrderDao.xml b/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrOrderDao.xml index c8b0e1c7..3d939001 100644 --- a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrOrderDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrOrderDao.xml @@ -116,7 +116,7 @@ INTO thr_order (id,billNo, billdate, corpId, corpName, billType, billFlag, thirdSysFk, updateTime, originType, unitIdFk, startDate, endDate, createUser, reviewUser, address, linkMan, linkTel, remark, remark1, remark2, - remark3,locStorageCode,editStatus,invWarehouseCode,thirdPartyDate,fromSubInvCode,`type`,allocateStatus) + remark3, locStorageCode,editStatus,invWarehouseCode,thirdPartyDate,fromSubInvCode,`type`,allocateStatus) values ( #{id}, #{billNo}, diff --git a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrOrderDetailDao.xml b/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrOrderDetailDao.xml index 525bce26..8541c036 100644 --- a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrOrderDetailDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrOrderDetailDao.xml @@ -126,4 +126,9 @@ FROM thr_order_detail + + Delete From thr_order_detail + where date(updateTime) <= date(DATE_SUB(NOW(),INTERVAL 30 day)) + + \ No newline at end of file diff --git a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrOrderExportLogDao.xml b/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrOrderExportLogDao.xml index 41c06c0a..fba76704 100644 --- a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrOrderExportLogDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrOrderExportLogDao.xml @@ -50,4 +50,10 @@ WHERE genKey = #{genKey} + + Delete From thr_order_export_log + where date(updateTime) <= date(DATE_SUB(NOW(),INTERVAL 30 day)) + + + \ No newline at end of file diff --git a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrOrderImportDetailDao.xml b/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrOrderImportDetailDao.xml index a3331b2f..c665cc30 100644 --- a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrOrderImportDetailDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrOrderImportDetailDao.xml @@ -90,4 +90,10 @@ WHERE id = #{id} + + + Delete From thr_order_import_detail + where date(updateTime) <= date(DATE_SUB(NOW(),INTERVAL 30 day)) + + \ No newline at end of file diff --git a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrOrderImportLogDao.xml b/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrOrderImportLogDao.xml index d06df015..cd990e98 100644 --- a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrOrderImportLogDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrOrderImportLogDao.xml @@ -54,4 +54,9 @@ WHERE genKey = #{genKey} + + Delete From thr_order_import_log + where date(updateTime) <= date(DATE_SUB(NOW(),INTERVAL 30 day)) + + \ No newline at end of file diff --git a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrProductsExportLogDao.xml b/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrProductsExportLogDao.xml index 2213c2e0..0a240c48 100644 --- a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrProductsExportLogDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrProductsExportLogDao.xml @@ -53,4 +53,10 @@ WHERE genKey = #{genKey} + + + Delete From thr_products_export_log + where date(updateTime) <= date(DATE_SUB(NOW(),INTERVAL 30 day)) + + \ No newline at end of file diff --git a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrProductsImportDetailDao.xml b/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrProductsImportDetailDao.xml index e73a9eaa..e0d86e8d 100644 --- a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrProductsImportDetailDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrProductsImportDetailDao.xml @@ -102,4 +102,9 @@ WHERE id = #{id} + + Delete From thr_products_import_detail + where date(updateTime) <= date(DATE_SUB(NOW(),INTERVAL 30 day)) + + \ No newline at end of file diff --git a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrProductsImportLogDao.xml b/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrProductsImportLogDao.xml index 7a30ae16..bf76ba29 100644 --- a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrProductsImportLogDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrProductsImportLogDao.xml @@ -54,4 +54,10 @@ WHERE genKey = #{genKey} + + + Delete From thr_porducts_import_log + where date(updateTime) <= date(DATE_SUB(NOW(),INTERVAL 30 day)) + + \ No newline at end of file diff --git a/api-admin/src/main/resources/schemas/schema_v2.1.sql b/api-admin/src/main/resources/schemas/schema_v2.1.sql index bb0c7c7c..3bf3d7f1 100644 --- a/api-admin/src/main/resources/schemas/schema_v2.1.sql +++ b/api-admin/src/main/resources/schemas/schema_v2.1.sql @@ -1,12 +1,85 @@ - -- 字段新增 （表名，字段名，字段类型，修改方式（1：新增，2：修改，3：删除） CALL Pro_Temp_ColumnWork ('basic_export_status','receiveStatus','varchar(255) ', 1); CALL Pro_Temp_ColumnWork ('io_order','wzUploadStatus','varchar(255) ', 1); CALL Pro_Temp_ColumnWork ('io_order','wzUploadResult','varchar(255) ', 1); +CALL Pro_Temp_ColumnWork ('sup_cert','filePath','varchar(255) ', 2); + CALL Pro_Temp_ColumnWork ('auth_dept','parentId','int ', 1); -- 创建表时必须 create table if not exists 表名 +CREATE TABLE if not exists `device_collect_order` ( + `id` int NOT NULL AUTO_INCREMENT COMMENT 'id', + `orderId` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '领用记录号', + `deptCode` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '领用部门', + `createUser` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '创建人', + `auditUser` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '审核人', + `createTime` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '领用时间', + `updateTime` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '更新时间', + `status` tinyint(1) NULL DEFAULT NULL COMMENT '状态 0：草稿 1：未审核 2：已审核', + `collectUser` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '领用人', + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB AUTO_INCREMENT = 9 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = '设备领用记录表' ROW_FORMAT = Dynamic; + +CREATE TABLE if not exists `device_collect_order_detail` ( + `id` int NOT NULL AUTO_INCREMENT COMMENT 'id', + `orderIdFk` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '设备领用记录号', + `originCode` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '原始码', + `code` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '码', + `productId` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '产品ID', + `nameCode` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '产品DI', + `batchNo` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '批次号', + `produceDate` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '生产日期', + `expireDate` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '失效日期', + `serialNo` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '序列号', + `createTime` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '领用时间', + `updateTime` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '更新时间', + `invWarehouseCode` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '领用分库', + `invStorageCode` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '领用仓库', + `invSpaceCode` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '领用货位', + `receiveWarehouseCode` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '接收分库', + `receiveStorageCode` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '接收仓库', + `receiveSpaceCode` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '接收货位', + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB AUTO_INCREMENT = 11 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = '设备领用记录详情' ROW_FORMAT = Dynamic; + +CREATE TABLE if not exists `device_ma_order` ( + `id` int NOT NULL AUTO_INCREMENT, + `orderId` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '设备养护记录号', + `collOrderId` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '设备领用单据号', + `createTime` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '养护时间', + `updateTime` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '更新时间', + `createUser` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '养护人', + `auditUser` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '审核人', + `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '养护说明', + `status` tinyint(1) NULL DEFAULT NULL COMMENT '状态', + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB AUTO_INCREMENT = 2 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = '设备养护记录表' ROW_FORMAT = Dynamic; + +CREATE TABLE if not exists `device_ma_order_detail` ( + `id` int NOT NULL AUTO_INCREMENT COMMENT 'id', + `orderIdFk` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '设备养护记录号', + `code` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '条码', + `nameCode` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '产品DI', + `productId` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '产品ID', + `batchNo` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '批次号', + `produceDate` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '生产日期', + `expireDate` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '失效日期', + `serialNo` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '序列号', + `createTime` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '创建时间', + `updateTime` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '更新时间', + `deviceStatus` tinyint(1) NULL DEFAULT NULL COMMENT '设备状态 0：异常 1：正常', + `maintenanceStatus` tinyint(1) NULL DEFAULT NULL COMMENT '养护状态 0：未养护 1：已养护', + `createUser` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '养护人', + `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '养护说明', + `status` tinyint(1) NULL DEFAULT NULL COMMENT '状态', + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB AUTO_INCREMENT = 3 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = '设备养护记录详情表' ROW_FORMAT = Dynamic; + +-- 删除自助平台表 +drop table if exists auth_platform; +-- 删除医院客户和自助平台关联表 +drop table if exists io_unit_maintain_platform;