From c4ef1e321c9047997f082c75b5cb9650df7c8680 Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Fri, 7 Mar 2025 10:39:23 +0800 Subject: [PATCH 1/7] =?UTF-8?q?3/7=20order=E7=9B=B8=E5=85=B3=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E7=B4=A2=E5=BC=95=201.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mybatis/mapper/inout/IoOrderDao.xml | 55 +++++++++---------- src/main/resources/schemas/schema_v2.4.sql | 8 +++ 2 files changed, 35 insertions(+), 28 deletions(-) diff --git a/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml b/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml index d9e889a61..368020c31 100644 --- a/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml +++ b/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml @@ -51,33 +51,34 @@ INNER JOIN io_unit_maintain_platform a2 on io.action = a2.sourceAction AND io.fromCorp = a2.unitId + + AND io.billNo like concat(#{billNo}, '%') + + + AND io.action = #{action} + + + AND io.invCode = #{invCode} + + + AND io.productType = #{productType} + AND id = #{id} AND io.updateUser = #{updateUser} - - AND io.productType = #{productType} - - - AND (SELECT NAME FROM auth_warehouse aw2 WHERE aw2.CODE = io.fromInvCode) like concat('%', #{corpName}, '%') - - AND io.action = #{action} - AND io.remark like concat('%', #{remark}, '%') AND io.mainAction = #{mainAction} - - AND io.billNo like concat('%', #{billNo}, '%') - AND io.corpOrderId = #{corpOrderId} @@ -102,9 +103,6 @@ AND io.deptCode = #{deptCode} - - AND io.invCode = #{invCode} - AND io.busType = #{busType} @@ -280,6 +278,12 @@ ) As partCount from io_order as io + + AND billNo like concat(#{billNo}, '%') + + + AND action = #{action} + AND id = #{id} @@ -287,15 +291,9 @@ AND (SELECT NAME FROM auth_warehouse aw2 WHERE aw2.CODE = io.fromInvCode) like concat('%', #{corpName}, '%') - - AND action = #{action} - AND mainAction = #{mainAction} - - AND billNo like concat('%', #{billNo}, '%') - AND corpOrderId = #{corpOrderId} @@ -414,14 +412,15 @@ from io_order - AND billNo like concat('%', #{billNo}, '%') - - - AND id = #{id} + AND billNo like concat( #{billNo}, '%') AND action = #{action} + + AND id = #{id} + + AND mainAction = #{mainAction} @@ -502,6 +501,9 @@ left join io_order_upload_log ioul on io.billNo = ioul.billNo io.dealStatus = 3 + + AND io.billNo like concat(#{billNo}, '%') + AND action = #{billType} @@ -511,9 +513,6 @@ #{item} - - AND io.billNo like concat('%', #{billNo}, '%') - AND invCode = #{invCode} @@ -641,7 +640,7 @@ or io.outSickInfo like concat('%', #{unionRemark}, '%')) - AND io.billNo like concat('%', #{billNo}, '%') + AND io.billNo like concat( #{billNo}, '%') AND io.corpOrderId = #{corpOrderId} diff --git a/src/main/resources/schemas/schema_v2.4.sql b/src/main/resources/schemas/schema_v2.4.sql index 56947aa1c..4c5c77e8d 100644 --- a/src/main/resources/schemas/schema_v2.4.sql +++ b/src/main/resources/schemas/schema_v2.4.sql @@ -5267,3 +5267,11 @@ ALTER TABLE rel_code_batch CALL Pro_Temp_ColumnWork('basic_corp', 'aliEntId', 'varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT ''阿里供应商ID''', 1); + +CALL Modify_index('io_order', 'action,invCode', 'idex_order_query', 'BTREE'); +CALL Modify_index('io_order', 'mainAction', 'idex_order_query_mainAction', 'BTREE'); +call Modify_UNIQUE_index('io_code', 'code', 'idex_code_query', 'BTREE'); +call Modify_UNIQUE_index('io_code_temp', 'code', 'idex_code_temp_query', 'BTREE'); +CALL Modify_index('io_order_detail_code', 'orderIdFk', 'idex_query_orderIdFk', 'BTREE'); +CALL Modify_index('io_order_detail_biz', 'orderIdFk', 'idex_query_orderIdFk', 'BTREE'); + From d71fb5558756afff853bcef941723b2b1c8e0fb5 Mon Sep 17 00:00:00 2001 From: chenhc <2369838784@qq.com> Date: Fri, 7 Mar 2025 11:02:47 +0800 Subject: [PATCH 2/7] =?UTF-8?q?feat:=20=E6=8E=A7=E5=88=B6=E5=B1=82?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic/SysWorkplaceRegionController.java | 35 +-- .../basic/UdiContrastController.java | 2 - .../controller/basic/UdiSyncController.java | 3 - .../IoCollectOrderCodeManController.java | 28 --- .../collect/IoCollectOrderController.java | 33 +-- .../collect/IoSplitFifoInvRelController.java | 14 -- .../collect/RelCodeBatchController.java | 2 - .../collect/RelCodeDetailController.java | 2 - .../dev/DeviceAssetLoacationController.java | 12 - .../controller/dev/DeviceInfoController.java | 1 - .../DeviceInspectPlanDelectController.java | 2 - .../dev/DeviceInspectTakeController.java | 13 -- .../dev/DeviceReceiveOrderController.java | 9 +- .../dev/DeviceUpkeepDetailController.java | 2 - .../controller/dev/InvMAOrderController.java | 2 +- .../dev/InvMAOrderDetailController.java | 2 +- .../controller/inout/IoCodeController.java | 5 +- .../inout/IoCodeLostController.java | 52 +---- .../inout/IoCodeTempController.java | 37 +-- .../inout/IoDestinyProcessController.java | 10 +- .../controller/inout/IoOrderController.java | 73 +----- .../inout/IoOrderDetailBizController.java | 35 --- .../inout/IoOrderDetailResultController.java | 27 --- .../inout/IoOrderInvoiceController.java | 2 - .../inout/IoOrderMutiController.java | 16 -- .../inout/IoOrderMutiSetController.java | 1 - .../inout/IoOrderReviewController.java | 8 - .../controller/inout/IoPdaCodeController.java | 4 - .../controller/inout/IoSplitController.java | 8 - .../inout/IoSplitFifoController.java | 1 - .../inout/IoSplitFifoInvController.java | 1 - .../controller/inout/WorkPutController.java | 10 - .../controller/inout/ioCodeRelController.java | 7 +- .../controller/inv/ApiExcelController.java | 2 - .../api/controller/inv/BadDbController.java | 1 - .../inv/InvCountOrderController.java | 4 +- .../inv/InvCountSettingController.java | 5 - .../inv/InvInnerOrderPrintController.java | 19 +- .../controller/inv/InvPlaceController.java | 6 - .../inv/InvPreinOrderController.java | 16 +- .../inv/InvPreinProductController.java | 1 + .../controller/inv/InvProductController.java | 13 -- .../inv/InvProductRationController.java | 2 - .../inv/InvSickTraceController.java | 3 +- .../inv/InvUserProductDetailController.java | 17 -- .../inv/StockCompareController.java | 14 +- .../controller/inv/UdiTraceController.java | 6 +- .../monitor/SysLogininforController.java | 3 +- .../monitor/SysOperlogController.java | 5 +- .../purchase/IoPurChangeService.java | 5 +- .../purchase/PurApplyArgumentController.java | 3 +- .../purchase/PurApplyController.java | 51 +---- .../purchase/PurContractController.java | 3 +- .../purchase/PurInquiryController.java | 9 +- .../purchase/PurInquiryOfferController.java | 9 +- .../purchase/PurOrderController.java | 78 +------ .../purchase/PurOrderPrintController.java | 2 - .../purchase/PurOrderReceiveController.java | 213 +----------------- .../purchase/PurPlanController.java | 193 +--------------- .../purchase/SupCertController.java | 6 +- .../purchase/SupCompanyController.java | 7 - .../purchase/SupManufacturerController.java | 1 - .../purchase/SupProductController.java | 85 +------ .../sync/SyncDataSetController.java | 2 - .../system/ClassifyCodeController.java | 3 +- .../system/DeviceKeyController.java | 19 +- .../system/SysMenuHelpController.java | 4 +- .../system/SysParamConfigController.java | 1 - .../system/SysPdfModuleController.java | 2 - .../system/SysPdfTemplateController.java | 1 - .../thrsys/ForThirdSysApiController.java | 34 +-- .../thrsys/ThirdAliDrugController.java | 19 +- .../thrsys/ThirdSysApiController.java | 3 +- .../thrsys/ThrBusTypeOriginController.java | 6 - .../thrsys/ThrCorpExportLogController.java | 7 +- .../thrsys/ThrCorpImportLogController.java | 6 +- .../controller/thrsys/ThrCorpsController.java | 6 +- .../controller/thrsys/ThrDeptController.java | 13 +- .../controller/thrsys/ThrHslbController.java | 3 +- .../thrsys/ThrInvOrderController.java | 6 +- .../thrsys/ThrInvProductsController.java | 3 +- .../ThrInvProductsExportLogController.java | 6 +- .../ThrInvProductsImportLogController.java | 6 +- .../thrsys/ThrInvWarehouseController.java | 3 +- .../controller/thrsys/ThrManusController.java | 6 +- .../controller/thrsys/ThrOrderController.java | 57 ++--- .../thrsys/ThrOrderExportLogController.java | 15 +- .../thrsys/ThrOrderImportLogController.java | 13 +- .../thrsys/ThrProductTypeCotroller.java | 3 +- .../thrsys/ThrProductsController.java | 37 +-- .../ThrProductsExportLogController.java | 10 +- .../ThrProductsImportLogController.java | 6 +- .../thrsys/ThrSystemController.java | 27 +-- 93 files changed, 110 insertions(+), 1458 deletions(-) delete mode 100644 src/main/java/com/glxp/api/controller/collect/IoSplitFifoInvRelController.java delete mode 100644 src/main/java/com/glxp/api/controller/dev/DeviceAssetLoacationController.java delete mode 100644 src/main/java/com/glxp/api/controller/inout/IoPdaCodeController.java delete mode 100644 src/main/java/com/glxp/api/controller/inv/InvUserProductDetailController.java diff --git a/src/main/java/com/glxp/api/controller/basic/SysWorkplaceRegionController.java b/src/main/java/com/glxp/api/controller/basic/SysWorkplaceRegionController.java index 5fd123cad..790c16049 100644 --- a/src/main/java/com/glxp/api/controller/basic/SysWorkplaceRegionController.java +++ b/src/main/java/com/glxp/api/controller/basic/SysWorkplaceRegionController.java @@ -38,11 +38,9 @@ import java.util.*; @RestController public class SysWorkplaceRegionController extends BaseController { - @Resource SysWorkplaceRegionService SysWorkplaceRegionService; - @GetMapping("/udiwms/sysWorkplaceRegion/getList") public BaseResponse getUserBindWork(SysWorkplaceRegionRequest request) { List regionResponses = SysWorkplaceRegionService.filterList(request); @@ -94,38 +92,7 @@ public class SysWorkplaceRegionController extends BaseController { @PostMapping("/udiwms/WorkplaceFreight/printRegion") public BaseResponse printFreight(@RequestBody SysWorkplaceRegionRequest sysWorkplaceRegionRequest, HttpServletRequest request, HttpServletResponse response) throws Exception { -// SysPdfTemplateRelevanceLabelEntity sysPdfTemplateRelevanceLabelEntity = systemPDFModuleService.selectByLabelId(sysWorkplaceFreightRequest.getLabelId() + ""); -// if (null == sysPdfTemplateRelevanceLabelEntity) { -// return ResultVOUtils.error(ResultEnum.DATA_NOT, "所属模块错误"); -// } -// -// SystemPDFTemplateEntity systemPDFTemplateEntity = systemPDFTemplateService.selectById(String.valueOf(sysPdfTemplateRelevanceLabelEntity.getTemplateId())); -// if (null == systemPDFTemplateEntity) { -// return ResultVOUtils.error(ResultEnum.DATA_NOT, "模板错误"); -// } -// -//// List sysWorkplaceQueues = sysWorkplaceQueueService.list(new LambdaQueryWrapper().eq(SysWorkplaceQueue::getWorkPlaceIdFk, sysWorkplaceFreightRequest.getWorkplaceId())); -// List responses = sysWorkplaceFreightService.getList(sysWorkplaceFreightRequest); -// -// Map data = new HashMap<>(1); -// List list = new ArrayList<>(); -// int i = 1; -// if (responses != null && responses.size() > 0) { -// for (SysWorkplaceFreightPrintResponse obj : responses) { -// if (obj.getQueueCode() != null && obj.getQueueCode()!= ""){ -// Map supData = new HashMap<>(); -// supData.put("name", obj.getRemark() + ""); -// supData.put("code", obj.getQueueCode()); -// supData.put("workplaceName", obj.getWorkPlaceName()); -// list.add(supData); -// i++; -// } -// } -// } -// data.put("data",list); -// String param = JSON.toJSONString(data); -// JasperUtils.jasperReport(request, response, param, filePath + "pdf/template/" + systemPDFTemplateEntity.getPath(), "pdf"); -// + return ResultVOUtils.error(ResultEnum.DATA_NOT, "模板错误"); } diff --git a/src/main/java/com/glxp/api/controller/basic/UdiContrastController.java b/src/main/java/com/glxp/api/controller/basic/UdiContrastController.java index 691363275..b439e849f 100644 --- a/src/main/java/com/glxp/api/controller/basic/UdiContrastController.java +++ b/src/main/java/com/glxp/api/controller/basic/UdiContrastController.java @@ -183,7 +183,6 @@ public class UdiContrastController { } } - //关联第三方产品信息若无值则由第三方产品信息带过来 UdiProductEntity udiProductEntity = udiProductService.findByUuid(udiRelevanceEntity.getUuid()); if (StrUtil.isEmpty(udiProductEntity.getManufactory())) { @@ -315,7 +314,6 @@ public class UdiContrastController { pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(productInfoEntityList); return ResultVOUtils.success(pageSimpleResponse); - } diff --git a/src/main/java/com/glxp/api/controller/basic/UdiSyncController.java b/src/main/java/com/glxp/api/controller/basic/UdiSyncController.java index f14453645..b6b9781cf 100644 --- a/src/main/java/com/glxp/api/controller/basic/UdiSyncController.java +++ b/src/main/java/com/glxp/api/controller/basic/UdiSyncController.java @@ -157,9 +157,6 @@ public class UdiSyncController { } } - @Resource - SpGetHttpClient spGetHttpClient; - @AuthRuleAnnotation("") @GetMapping("udiwms/udiinfo/superSearch") public BaseResponse superSearch(FilterUdiInfoRequest filterUdiInfoRequest) { diff --git a/src/main/java/com/glxp/api/controller/collect/IoCollectOrderCodeManController.java b/src/main/java/com/glxp/api/controller/collect/IoCollectOrderCodeManController.java index 5262baab0..2c7009e2d 100644 --- a/src/main/java/com/glxp/api/controller/collect/IoCollectOrderCodeManController.java +++ b/src/main/java/com/glxp/api/controller/collect/IoCollectOrderCodeManController.java @@ -239,34 +239,6 @@ public class IoCollectOrderCodeManController extends BaseController { return ResultVOUtils.error("扫码不能为空！"); - -// if (CollUtil.isNotEmpty(addTagCodeReqeust.getCodeList())) { -// List codeList = addTagCodeReqeust.getCodeList(); -// String billNo = addTagCodeReqeust.getBillNo(); -// List ioCollectOrderCodeMEN = collectOrderCodeManService.listByBillNo(billNo); -// Map codeManMap = ioCollectOrderCodeMEN.stream().collect(Collectors.toMap(IoCollectOrderCodeMan::getUdiCode, x -> x)); -// List bizIdFks = new ArrayList<>(); -// //codeList 拆零确认码 对 单据的biz进行匹配 匹配上标记是拆零码 -// for (int i = 0; i < codeList.size(); i++) { -// String code = codeList.get(i); -// IoCollectOrderCodeMan ioCollectOrderCodeMan = codeManMap.get(code); -// if (ioCollectOrderCodeMan != null) { -// //更新业务表为无需确认拆零码、码明细确认拆零字段为true -// ioCollectOrderCodeMan.setIsSplitCode(true); -// collectOrderCodeManService.updateById(ioCollectOrderCodeMan); -// bizIdFks.add(ioCollectOrderCodeMan.getBizIdFk()); -// } -// } -// if (bizIdFks.size() > 0) { -// UpdateWrapper updateWrapper = new UpdateWrapper<>(); -// updateWrapper.set("splitUnCheck", false); -// updateWrapper.in("id", bizIdFks); -// collectOrderBizService.update(updateWrapper); -// } -// return ResultVOUtils.success("更新成功"); -// } else { -// return ResultVOUtils.error("数据不能为空"); -// } } public String countSameErrMsg(List vailCodeResultResponses) { diff --git a/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java b/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java index 3dfe574a0..7d3fd707d 100644 --- a/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java +++ b/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java @@ -63,17 +63,14 @@ public class IoCollectOrderController extends BaseController { @Resource IoCollectOrderService collectOrderService; - @Resource IoCollectOrderOriginService collectOrderOriginService; @Resource IoCollectOrderBizOriginService collectOrderBizOriginService; - @Resource IoCollectOrderBizService collectOrderBizService; @Resource IoCollectOrderBizBackupService collectOrderBizBackupService; - @Resource private BasicCollectUserService basicCollectUserService; @@ -102,11 +99,9 @@ public class IoCollectOrderController extends BaseController { } else { workBindBusTypeRequest.setWorkplaceCode(collectOrderRequest.getWorkPlaceCode()); sysWorkplaceDocumentResponses = sysWorkplaceDocumentService.filterListByWorkplace(workBindBusTypeRequest); -// collectOrderRequest.setWorkPlaceCode(null); } if (collectOrderRequest.getTagStatus() != null && collectOrderRequest.getTagStatus() == -2) { -// collectOrderRequest.setExcludeWorkCode(String.valueOf(collectOrderRequest.getWorkPlaceCode())); collectOrderRequest.setWorkPlaceCode(null); collectOrderRequest.setTagStatus(1); } @@ -136,9 +131,6 @@ public class IoCollectOrderController extends BaseController { */ @GetMapping("/udiwms/basic/collect/order/next") public BaseResponse getNextOrder(CollectOrderRequest collectOrderRequest) { -// if (collectOrderRequest.getWorkPlaceCode() == null) { -// return ResultVOUtils.error(500, "工位不能为空！"); -// } CollectOrderRequest request = new CollectOrderRequest(); request.setLimit(1); request.setWorkPlaceCode(collectOrderRequest.getWorkPlaceCode()); @@ -162,9 +154,6 @@ public class IoCollectOrderController extends BaseController { */ @GetMapping("/udiwms/basic/collect/order/current") public BaseResponse getCurrentOrder(CollectOrderRequest collectOrderRequest) { -// if (collectOrderRequest.getWorkPlaceCode() == null) { -// return ResultVOUtils.error(500, "工位不能为空！"); -// } CollectOrderRequest request = new CollectOrderRequest(); request.setPage(1); request.setLimit(1); @@ -395,12 +384,6 @@ public class IoCollectOrderController extends BaseController { collectOrder.setUpdateTime(new Date()); collectOrder.setUpdateUser(getUserId()); -// collectOrderService.list(Wrappers.lambdaQuery(IoCollectOrder.class) -// .eq(IoCollectOrder::getBusType, collectOrder.getBusType()) -// .eq(IoCollectOrder::getTagStatus, 1) -// .orderByAsc(true,"orderTime").last("limit 1")); - - collectOrderService.updateById(collectOrder); collectOrderCodeManService.removeByBillNo(collectOrder.getBillNo()); @@ -529,7 +512,7 @@ public class IoCollectOrderController extends BaseController { List collectOrderBizResponses = collectOrderService.combieOrderDetail(collectOrderBizRequest); boolean isAllTag = collectOrderBizResponses.stream() .allMatch(obj -> obj.getAutoTagStatus() == 2); -// StrUtil.isNotEmpty(obj.getFinishUdiCode()) || + boolean isAllTag2 = collectOrderBizResponses.stream() .allMatch(obj -> IntUtil.value(obj.getScanActCount()) >= IntUtil.value(obj.getCount())); return ResultVOUtils.success(isAllTag || isAllTag2); @@ -606,19 +589,7 @@ public class IoCollectOrderController extends BaseController { return ResultVOUtils.success(); } - /** - * 单据上传 - * - * @param - * @return - */ -// @PostMapping("/udiwms/basic/collect/order/upload") -// public BaseResponse orderUpload(@RequestBody CollectOrderRequest collectOrderRequest) { -// if (StrUtil.isEmpty(collectOrderRequest.getBillNo())) -// return ResultVOUtils.error(500, "单据号不能为空"); -// collectOrderService.orderUpload(collectOrderRequest.getBillNo()); -// return ResultVOUtils.success(); -// } + @PostMapping("/udiwms/basic/collect/decideOrder") public BaseResponse decideOrder(@RequestBody CollectOrderRequest request) { Boolean isExis = collectOrderService.decideOrder(request, getUserId()); diff --git a/src/main/java/com/glxp/api/controller/collect/IoSplitFifoInvRelController.java b/src/main/java/com/glxp/api/controller/collect/IoSplitFifoInvRelController.java deleted file mode 100644 index e6e0183e1..000000000 --- a/src/main/java/com/glxp/api/controller/collect/IoSplitFifoInvRelController.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.glxp.api.controller.collect; - -import com.glxp.api.controller.BaseController; -import org.springframework.web.bind.annotation.RestController; - -/** - * @author : zhangsan - * @date : 2024/9/27 10:25 - * @modyified By : - */ - -@RestController -public class IoSplitFifoInvRelController extends BaseController { -} diff --git a/src/main/java/com/glxp/api/controller/collect/RelCodeBatchController.java b/src/main/java/com/glxp/api/controller/collect/RelCodeBatchController.java index 290d8fbbf..2525a6b10 100644 --- a/src/main/java/com/glxp/api/controller/collect/RelCodeBatchController.java +++ b/src/main/java/com/glxp/api/controller/collect/RelCodeBatchController.java @@ -81,8 +81,6 @@ public class RelCodeBatchController extends BaseController { @GetMapping("/udiwms/relCode/batch/filter") public BaseResponse list(RelCodeBatchRequest relCodeBatchRequest, BindingResult bindingResult) { - String customerId = getCustomerId(); -// relCodeBatchRequest.setErpId(customerId); List relCodeBatchResponses = relCodeBatchService.filterList(relCodeBatchRequest); PageInfo pageInfo = new PageInfo<>(relCodeBatchResponses); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); diff --git a/src/main/java/com/glxp/api/controller/collect/RelCodeDetailController.java b/src/main/java/com/glxp/api/controller/collect/RelCodeDetailController.java index ad15a1f58..3a6ee4e49 100644 --- a/src/main/java/com/glxp/api/controller/collect/RelCodeDetailController.java +++ b/src/main/java/com/glxp/api/controller/collect/RelCodeDetailController.java @@ -32,8 +32,6 @@ public class RelCodeDetailController extends BaseController { @Resource private RelCodeDetailService relCodeDetailService; - - /** * 扫码 * @param relCodeDetailRequest diff --git a/src/main/java/com/glxp/api/controller/dev/DeviceAssetLoacationController.java b/src/main/java/com/glxp/api/controller/dev/DeviceAssetLoacationController.java deleted file mode 100644 index d57823f62..000000000 --- a/src/main/java/com/glxp/api/controller/dev/DeviceAssetLoacationController.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.glxp.api.controller.dev; - -import lombok.extern.slf4j.Slf4j; -import org.springframework.web.bind.annotation.RestController; - -/** - * 设备位置字典 - */ -@Slf4j -@RestController -public class DeviceAssetLoacationController { -} diff --git a/src/main/java/com/glxp/api/controller/dev/DeviceInfoController.java b/src/main/java/com/glxp/api/controller/dev/DeviceInfoController.java index 7acca60ac..55fb51eb8 100644 --- a/src/main/java/com/glxp/api/controller/dev/DeviceInfoController.java +++ b/src/main/java/com/glxp/api/controller/dev/DeviceInfoController.java @@ -108,7 +108,6 @@ public class DeviceInfoController extends BaseController { @AuthRuleAnnotation("") @PostMapping("/udi/device/info/all/page") public BaseResponse allPage(@RequestBody DeviceInfoQuery query) { - AuthAdmin user = super.getUser(); List list = deviceInfoService.allPageVo(query); PageInfo pageInfo = new PageInfo<>(list); PageSimpleResponse page = new PageSimpleResponse(); diff --git a/src/main/java/com/glxp/api/controller/dev/DeviceInspectPlanDelectController.java b/src/main/java/com/glxp/api/controller/dev/DeviceInspectPlanDelectController.java index f5a3e7b6a..58a581954 100644 --- a/src/main/java/com/glxp/api/controller/dev/DeviceInspectPlanDelectController.java +++ b/src/main/java/com/glxp/api/controller/dev/DeviceInspectPlanDelectController.java @@ -67,8 +67,6 @@ public class DeviceInspectPlanDelectController { */ @PostMapping("/udiwms/inv/device/inspect/plan/uploadDeviceInspectPlanDelect") public BaseResponse uploadDeviceInspectPlanDelect(@RequestBody DeviceInspectPlanDelectEntity deviceInspectPlanDelectEntity) { - - AuthAdmin authAdmin=customerService.getUserBean(); deviceInspectPlanDelectEntity.setUpdateTime(new Date()); deviceInspectPlanDelectEntity.setUpdateUser(authAdmin.getId() + ""); diff --git a/src/main/java/com/glxp/api/controller/dev/DeviceInspectTakeController.java b/src/main/java/com/glxp/api/controller/dev/DeviceInspectTakeController.java index 9921232c7..267dc224c 100644 --- a/src/main/java/com/glxp/api/controller/dev/DeviceInspectTakeController.java +++ b/src/main/java/com/glxp/api/controller/dev/DeviceInspectTakeController.java @@ -39,7 +39,6 @@ public class DeviceInspectTakeController extends BaseController { @Resource DeviceInspectTaskService deviceInspectTaskService; - @Resource DeviceInspectTaskDetailService deviceInspectTaskDetailService; @Resource @@ -118,19 +117,7 @@ public class DeviceInspectTakeController extends BaseController { SyncHeartService syncHeartService; void UploadDeviceTake(Long id, Integer type) { - //提交上传到自助 - //查询任务表 -// DeviceInspectTaskEntity deviceInspectTaskEntity = deviceInspectTaskService.getById(id); -// List deviceInspectTaskDetailEntityList = deviceInspectTaskDetailService -// .list(new QueryWrapper().eq("taskOrderIdFk", deviceInspectTaskEntity.getOrderId())); -// SpsSyncDeviceTakeResponse spsSyncDeviceTakeResponse = new SpsSyncDeviceTakeResponse(); -// spsSyncDeviceTakeResponse.setDeviceInspectTaskEntity(deviceInspectTaskEntity); -// spsSyncDeviceTakeResponse.setDeviceInspectTaskDetailEntityList(deviceInspectTaskDetailEntityList); -// spsSyncDeviceTakeResponse.setType(type); -// spGetHttpClient.postAllDeviceTake(spsSyncDeviceTakeResponse); - syncHeartService.customPushData(BasicExportTypeEnum.DEVICE_TASK); - } diff --git a/src/main/java/com/glxp/api/controller/dev/DeviceReceiveOrderController.java b/src/main/java/com/glxp/api/controller/dev/DeviceReceiveOrderController.java index 8eb0958d1..8b71744fa 100644 --- a/src/main/java/com/glxp/api/controller/dev/DeviceReceiveOrderController.java +++ b/src/main/java/com/glxp/api/controller/dev/DeviceReceiveOrderController.java @@ -45,7 +45,6 @@ public class DeviceReceiveOrderController { @Resource private DeviceReceiveOrderService deviceReceiveOrderService; - @Resource private SystemParamConfigService systemParamConfigService; @Resource @@ -54,8 +53,6 @@ public class DeviceReceiveOrderController { private SystemPDFTemplateService systemPDFTemplateService; @Resource private DeviceReceiveOrderDetailService deviceReceiveOrderDetailService; - @Resource - private DeptDeviceDetailService deptDeviceDetailService; @Value("${file_path}") private String filePath; @@ -179,8 +176,8 @@ public class DeviceReceiveOrderController { if (null == inspectionPDFTemplateRequest) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, "参数不能为空！"); } - //查询模板文件是否存在 + //查询模板文件是否存在 SysPdfTemplateRelevanceStatemenEntity sysPdfTemplateRelevanceStatemenEntity = systemPDFModuleService.selectByStatemenId(inspectionPDFTemplateRequest.getId()); if (null == sysPdfTemplateRelevanceStatemenEntity) { return ResultVOUtils.error(ResultEnum.DATA_NOT, "所属模块错误"); @@ -208,10 +205,6 @@ public class DeviceReceiveOrderController { //打印单号标签 Map data = new HashMap<>(1); List list = new ArrayList<>(); - SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd");//定义新的日期格式 - FilterDeptDeviceRequest filterDeptDeviceRequest=new FilterDeptDeviceRequest(); - //查询主表 - DeviceReceiveOrderEntity deviceReceiveOrderEntity = deviceReceiveOrderService.selectDeviceOrder(filterDeviceReceiveOrderRequest.getOrderId()); FilterDeviceReceiveOrderDetailRequest filterDeviceReceiveOrderDetailRequest =new FilterDeviceReceiveOrderDetailRequest(); filterDeviceReceiveOrderDetailRequest.setOrderIdFk(filterDeviceReceiveOrderRequest.getOrderId()); List deviceReceiveOrderDetailResponses = deviceReceiveOrderDetailService.selectByorderIdFk(filterDeviceReceiveOrderDetailRequest); diff --git a/src/main/java/com/glxp/api/controller/dev/DeviceUpkeepDetailController.java b/src/main/java/com/glxp/api/controller/dev/DeviceUpkeepDetailController.java index 23b6d52de..ca98f7694 100644 --- a/src/main/java/com/glxp/api/controller/dev/DeviceUpkeepDetailController.java +++ b/src/main/java/com/glxp/api/controller/dev/DeviceUpkeepDetailController.java @@ -61,8 +61,6 @@ public class DeviceUpkeepDetailController extends BaseController { @AuthRuleAnnotation("") @PostMapping("/udi/device/upkeep/detail/add") public BaseResponse add(@RequestBody @Valid DevicePlanDetailParam param) { - - DevicePlanEntity entity = null; if (!param.valid(devicePlanService)) { AuthAdmin user = super.getUser(); diff --git a/src/main/java/com/glxp/api/controller/dev/InvMAOrderController.java b/src/main/java/com/glxp/api/controller/dev/InvMAOrderController.java index 8b2541d79..95fa7414a 100644 --- a/src/main/java/com/glxp/api/controller/dev/InvMAOrderController.java +++ b/src/main/java/com/glxp/api/controller/dev/InvMAOrderController.java @@ -60,7 +60,7 @@ public class InvMAOrderController { /** * 更新养护记录 * - * @param invMaintenanceOrder + * @param invMAOrderEntity * @param bindingResult * @return */ diff --git a/src/main/java/com/glxp/api/controller/dev/InvMAOrderDetailController.java b/src/main/java/com/glxp/api/controller/dev/InvMAOrderDetailController.java index 2613f8a05..09f910642 100644 --- a/src/main/java/com/glxp/api/controller/dev/InvMAOrderDetailController.java +++ b/src/main/java/com/glxp/api/controller/dev/InvMAOrderDetailController.java @@ -65,7 +65,7 @@ public class InvMAOrderDetailController { /** * 选中库存详情批量添加养护记录详情 * - * @param invProductIds + * @param addMAOrderDetailRequest * @return */ @PostMapping("/inv/MA/order/detail/batchAddDetail") diff --git a/src/main/java/com/glxp/api/controller/inout/IoCodeController.java b/src/main/java/com/glxp/api/controller/inout/IoCodeController.java index f3fac496c..5bc480ff7 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoCodeController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoCodeController.java @@ -69,11 +69,8 @@ public class IoCodeController extends BaseController { @AuthRuleAnnotation("") @GetMapping("spms/inout/dlcode/findByOrderId") public BaseResponse downloadCodesByOrderId(String orderId) { - - List codeEntityList = ioCodeService.findByOrderId(orderId); - PageInfo pageInfo; - pageInfo = new PageInfo<>(codeEntityList); + PageInfo pageInfo = new PageInfo<>(codeEntityList); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(codeEntityList); diff --git a/src/main/java/com/glxp/api/controller/inout/IoCodeLostController.java b/src/main/java/com/glxp/api/controller/inout/IoCodeLostController.java index 888b448ff..201a107da 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoCodeLostController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoCodeLostController.java @@ -41,8 +41,7 @@ public class IoCodeLostController extends BaseController { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } List list = codeLostService.selectLost(ioCodeLostEntity); - PageInfo pageInfo; - pageInfo = new PageInfo<>(list); + PageInfo pageInfo = new PageInfo<>(list); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(list); @@ -56,59 +55,10 @@ public class IoCodeLostController extends BaseController { if (bindingResult.hasErrors()) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } - - codeLostService.update(ioCodeLostEntity); - return ResultVOUtils.success("成功"); } - -// @AuthRuleAnnotation("") -// @PostMapping("warehouse/inout/saveTabCode") -// public BaseResponse saveCode(@RequestBody IoCodeTempEntity codeTempEntity) { -// -// if (StrUtil.isNotEmpty(codeTempEntity.getSerialNo()) && codeTempEntity.getSerialNo().length() > 20) { -// return ResultVOUtils.error(500, "无效条码！序列号超出最大范围，不予缓存"); -// } -// -// if (StrUtil.isNotEmpty(codeTempEntity.getBatchNo()) && codeTempEntity.getBatchNo().length() > 20) { -// return ResultVOUtils.error(500, "无效条码！批次号超出最大范围，不予缓存"); -// } -// -// if (StrUtil.isBlank(codeTempEntity.getSerialNo()) && StrUtil.isBlank(codeTempEntity.getBatchNo())) { -// return ResultVOUtils.error(500, "批次号不能为空！，不予缓存"); -// } -// if (StrUtil.isNotEmpty(codeTempEntity.getSerialNo())) { -// return ResultVOUtils.error(500, "有序列号不予缓存"); -// } -// -// IoCodeLostEntity codeLostEntity = codeLostService.findByCode(codeTempEntity.getCode()); -// IoCodeLostEntity insertEntity = null; -// if (codeLostEntity == null) { -// insertEntity = new IoCodeLostEntity(); -// insertEntity.setCreateTime(new Date()); -// } else { -// insertEntity = codeLostEntity; -// } -// insertEntity.setCode(codeTempEntity.getCode()); -// insertEntity.setBatchNo(codeTempEntity.getBatchNo()); -// insertEntity.setProduceDate(codeTempEntity.getProduceDate()); -// insertEntity.setExpireDate(codeTempEntity.getExpireDate()); -// insertEntity.setSerialNo(codeTempEntity.getSerialNo()); -// insertEntity.setSupId(codeTempEntity.getSupId()); -// insertEntity.setUpdateTime(new Date()); -// insertEntity.setCreateTime(new Date()); -// if (codeLostEntity != null) { -// codeLostService.update(insertEntity); -// } else { -// insertEntity.setId(IdUtil.getSnowflakeNextId()); -// codeLostService.insert(insertEntity); -// } -// return ResultVOUtils.success("修改成功！"); -// } - - //获取验收单据业务详情 @AuthRuleAnnotation("") @GetMapping("/warehouse/inout/getTabCode") diff --git a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java index 6cddacf12..67ee982b4 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java @@ -122,27 +122,20 @@ public class IoCodeTempController extends BaseController { IoCollectCodeService ioCollectCodeService; @Autowired IoSplitFifoInvService ioSplitFifoInvService; - @Autowired SysWorkplaceQueueService sysWorkplaceQueueService; - @Autowired IoCollectOrderBackupService ioCollectOrderBackupService; @Autowired IoCollectSetService collectSetService; - @Autowired SysWorkplaceFreightService sysWorkplaceFreightService; - @Autowired IoCollectOrderCodeManService ioCollectOrderCodeManService; - @Autowired SysWorkplaceService sysWorkplaceService; - @Resource SysOrderLedService sysOrderLedService; - @Autowired IoSplitFifoCodeService ioSplitFifoCodeService; @@ -707,8 +700,6 @@ public class IoCodeTempController extends BaseController { IoSplitFifoCodeService fifoCodeService; @Autowired IoSplitCodeService splitCodeService; - @Autowired - private IoOrderDetailCodeDao orderDetailCodeDao; @Transactional(rollbackFor = Exception.class) public BaseResponse addMaterOrder(AddOrderRequest addOrderRequest, UdiEntity udiEntity, String code,Integer groupNumber) { @@ -726,7 +717,6 @@ public class IoCodeTempController extends BaseController { return ResultVOUtils.error(500, "无效条码！批次号超出最大范围"); } - //批次号校验 //判断此产品是否开启允许无批次号 UdiProductEntity udiInfoEntity = udiProductService.findByNameCode(udiEntity.getUdi()); @@ -928,7 +918,6 @@ public class IoCodeTempController extends BaseController { } } - //校验工位存量是否存在 if (bussinessTypeEntity.getAction().equals(ConstantType.SPLIT_OUT)) { IoSplitFifoCodeEntity fifoCodeEntity = fifoCodeService.findByCode(code, null); @@ -1019,7 +1008,6 @@ public class IoCodeTempController extends BaseController { addOrderRequest.setFromCorp(fromCorp); } - //先生成扫码单据 IoOrderEntity orderEntity = orderService.findByBillNo(orderId); String inBatch = ""; @@ -1053,7 +1041,6 @@ public class IoCodeTempController extends BaseController { genDetaiEntity.setReCount(udiCalCountUtil.getCirActCount(udiRelevanceResponses.get(0))); } - exitLocalEntity.setCount(exitLocalEntity.getMyCount() + 1); if (bussinessTypeEntity.isUse()) { @@ -1065,7 +1052,7 @@ public class IoCodeTempController extends BaseController { if (!StringUtils.isBlank(exitLocalEntity.getSerialNo())) { return ResultVOUtils.error(500, "重复扫码！"); } -// IoCodeTempEntity codeTempEntity = isExitToatal(code, codeEnttitys); + //校验库存 BaseResponse invRes = null; if (IntUtil.value(bussinessTypeEntity.getUseDyCount()) == 2) { @@ -1123,7 +1110,6 @@ public class IoCodeTempController extends BaseController { } } -// checkPrice(); } } if (update) { @@ -1206,12 +1192,6 @@ public class IoCodeTempController extends BaseController { return ResultVOUtils.error(500, bussinessTypeEntity.getName() + "单只允许录入非集采产品！"); } -// if (IntUtil.value(addOrderRequest.getFifoSplit()) == 2 && IntUtil.value(udiRelevanceResponse.getSplitEnable())) { -// return ResultVOUtils.error(500, "当前上货只允许录入整取产品！"); -// } -// if (IntUtil.value(addOrderRequest.getFifoSplit()) == 1 && !IntUtil.value(udiRelevanceResponse.getSplitEnable())) { -// return ResultVOUtils.error(500, "当前上货只允许录入拆零产品！"); -// } //计算实际数量 if (bussinessTypeEntity.isUse()) { codeEnttity.setReCount(IntUtil.value(codeEnttity.getMyReCount()) + udiCalCountUtil.getUseActCount(udiRelevanceResponse)); @@ -1638,7 +1618,6 @@ public class IoCodeTempController extends BaseController { } } -// checkPrice(); } } if (update) { @@ -1706,7 +1685,6 @@ public class IoCodeTempController extends BaseController { codeEnttity.setGroupNumber(groupNumber); codeEnttity.setQueueCode(queueCode); - //如果是阿里拉的单据会有批次号 IoCollectOrderCodeMan codeMan = ioCollectOrderCodeManService.getOne(new LambdaQueryWrapper().eq(IoCollectOrderCodeMan::getUdiCode, code)); if (codeMan != null) { @@ -1722,12 +1700,9 @@ public class IoCodeTempController extends BaseController { if (relCodeDetail != null) { codeEnttity.setGrantPaCode(relCodeDetail.getParentCode()); } -// if (StrUtil.isEmpty(codeEnttity.getBatchNo())) { - //当关联关系存在的时候 以关联关系的批次号为准 codeEnttity.setBatchNo(codeRelEntity.getBatchNo()); codeEnttity.setProduceDate(MsDateUtil.formatDate(codeRelEntity.getMadeDate(), "yyMMdd")); codeEnttity.setExpireDate(MsDateUtil.formatDate(codeRelEntity.getValidateDate(), "yyMMdd")); -// } } String unitFk = null; @@ -1758,14 +1733,8 @@ public class IoCodeTempController extends BaseController { if (bussinessTypeEntity.getVailGroupBuy() == 2 && udiRelevanceResponse.isGroupBuy()) { //只采集非集采产品 return ResultVOUtils.error(500, bussinessTypeEntity.getName() + "单只允许录入非集采产品！"); } -// if (IntUtil.value(addOrderRequest.getFifoSplit()) == 2 && IntUtil.value(udiRelevanceResponse.getSplitEnable())) { -// return ResultVOUtils.error(500, "当前上货只允许录入整取产品！"); -// } -// if (IntUtil.value(addOrderRequest.getFifoSplit()) == 1 && !IntUtil.value(udiRelevanceResponse.getSplitEnable())) { -// return ResultVOUtils.error(500, "当前上货只允许录入拆零产品！"); -// } - //计算实际数量 + //计算实际数量 if (bussinessTypeEntity.isUse()) { codeEnttity.setReCount(codeEnttity.getMyReCount() + udiCalCountUtil.getUseActCount(udiRelevanceResponses.get(0))); } else { @@ -1846,7 +1815,6 @@ public class IoCodeTempController extends BaseController { Integer isSingQueue = one.getIsSingQueue(); if (workplaceQueue1 != null && isSingQueue == 1) { if (!orderEntity.getWorkPlaceQueueCode().equals(workplaceQueue1.getCode())) { -// orderService.deleteByBillNo(orderId); return ResultVOUtils.error(507, "当前货架已启用单品种槽位且产品已绑定在" + workplaceQueue1.getCode() + "取货槽"); } } @@ -1863,7 +1831,6 @@ public class IoCodeTempController extends BaseController { } } if (!isSame) -// orderService.deleteByBillNo(orderId); return ResultVOUtils.error(507, "上货产品不符！"); } //校验完成 获取当前槽位 绑定产品 diff --git a/src/main/java/com/glxp/api/controller/inout/IoDestinyProcessController.java b/src/main/java/com/glxp/api/controller/inout/IoDestinyProcessController.java index cf2ebcae1..ea65af281 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoDestinyProcessController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoDestinyProcessController.java @@ -65,8 +65,7 @@ public class IoDestinyProcessController { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } List udiRelevanceResponseList = ioDestinyProcessDetailService.filterProcessDetail(filterUdiRelRequest); - PageInfo pageInfo; - pageInfo = new PageInfo<>(udiRelevanceResponseList); + PageInfo pageInfo = new PageInfo<>(udiRelevanceResponseList); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(udiRelevanceResponseList); @@ -81,8 +80,7 @@ public class IoDestinyProcessController { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } List iodestinyProcessResponseList = ioDestinyProcessDetailService.filterDestinyProcess(iodestinyProcessRequest); - PageInfo pageInfo; - pageInfo = new PageInfo<>(iodestinyProcessResponseList); + PageInfo pageInfo = new PageInfo<>(iodestinyProcessResponseList); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(iodestinyProcessResponseList); @@ -98,7 +96,6 @@ public class IoDestinyProcessController { } BaseResponse baseResponse = ioDestinyProcessDetailService.checkDestinyProcess(iodestinyProcessRequest); - return baseResponse; } @@ -109,8 +106,7 @@ public class IoDestinyProcessController { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } List iodestinyProcessResponseList = ioDestinyProcessCodeService.filterDestinyProcessCode(iodestinyProcessRequest); - PageInfo pageInfo; - pageInfo = new PageInfo<>(iodestinyProcessResponseList); + PageInfo pageInfo = new PageInfo<>(iodestinyProcessResponseList); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(iodestinyProcessResponseList); diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderController.java index 182ef6c3c..38165de37 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderController.java @@ -195,7 +195,6 @@ public class IoOrderController extends BaseController { if (ioOrderResponse.getCheckStatus() == null) { ioOrderResponse.setCheckStatus(0 + ""); } - ioOrderResponse = orderInvoiceService.findRegStausByBillNo(ioOrderResponse); } PageInfo pageInfo = new PageInfo<>(list); return ResultVOUtils.page(pageInfo); @@ -234,10 +233,6 @@ public class IoOrderController extends BaseController { @Log(title = "单据管理", businessType = BusinessType.UPDATE) public BaseResponse delmitBiz(@RequestBody AddOrderRequest addOrderRequest) { - IoOrderEntity orderEntity = orderService.findByBillNo(addOrderRequest.getBillNo()); -// BaseResponse tempResponse = checkSubmitEnable(orderEntity); -// if (tempResponse != null) -// return tempResponse; //校验单据是否已完成 int b = orderDetailBizService.deleteByOrderId(addOrderRequest.getBillNo()); @@ -288,8 +283,6 @@ public class IoOrderController extends BaseController { return ResultVOUtils.success("提交成功！"); } - @Resource - IoCheckInvService checkInvService; //新增扫码单据-立即提交 @RepeatSubmit() @@ -417,7 +410,6 @@ public class IoOrderController extends BaseController { if (baseResponse != null) return baseResponse; - //上货校验追溯码是否重复 if (bussinessTypeEntity.getAction().equals(ConstantType.SPLIT_OUT)) { for (IoCodeTempEntity codeTempEntity : codeTempEntities) { @@ -671,45 +663,9 @@ public class IoOrderController extends BaseController { IoOrderPdaResponse orderPdaResponse = new IoOrderPdaResponse(); orderPdaResponse.setOrderResponse(list.get(0)); orderPdaResponse.setOrderDetailBizResponses(orderDetailBizResponses); -// PageInfo pageInfo = new PageInfo<>(list); return ResultVOUtils.success(orderPdaResponse); } - - public List getOtherCode(String billNo, List codeEntities) { - List orderDetailBizEntities = orderDetailBizService.findByOrderId(billNo); - - for (IoOrderDetailBizEntity bizEntity : orderDetailBizEntities) { - bizEntity.setCheckSuccess(false); - bizEntity.setScanCount(0); - } - for (IoCodeTempEntity codeTempEntity : codeEntities) { - codeTempEntity.setCheckSuccess(false); - } - List otherCodes = new ArrayList<>(); - for (IoCodeTempEntity codeEntity : codeEntities) { - for (IoOrderDetailBizEntity bizEntity : orderDetailBizEntities) { - if (checkId(bizEntity, codeEntity) == null - && checkBatchNo(bizEntity, codeEntity) == null - && checkProductDate(bizEntity, codeEntity) == null - && checkExpireDate(bizEntity, codeEntity) == null) { - int curCount = IntUtil.value(codeEntity.getReCount()) + bizEntity.getScanCount(); - if (bizEntity.getCount() < curCount) { - otherCodes.add(codeEntity); - } else { - bizEntity.setScanCount(curCount); - } - codeEntity.setCheckSuccess(true); - break; - } - } - if (!codeEntity.isCheckSuccess()) { - otherCodes.add(codeEntity); - } - } - return otherCodes; - } - public List getCheckRusultCode(String billNo, List codeEntities) { List orderDetailCodeEntities = orderDetailCodeService.findByOrderId(billNo); List orderDetailBizEntities = orderDetailBizService.findByOrderId(billNo); @@ -828,10 +784,7 @@ public class IoOrderController extends BaseController { codeTempService.deleteByBillNo(billNo); codeService.deleteCodeByOrderId(billNo); } -// ThreadUtil.execAsync(() -> { -// BaseResponse response = spGetHttpClient.postDelOrder(deleteRequest); -// log.info("删除单据：" + "结果：" + response.getMessage()); -// }); + return ResultVOUtils.success("删除成功！"); } @@ -1055,8 +1008,7 @@ public class IoOrderController extends BaseController { } List orderEntityList = orderService.filterList(filterOrderRequest); - PageInfo pageInfo; - pageInfo = new PageInfo<>(orderEntityList); + PageInfo pageInfo = new PageInfo<>(orderEntityList); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(orderEntityList); @@ -1132,7 +1084,6 @@ public class IoOrderController extends BaseController { if (null == ioOrderDetailBizEntity) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); } -// ioOrderDetailBizEntity.setCheckFileName(ioOrderDetailBizEntity.getCheckFileName().substring(0,ioOrderDetailBizEntity.getCheckFileName().length() - 4)); orderDetailBizService.updateOrderDetailBiz(ioOrderDetailBizEntity); return ResultVOUtils.success(); } @@ -1319,7 +1270,6 @@ public class IoOrderController extends BaseController { } } - if (StrUtil.isNotBlank(filterOrderRequest.getStatusType())) { orderService.setFilterStatus(filterOrderRequest); } @@ -1388,25 +1338,6 @@ public class IoOrderController extends BaseController { return ResultVOUtils.success(order); } - - public String checkId(IoOrderDetailBizEntity bizEntity, IoCodeTempEntity codeEntity) { - - if (bizEntity.getBindRlFk().longValue() == codeEntity.getRelId().longValue()) { - return null; - } else { - return "产品ID不匹配"; - } - } - - public String checkBatchNo(IoOrderDetailBizEntity bizEntity, IoCodeTempEntity codeEntity) { - - if (StrUtil.nullToEmpty(bizEntity.getBatchNo()).equals(StrUtil.nullToEmpty(codeEntity.getBatchNo()))) { - return null; - } else { - return bizEntity.getCoName() + "批次号不匹配"; - } - } - public String checkProductDate(IoOrderDetailBizEntity bizEntity, IoCodeTempEntity codeEntity) { if (StrUtil.nullToEmpty(bizEntity.getProductDate()).equals(StrUtil.nullToEmpty(codeEntity.getProduceDate()))) { return null; diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java index 5fbc9d3f5..3a9d5d9ab 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java @@ -142,8 +142,6 @@ public class IoOrderDetailBizController extends BaseController { @PostMapping("/udiwms/inout/order/addBizProduct") @Log(title = "单据管理", businessType = BusinessType.INSERT) public BaseResponse addBizProduct(@RequestBody AddBizProductReqeust addBizProductReqeust) { - SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey("vail_product_cert"); -// boolean isVailCert = systemParamConfigEntity.getParamValue().equals("1") ? true : false; AuthAdmin authAdmin = getUser(); if (addBizProductReqeust.getRelId() == null && CollUtil.isEmpty(addBizProductReqeust.getDatas())) return ResultVOUtils.error(500, "未选择产品信息"); @@ -180,7 +178,6 @@ public class IoOrderDetailBizController extends BaseController { orderEntity.setProductType(addBizProductReqeust.getProductType()); } - orderService.insertOrder(orderEntity); } @@ -228,18 +225,6 @@ public class IoOrderDetailBizController extends BaseController { } } -// if (bussinessTypeEntity.getCheckVailDate() != 4) { -// if (bussinessTypeEntity.getRequireScanCode() == 1) { -// if (udiRelevanceResponse.getRequireScanCode() != 1){ -// return ResultVOUtils.error(500, "单据只允许录入需要扫码耗材" + ",请检查后重试！"); -// } -// }else if (bussinessTypeEntity.getRequireScanCode() == 0){ -// if (udiRelevanceResponse.getRequireScanCode() != 0){ -// return ResultVOUtils.error(500, "单据只允许录入不需要扫码耗材" + ",请检查后重试！"); -// } -// } -// } - if (bussinessTypeEntity != null && udiRelevanceResponse != null) { //是否校验耗材材质 1：高值耗材；2.普通耗材 if (IntUtil.value(bussinessTypeEntity.getVailHcType()) == 1) { @@ -264,17 +249,6 @@ public class IoOrderDetailBizController extends BaseController { } } -// todo 查询产品是否已经通过认证 -// BasicBussinessTypeEntity bussinessTypeEntity = basicBussinessTypeService.findByAction(orderEntity.getAction()); -// if (bussinessTypeEntity.getCheckCertExpire() == 2 && udiRelevanceResponse.isNeedCert()) { -// SupProductEntity supProductEntity = supProductService.findByManufactury(udiRelevanceResponse.getCpmctymc(), udiRelevanceResponse.getManufactory(), ""); -// if (supProductEntity != null && (supProductEntity.getAuditStatus() == ConstantStatus.AUDIT_PASS || supProductEntity.getAuditStatus() == ConstantStatus.AUDIT_CHANGE_PASS)) { -// -// } else { -// return ResultVOUtils.error(500, "产品资质证书未通过审核！"); -// } -// } - IoOrderDetailBizEntity ioOrderDetailBizEntity = new IoOrderDetailBizEntity(); ioOrderDetailBizEntity.setOrderIdFk(orderEntity.getBillNo()); ioOrderDetailBizEntity.setBindRlFk(udiRelevanceResponse.getId()); @@ -718,15 +692,6 @@ public class IoOrderDetailBizController extends BaseController { return ResultVOUtils.page(pageInfo); } -// @GetMapping("/udiwms/inout/bizDetail/filterListInv") -// public BaseResponse filterListInv(FilterOrderDetailBizRequest orderDetailBizRequest) { -// List list = orderDetailBizService.getfilterList(orderDetailBizRequest); -// List orderDetailCodeEntities = orderDetailCodeService.findByOrderId(orderDetailBizRequest.getOrderIdFk()); -// ioCheckInoutService.bizOrderCheck2(list, orderDetailCodeEntities); -// PageInfo pageInfo = new PageInfo<>(list); -// return ResultVOUtils.page(pageInfo); -// } - @GetMapping("/udiwms/inout/bizDetail/filterListInvoice") public BaseResponse filterListInvoice(FilterOrderDetailBizRequest orderDetailBizRequest) { List list = orderDetailBizService.filterListInv(orderDetailBizRequest); diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailResultController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailResultController.java index 27075b1b8..ba2674c87 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailResultController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailResultController.java @@ -74,8 +74,6 @@ public class IoOrderDetailResultController extends BaseController { @Resource IBasicBussinessTypeService basicBussinessTypeService; @Resource - IoCodeService codeService; - @Resource CustomerService customerService; @Resource private SystemPDFTemplateService systemPDFTemplateService; @@ -172,9 +170,7 @@ public class IoOrderDetailResultController extends BaseController { public List getOrderResultProductOut(FilterOrderDetailResultRequest orderDetailResultRequest) { - List list = orderDetailResultService.filterOrderProductOutList(orderDetailResultRequest); - return list; } @@ -221,7 +217,6 @@ public class IoOrderDetailResultController extends BaseController { return ResultVOUtils.error(500, "单据号不能为空！"); } IoOrderEntity orderEntity = orderService.findByBillNo(filterErpOrderRequest.getOrderIdFk()); - BasicBussinessTypeEntity bussinessTypeEntity = basicBussinessTypeService.findByAction(orderEntity.getAction()); filterErpOrderRequest.setPage(null); filterErpOrderRequest.setLimit(null); List list = orderDetailResultService.filterList(filterErpOrderRequest); @@ -336,7 +331,6 @@ public class IoOrderDetailResultController extends BaseController { } } } - List updatePrints = new ArrayList<>(); int i = 1; for (IoOrderDetailResultResponse ioOrderDetailResultResponse : ioOrderDetailResultResponseList) { //查询第三方产品产品类别 @@ -443,24 +437,9 @@ public class IoOrderDetailResultController extends BaseController { deviceInfoData.put("index", String.valueOf(i)); deviceInfoData.put("deviceCode", item.getDeviceCode() == null ? ' ' : item.getDeviceCode()); deviceInfoData.put("deptName", item.getDeptName() == null ? ' ' : item.getDeptName()); -// deviceInfoData.put("statusName", item.getStatusName() == null ? ' ' : item.getStatusName()); -// deviceInfoData.put("udi", item.getUdi() == null ? ' ' : item.getUdi()); -// deviceInfoData.put("nameCode", item.getNameCode() == null ? ' ' : item.getNameCode()); deviceInfoData.put("productName", item.getProductName() == null ? ' ' : item.getProductName()); deviceInfoData.put("ggxh", item.getGgxh() == null ? ' ' : item.getGgxh()); deviceInfoData.put("assetValue", item.getAssetValue() == null ? "0.00" : String.valueOf(item.getAssetValue().setScale(2, RoundingMode.HALF_UP))); -// deviceInfoData.put("batchNo", item.getBatchNo() == null ? ' ' : item.getBatchNo()); -// deviceInfoData.put("serialNo", item.getSerialNo() == null ? ' ' : item.getSerialNo()); -// deviceInfoData.put("productionDate", item.getProductionDate() == null ? ' ' : item.getProductionDate()); -// deviceInfoData.put("expireDate", item.getExpireDate() == null ? ' ' : item.getExpireDate()); -// deviceInfoData.put("manufactory", item.getManufactory() == null ? ' ' : item.getManufactory()); -// deviceInfoData.put("measname", item.getMeasname() == null ? ' ' : item.getMeasname()); -// deviceInfoData.put("zczbhhzbapzbh", item.getZczbhhzbapzbh() == null ? ' ' : item.getZczbhhzbapzbh()); -// deviceInfoData.put("supName", item.getSupName() == null ? ' ' : item.getSupName()); -// deviceInfoData.put("changeCount", item.getChangeCount() == null ? '0' : item.getChangeCount()); -// deviceInfoData.put("repairApplyCount", item.getRepairApplyCount() == null ? '0' : item.getRepairApplyCount()); -// deviceInfoData.put("repairCount", item.getRepairCount() == null ? '0' : item.getRepairCount()); -// deviceInfoData.put("checkCount", item.getCheckCount() == null ? '0' : item.getCheckCount()); list.add(deviceInfoData); i++; @@ -500,12 +479,6 @@ public class IoOrderDetailResultController extends BaseController { cptTraceResultResponse.setFromCorpCreditNum(authCompany.getCreditCode()); cptTraceResultResponse.setToCorp(cptTraceOrderResponse.getFromCorpName()); cptTraceResultResponse.setToCorpCreditNum(cptTraceOrderResponse.getCreditNo()); -// //往来单位为病人 -// if (cptTraceOrderResponse.getCorpType() == 1 && cptTraceOrderResponse.getOutType() == 1) { -// cptTraceResultResponse.setToUserInfo(cptTraceOrderResponse.getFromCorpName()); -// } else { -// -// } } else { cptTraceResultResponse.setInOutType(1); cptTraceResultResponse.setFromCorp(cptTraceOrderResponse.getFromCorpName()); diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderInvoiceController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderInvoiceController.java index 16f07ed69..a73bd91c3 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderInvoiceController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderInvoiceController.java @@ -52,8 +52,6 @@ public class IoOrderInvoiceController { @Resource IoOrderInvoiceService ioOrderInvoiceService; @Resource - IoOrderDetailCodeService orderDetailCodeService; - @Resource CustomerService customerService; @Resource IoOrderDetailBizService orderDetailBizService; diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderMutiController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderMutiController.java index d9a2d63d7..ecbd4a967 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderMutiController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderMutiController.java @@ -43,23 +43,9 @@ public class IoOrderMutiController { @Resource private IoOrderMutiSetService ioOrderMutiSetService; @Resource - RedisUtil redisUtil; - @Resource CustomerService customerService; @Resource GennerOrderUtils gennerOrderUtils; - @Resource - private IoOrderService orderService; - @Resource - IoCodeTempService codeTempService; - @Resource - IBasicBussinessTypeService basicBussinessTypeService; - @Resource - InvWarehouseService invWarehouseService; - @Resource - UdiRelevanceService udiRelevanceService; - @Resource - IoOrderDetailCodeService ioOrderDetailCodeService; @PostMapping("/udiwms/inout/order/muti/checkUdi") @@ -253,7 +239,6 @@ public class IoOrderMutiController { orderNo = ioOrderMutiService.insterOrder(ioOrderMutiEntity, ioOrderMutiSetEntity); } - ioOrderMutiEntity.setReCount(ioOrderMutiEntity.getTotalCount() - ioOrderMutiEntity.getUseCount()); ioOrderMutiEntity.setOrderIdFk(orderNo); ioOrderMutiEntity.setCreateTime(new Date()); @@ -326,7 +311,6 @@ public class IoOrderMutiController { @PostMapping("/udiwms/inout/order/muti/addMutiDetail") public BaseResponse addMutiDetail(@RequestBody IoOrderMutiUseEntity ioOrderMutiUseEntity) { - if (ioOrderMutiUseEntity.getCheckType() != null && ioOrderMutiUseEntity.getCheckType() == 1) { IoOrderMutiRequest ioOrderMutiRequest = new IoOrderMutiRequest(); ioOrderMutiRequest.setStatus(0); diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderMutiSetController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderMutiSetController.java index b8a286d0e..4a03f3018 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderMutiSetController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderMutiSetController.java @@ -33,7 +33,6 @@ public class IoOrderMutiSetController { return ResultVOUtils.page(pageInfo); } - @PostMapping("/udiwms/inout/muti/add") public BaseResponse addIoOrderMuti(@RequestBody IoOrderMutiSetEntity ioOrderMutiSetEntity) { diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderReviewController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderReviewController.java index 86e8d9e58..0e17c3e5e 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderReviewController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderReviewController.java @@ -289,10 +289,6 @@ public class IoOrderReviewController extends BaseController { return ResultVOUtils.error(500, "单据已验收！"); } if (updateExportStatusRequest.isEntrust()) { -// EntrustReceEntity entrustReceEntity = entrustReceService.findById(updateExportStatusRequest.getEntrustId()); -// if (entrustReceEntity == null) { -// return ResultVOUtils.error(500, "无验收权限！"); -// } else { EntrustReceEntity entrustReceEntity = entrustReceService.findByUnique(orderEntity.getAction(), getUserId()); if (orderEntity.getFromType().intValue() != ConstantStatus.FROM_CHANGE && orderEntity.getFromType().intValue() != ConstantStatus.FROM_PEACE_CHANGE) { if (StrUtil.isNotEmpty(entrustReceEntity.getEntrustAction())) { @@ -310,7 +306,6 @@ public class IoOrderReviewController extends BaseController { updateSpmsStauts(reviewFinishRequest, authAdmin.getId() + ""); return updateReview(authAdmin, orderEntity); } -// } } else { ReviewFinishRequest reviewFinishRequest = new ReviewFinishRequest(); BeanUtils.copyProperties(updateExportStatusRequest, reviewFinishRequest); @@ -380,9 +375,6 @@ public class IoOrderReviewController extends BaseController { orderEntity.setUllageSupNo(supplementOrder.getBillNo()); orderService.update(orderEntity); codeTempService.insertBatch(supplementCodes); -// for (IoCodeTempEntity codeTempEntity : supplementCodes) { -// addInoutService.genOrderDetailCode(supplementOrder, codeTempEntity); -// } addInoutService.dealProcess(supplementOrder); if (!ioCheckInoutService.checkManual(supplementOrder.getBillNo())) { ioCheckInoutService.check(supplementOrder.getBillNo()); diff --git a/src/main/java/com/glxp/api/controller/inout/IoPdaCodeController.java b/src/main/java/com/glxp/api/controller/inout/IoPdaCodeController.java deleted file mode 100644 index f2f76a2d8..000000000 --- a/src/main/java/com/glxp/api/controller/inout/IoPdaCodeController.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.glxp.api.controller.inout; - -public class IoPdaCodeController { -} diff --git a/src/main/java/com/glxp/api/controller/inout/IoSplitController.java b/src/main/java/com/glxp/api/controller/inout/IoSplitController.java index 6c0973c70..e41c659a9 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoSplitController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoSplitController.java @@ -51,7 +51,6 @@ public class IoSplitController extends BaseController { IoSplitCodeService splitCodeService; @Resource IoSplitCodeDetailService splitCodeDetailService; - @Resource BasicSkPrescribeDiService basicSkPrescribeDiService; @Resource @@ -138,26 +137,20 @@ public class IoSplitController extends BaseController { if (collectOrder == null) { return ResultVOUtils.error(500, "未找到单据"); } -// if (collectOrder.getTagStatus() == 2) { -// return ResultVOUtils.error(501, "当前单据正在处理中,请重新选择单据"); -// } SysWorkplaceDocumentEntity sysWorkplaceDocumentEntity = sysWorkplaceDocumentService.findByWorkplaceCode(collectOrder.getWorkPlaceCode(), collectOrder.getBusType()); if (IntUtil.value(sysWorkplaceDocumentEntity.getAutoTag()) == 1) { collectOrder.setWorkPlaceCode(addTagCodeReqeust.getWorkPlaceCode()); - //todo 后面改 if (sysWorkplaceDocumentEntity.getProductType() == 1) { splitCodeService.preQxAutoTagCode(collectOrder, null); } else { splitCodeService.preAutoTagCode(collectOrder, null); } - collectOrderService.updateById(collectOrder); return ResultVOUtils.success("后台已开始赋码，请稍后刷新查看"); } else { return ResultVOUtils.success("无需自动赋码"); } - } /** @@ -256,7 +249,6 @@ public class IoSplitController extends BaseController { ) { return basicSkPrescribeDiEntity; } - } } return null; diff --git a/src/main/java/com/glxp/api/controller/inout/IoSplitFifoController.java b/src/main/java/com/glxp/api/controller/inout/IoSplitFifoController.java index 83ace1674..59ff6afc2 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoSplitFifoController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoSplitFifoController.java @@ -30,7 +30,6 @@ import java.util.List; @RestController public class IoSplitFifoController extends BaseController { - @Resource IoSplitFifoCodeService splitFifoCodeService; diff --git a/src/main/java/com/glxp/api/controller/inout/IoSplitFifoInvController.java b/src/main/java/com/glxp/api/controller/inout/IoSplitFifoInvController.java index 04e4b0ea2..6b7e23c3b 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoSplitFifoInvController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoSplitFifoInvController.java @@ -79,7 +79,6 @@ public class IoSplitFifoInvController extends BaseController { } } - List splitCodeEntities = splitFifoInvService.filterKcyjList(ioSplitFifoInvRequest); for (IoSplitInvResponse ioSplitCodeResponse : splitCodeEntities) { if (StrUtil.isEmpty(ioSplitCodeResponse.getGgxh())) { diff --git a/src/main/java/com/glxp/api/controller/inout/WorkPutController.java b/src/main/java/com/glxp/api/controller/inout/WorkPutController.java index 702633469..88173d683 100644 --- a/src/main/java/com/glxp/api/controller/inout/WorkPutController.java +++ b/src/main/java/com/glxp/api/controller/inout/WorkPutController.java @@ -75,10 +75,6 @@ public class WorkPutController extends BaseController { @Resource IoOrderDetailBizService orderDetailBizService; @Resource - IoAddInoutService ioAddInoutService; - @Resource - IoOrderDetailCodeService ioOrderDetailCodeService; - @Resource IoSplitFifoCodeService splitFifoCodeService; //前端扫码提交(耗材器械） @@ -120,7 +116,6 @@ public class WorkPutController extends BaseController { } //TODO 退货校验是否有库存 提示产品不存在 if (StrUtil.equals("return", addOrderRequest.getSplitType())) { - //ioSplitFifoInvService.getOne(new LambdaQueryWrapper().eq(IoSplitFifoInv::getInvCode,"").last("limit 1")); } if (IntUtil.value(udiEntity.getProductType()) == 2) { return orderDetailBizService.adddDrugOrder(addOrderRequest, udiEntity, code); @@ -288,7 +283,6 @@ public class WorkPutController extends BaseController { } } - //过期提醒： if (IntUtil.value(bussinessTypeEntity.getCheckExpire()) == 1 && !addOrderRequest.isIgnoreExpire()) { if (StrUtil.isNotEmpty(udiEntity.getExpireDate())) { @@ -323,7 +317,6 @@ public class WorkPutController extends BaseController { if (resultTime > 0) { long time = resultTime / (60 * 60 * 1000); -// long time = resultTime / (24 * 60 * 60 * 1000); if (resultTime < recentTieme) { return ResultVOUtils.error(505, "当前产品临近过期，距过期还剩" + time + "时,是否确定继续添加?"); } @@ -347,7 +340,6 @@ public class WorkPutController extends BaseController { } } - //校验工位存量是否存在 if (bussinessTypeEntity.getAction().equals(ConstantType.SPLIT_OUT)) { IoSplitFifoCodeEntity fifoCodeEntity = fifoCodeService.findByCode(code, null); @@ -356,7 +348,6 @@ public class WorkPutController extends BaseController { } } - //先生成扫码单据 IoOrderEntity orderEntity = orderService.findByBillNo(orderId); if (StringUtils.isBlank(orderId) || orderEntity == null) { @@ -385,7 +376,6 @@ public class WorkPutController extends BaseController { genDetaiEntity.setReCount(udiCalCountUtil.getCirActCount(udiRelevanceResponses.get(0))); } - exitLocalEntity.setCount(exitLocalEntity.getMyCount() + 1); if (bussinessTypeEntity.isUse()) { diff --git a/src/main/java/com/glxp/api/controller/inout/ioCodeRelController.java b/src/main/java/com/glxp/api/controller/inout/ioCodeRelController.java index fedc25c2e..5dcb92c05 100644 --- a/src/main/java/com/glxp/api/controller/inout/ioCodeRelController.java +++ b/src/main/java/com/glxp/api/controller/inout/ioCodeRelController.java @@ -37,8 +37,7 @@ public class ioCodeRelController { public BaseResponse list(IoOrderRelRequest ioOrderRelRequest) { List list = ioCodeRelServicec.selectIoCodeRelList(ioOrderRelRequest); - PageInfo pageInfo; - pageInfo = new PageInfo<>(list); + PageInfo pageInfo = new PageInfo<>(list); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(list); @@ -48,7 +47,6 @@ public class ioCodeRelController { @GetMapping("/udi/ioCode/Rel/checkUpProduct") public BaseResponse checkUpProduct(String code) { - //判断码有没有重复 List list = ioCodeRelServicec.selectIoCodeRelByCode("", code); if (list.size() > 0) { @@ -125,8 +123,7 @@ public class ioCodeRelController { public BaseResponse delectList(IoOrderRelRequest ioOrderRelRequest) { List list = ioCodeRelServicec.selectIoCodeRelDetailList(ioOrderRelRequest); - PageInfo pageInfo; - pageInfo = new PageInfo<>(list); + PageInfo pageInfo = new PageInfo<>(list); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(list); diff --git a/src/main/java/com/glxp/api/controller/inv/ApiExcelController.java b/src/main/java/com/glxp/api/controller/inv/ApiExcelController.java index c483f5699..8d5d533ec 100644 --- a/src/main/java/com/glxp/api/controller/inv/ApiExcelController.java +++ b/src/main/java/com/glxp/api/controller/inv/ApiExcelController.java @@ -47,7 +47,6 @@ public class ApiExcelController { */ @GetMapping("/udiwms/inv/excelExportOut") public void export(HttpServletResponse response,String billNo,String key) { - excelService.excelExport(response,billNo,key); } @@ -83,7 +82,6 @@ public class ApiExcelController { @ApiOperation(value = "excel模板导出", httpMethod = "GET") @GetMapping("/excelTemplate") public void excelTemplate(HttpServletResponse response) { - excelService.excelTemplate(response); } diff --git a/src/main/java/com/glxp/api/controller/inv/BadDbController.java b/src/main/java/com/glxp/api/controller/inv/BadDbController.java index 3da1d9ecc..b98bea772 100644 --- a/src/main/java/com/glxp/api/controller/inv/BadDbController.java +++ b/src/main/java/com/glxp/api/controller/inv/BadDbController.java @@ -25,7 +25,6 @@ public class BadDbController extends BaseController { */ @GetMapping("udi/trace/badDb/search") public BaseResponse badDbSearch(TraceRecordRequest traceRecordRequest) { - UdiEntity udiEntity = FilterUdiUtils.getUdi(traceRecordRequest.getUdiCode()); AnncmntProductEntity anncmntProductEntity = anncmntProductService.getOne(new QueryWrapper().eq("nameCode", udiEntity.getUdi()).last("limit 1")); if (anncmntProductEntity != null) { diff --git a/src/main/java/com/glxp/api/controller/inv/InvCountOrderController.java b/src/main/java/com/glxp/api/controller/inv/InvCountOrderController.java index e70f93f64..427e51236 100644 --- a/src/main/java/com/glxp/api/controller/inv/InvCountOrderController.java +++ b/src/main/java/com/glxp/api/controller/inv/InvCountOrderController.java @@ -54,14 +54,13 @@ import java.util.*; */ @RestController public class InvCountOrderController extends BaseController { + @Value("${file_path}") private String filePath; - @Resource private InvCountOrderService invCountOrderService; @Resource private InvCountOrderDetailService invCountOrderDetailService; - @Resource private SystemPDFTemplateService systemPDFTemplateService; @Resource @@ -108,7 +107,6 @@ public class InvCountOrderController extends BaseController { if (bindingResult.hasErrors()) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } - if (null == invCountOrder) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); } diff --git a/src/main/java/com/glxp/api/controller/inv/InvCountSettingController.java b/src/main/java/com/glxp/api/controller/inv/InvCountSettingController.java index 143ca9226..895d662b0 100644 --- a/src/main/java/com/glxp/api/controller/inv/InvCountSettingController.java +++ b/src/main/java/com/glxp/api/controller/inv/InvCountSettingController.java @@ -79,12 +79,7 @@ public class InvCountSettingController { @Log(title = "判断是否可以新增盘点设置") @GetMapping("/invCount/setting/verifyAdd") public BaseResponse verifyAdd() { -// boolean verify = invCountSettingService.verifyAdd(); -// if (verify) { -// return ResultVOUtils.success(); -// } return ResultVOUtils.success(); -// return ResultVOUtils.error(ResultEnum.DATA_REPEAT, "已经存在盘点设置，无法添加"); } } diff --git a/src/main/java/com/glxp/api/controller/inv/InvInnerOrderPrintController.java b/src/main/java/com/glxp/api/controller/inv/InvInnerOrderPrintController.java index ed5d5b023..38b9816fc 100644 --- a/src/main/java/com/glxp/api/controller/inv/InvInnerOrderPrintController.java +++ b/src/main/java/com/glxp/api/controller/inv/InvInnerOrderPrintController.java @@ -52,7 +52,6 @@ public class InvInnerOrderPrintController { @Resource private InvInnerOrderPrintService invInnerOrderPrintService; - @Resource SystemPDFModuleService systemPDFModuleService; @Resource @@ -84,7 +83,6 @@ public class InvInnerOrderPrintController { @PostMapping("/udiwms/innerOrderPrint/addOrderPrint") @Log(title = "内部码", businessType = BusinessType.INSERT) public BaseResponse addOrderPrint(@RequestBody invInnerOrderprintReques invInnerOrderprintReques) { - if (invInnerOrderprintReques.getOrderIdFk() != null) { invInnerOrderPrintService.addOrderList(invInnerOrderprintReques.getOrderIdFk()); } else { @@ -101,13 +99,10 @@ public class InvInnerOrderPrintController { @RequestBody InspectionPDFTemplateRequest inspectionPDFTemplateRequest) throws Exception { SysPdfTemplateRelevanceLabelEntity sysPdfTemplateRelevanceLabelEntity = systemPDFModuleService.selectByLabelId(inspectionPDFTemplateRequest.getLabelId() + ""); - if (sysPdfTemplateRelevanceLabelEntity == null) return ResultVOUtils.error(500, "未找到单据模板模块设置，请检查"); - SystemPDFTemplateEntity systemPDFTemplateEntity = systemPDFTemplateService.selectById(String.valueOf(sysPdfTemplateRelevanceLabelEntity.getTemplateId())); if (systemPDFTemplateEntity == null) return ResultVOUtils.error(ResultEnum.DATA_NOT, "模板错误"); - return ResultVOUtils.success(); } @@ -118,13 +113,10 @@ public class InvInnerOrderPrintController { HttpServletRequest request, HttpServletResponse response) throws Exception { SysPdfTemplateRelevanceLabelEntity sysPdfTemplateRelevanceLabelEntity = systemPDFModuleService.selectByLabelId(stockQRCodeTextPDFTemplateRequest.getLabelId() + ""); - if (sysPdfTemplateRelevanceLabelEntity == null) return ResultVOUtils.error(500, "未找到单据模板模块设置，请检查"); - SystemPDFTemplateEntity systemPDFTemplateEntity = systemPDFTemplateService.selectById(String.valueOf(sysPdfTemplateRelevanceLabelEntity.getTemplateId())); if (systemPDFTemplateEntity == null) return ResultVOUtils.error(ResultEnum.DATA_NOT, "模板错误"); - List printEntities = new ArrayList<>(); List mStockPrintEntities = new ArrayList<>(); FilterinnerOrderprintRequest filterinnerOrderprintRequest = new FilterinnerOrderprintRequest(); @@ -190,8 +182,6 @@ public class InvInnerOrderPrintController { Map data = new HashMap(); data.put("data", printEntities); JasperUtils.jasperReport(request, response, data, filePath + "/pdf/template/" + FileUtils.getLastFileName(systemPDFTemplateEntity.getPath()), "pdf"); - - } String orderId = ""; for (InnerOrderPrintResponse InnerOrderPrintResponse : mStockPrintEntities) { @@ -205,9 +195,7 @@ public class InvInnerOrderPrintController { //查询订单id InvInnerOrderPrintEntity innerOrderPrintEntity = invInnerOrderPrintService.selectById(orderId); - //更新内部码状态 - InnerOrderEntity innerOrderEntity = innerOrderService.findByRecordKey(innerOrderPrintEntity.getOrderIdFk()); if (innerOrderEntity != null) { innerOrderEntity.setGenStatus(2); @@ -215,7 +203,6 @@ public class InvInnerOrderPrintController { innerOrderService.update(innerOrderEntity); } - IoOrderEntity ioOrderEntity = new IoOrderEntity(); ioOrderEntity.setInCodeStatus(1); ioOrderEntity.setBillNo(innerOrderPrintEntity.getOrderIdFk()); @@ -342,8 +329,7 @@ public class InvInnerOrderPrintController { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } List stockQRCodeTextEntityList = innerOrderPdfTempService.filterStockPrintTempEntity(deleteStPrintTempRequest); - PageInfo pageInfo; - pageInfo = new PageInfo<>(stockQRCodeTextEntityList); + PageInfo pageInfo = new PageInfo<>(stockQRCodeTextEntityList); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(stockQRCodeTextEntityList); @@ -355,8 +341,7 @@ public class InvInnerOrderPrintController { @GetMapping("/udiwms/invInnerOrderPdfTemp/filter") public BaseResponse filterTemp(FilterStPrintTempRequest filterStPrintTempRequest){ List invInnerOrderPdfTempEntities = innerOrderPdfTempService.filterList(filterStPrintTempRequest); - PageInfo pageInfo; - pageInfo = new PageInfo<>(invInnerOrderPdfTempEntities); + PageInfo pageInfo = new PageInfo<>(invInnerOrderPdfTempEntities); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(invInnerOrderPdfTempEntities); diff --git a/src/main/java/com/glxp/api/controller/inv/InvPlaceController.java b/src/main/java/com/glxp/api/controller/inv/InvPlaceController.java index 6849a4179..7ce799bfb 100644 --- a/src/main/java/com/glxp/api/controller/inv/InvPlaceController.java +++ b/src/main/java/com/glxp/api/controller/inv/InvPlaceController.java @@ -40,7 +40,6 @@ public class InvPlaceController { @Resource private InvPlaceOrderService invPlaceOrderService; - /** * 查询库存摆放记录 * @@ -147,7 +146,6 @@ public class InvPlaceController { */ @GetMapping("/spms/inv/product/getInvProductInfo") private BaseResponse getInvProductInfo(BindInvSpaceRequest bindInvSpaceRequest) { - List list = new ArrayList<>(); //判断有没有库存 String msg = invPlaceService.checkCount(bindInvSpaceRequest); if (StrUtil.isEmpty(msg)) { @@ -156,7 +154,6 @@ public class InvPlaceController { } else { return ResultVOUtils.error(500, msg); } - } @@ -198,7 +195,6 @@ public class InvPlaceController { */ @GetMapping("/spms/inv/product/getInvProductOutInfo") private BaseResponse getInvProductOutInfo(BindInvSpaceRequest bindInvSpaceRequest) { - List list = new ArrayList<>(); //判断有没有库存 String msg = invPlaceService.checkOutCount(bindInvSpaceRequest); if (StrUtil.isEmpty(msg)) { @@ -207,7 +203,6 @@ public class InvPlaceController { } else { return ResultVOUtils.error(500, msg); } - } /** @@ -265,7 +260,6 @@ public class InvPlaceController { } } } - PageInfo pageInfo = new PageInfo<>(invPlaceDetailResponseList); return ResultVOUtils.page(pageInfo); } diff --git a/src/main/java/com/glxp/api/controller/inv/InvPreinOrderController.java b/src/main/java/com/glxp/api/controller/inv/InvPreinOrderController.java index 8a1a77732..06eeeebed 100644 --- a/src/main/java/com/glxp/api/controller/inv/InvPreinOrderController.java +++ b/src/main/java/com/glxp/api/controller/inv/InvPreinOrderController.java @@ -50,8 +50,6 @@ public class InvPreinOrderController extends BaseController { @GetMapping("/udiwms/inv/prein/filter") public BaseResponse filterOrder(FilterInvPreinRequest filterInvPreinRequest) { - - List list = invPreinOrderService.filterList(filterInvPreinRequest); PageInfo pageInfo = new PageInfo<>(list); return ResultVOUtils.page(pageInfo); @@ -69,17 +67,12 @@ public class InvPreinOrderController extends BaseController { @AuthRuleAnnotation("") @PostMapping("udiwms/inv/prein/delete") public BaseResponse deletById(@RequestBody DeleteRequest deleteRequest) { - - if (StrUtil.isEmpty(deleteRequest.getBillNo())) - return ResultVOUtils.error(500, "单据号不能为空"); + if (StrUtil.isEmpty(deleteRequest.getBillNo())) return ResultVOUtils.error(500, "单据号不能为空"); invPreinOrderService.deleteByOrderId(deleteRequest.getBillNo()); invPreinDetailService.deleteByOrderId(deleteRequest.getBillNo()); return ResultVOUtils.success("删除成功！"); - } - @Resource - IoCodeTempService codeTempService; @Resource IoCodeService codeService; @@ -137,15 +130,10 @@ public class InvPreinOrderController extends BaseController { } } -// InvPreInProductDetailEntity invPreinDetailEntity = invPreinProductDetailService.findUseOneByCode(checkPreInInvRequest.getCode()); if (count <= 0) { return ResultVOUtils.error(500, "预验收库存数量不足！"); - } else { -// if (invPreinDetailEntity != null && StrUtil.isNotEmpty(invPreinDetailEntity.getBatchNo()) && StrUtil.isNotEmpty(checkPreInInvRequest.getBatchNo()) -// && !invPreinDetailEntity.getBatchNo().equals(checkPreInInvRequest.getBatchNo())) { -// return ResultVOUtils.error(500, "当前批次号与预验收录入批次号不匹配！"); -// } } + return ResultVOUtils.success(count); } diff --git a/src/main/java/com/glxp/api/controller/inv/InvPreinProductController.java b/src/main/java/com/glxp/api/controller/inv/InvPreinProductController.java index 0ff2d698f..4e12b6e70 100644 --- a/src/main/java/com/glxp/api/controller/inv/InvPreinProductController.java +++ b/src/main/java/com/glxp/api/controller/inv/InvPreinProductController.java @@ -33,6 +33,7 @@ import java.util.List; @Slf4j @RestController public class InvPreinProductController extends BaseController { + @Resource private InvPreinProductDetailService invPreinProductDetailService; @Resource diff --git a/src/main/java/com/glxp/api/controller/inv/InvProductController.java b/src/main/java/com/glxp/api/controller/inv/InvProductController.java index badfdf801..af6c21091 100644 --- a/src/main/java/com/glxp/api/controller/inv/InvProductController.java +++ b/src/main/java/com/glxp/api/controller/inv/InvProductController.java @@ -186,18 +186,6 @@ public class InvProductController extends BaseController { }); } -// //根据单据日期排序 -// list.sort((o1, o2) -> { -// long o1OrderTime = DateUtil.parseDate(o1.getOrderTime()).getTime(); -// long o2OrderTime = DateUtil.parseDate(o2.getOrderTime()).getTime(); -// if (o1OrderTime > o2OrderTime) { -// return 1; -// } else if (o1OrderTime < o2OrderTime) { -// return -1; -// } -// return 0; -// }); - PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(list); @@ -252,7 +240,6 @@ public class InvProductController extends BaseController { detailRequest.setBatchNo(invProductEntity.getBatchNo()); } invProductService.deleteById(id); -// invProductServiceNew.deleteInvProductDetail(detailRequest); return ResultVOUtils.success("删除成功"); } else { return ResultVOUtils.error(500, "删除失败"); diff --git a/src/main/java/com/glxp/api/controller/inv/InvProductRationController.java b/src/main/java/com/glxp/api/controller/inv/InvProductRationController.java index 2af1337d6..5d8e99654 100644 --- a/src/main/java/com/glxp/api/controller/inv/InvProductRationController.java +++ b/src/main/java/com/glxp/api/controller/inv/InvProductRationController.java @@ -139,8 +139,6 @@ public class InvProductRationController extends BaseController { if (CollUtil.isNotEmpty(invAddRationRequest.getRationEntities())) { invProductRationService.genOrder(invAddRationRequest.getRationEntities()); } - - return ResultVOUtils.success("修改成功"); } diff --git a/src/main/java/com/glxp/api/controller/inv/InvSickTraceController.java b/src/main/java/com/glxp/api/controller/inv/InvSickTraceController.java index 6c2924e59..6aef95cf0 100644 --- a/src/main/java/com/glxp/api/controller/inv/InvSickTraceController.java +++ b/src/main/java/com/glxp/api/controller/inv/InvSickTraceController.java @@ -48,8 +48,7 @@ public class InvSickTraceController { FilterOrderRequest orderFilterRequest = new FilterOrderRequest(); orderFilterRequest.setFromCorpList(names); List orderEntityList = orderService.filterList(orderFilterRequest); - PageInfo pageInfo; - pageInfo = new PageInfo<>(orderEntityList); + PageInfo pageInfo = new PageInfo<>(orderEntityList); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(orderEntityList); diff --git a/src/main/java/com/glxp/api/controller/inv/InvUserProductDetailController.java b/src/main/java/com/glxp/api/controller/inv/InvUserProductDetailController.java deleted file mode 100644 index 1484650d8..000000000 --- a/src/main/java/com/glxp/api/controller/inv/InvUserProductDetailController.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.glxp.api.controller.inv; - -import com.glxp.api.controller.BaseController; -import groovy.util.logging.Slf4j; -import org.springframework.web.bind.annotation.RestController; - -/** - * 用户库存查询接口 - */ -@Slf4j -@RestController -public class InvUserProductDetailController{ - - - - -} diff --git a/src/main/java/com/glxp/api/controller/inv/StockCompareController.java b/src/main/java/com/glxp/api/controller/inv/StockCompareController.java index c9d664ec8..5eb16b4b1 100644 --- a/src/main/java/com/glxp/api/controller/inv/StockCompareController.java +++ b/src/main/java/com/glxp/api/controller/inv/StockCompareController.java @@ -58,8 +58,7 @@ public class StockCompareController extends BaseController { Page page = stockCompareService.pageVo(query); - PageInfo pageInfo; - pageInfo = new PageInfo<>(page.getRecords()); + PageInfo pageInfo = new PageInfo<>(page.getRecords()); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(page.getRecords()); @@ -152,8 +151,7 @@ public class StockCompareController extends BaseController { ); - PageInfo pageInfo; - pageInfo = new PageInfo<>(page.getRecords()); + PageInfo pageInfo = new PageInfo<>(page.getRecords()); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(page.getRecords()); @@ -162,8 +160,6 @@ public class StockCompareController extends BaseController { @Resource InvCpLocalProductService localProductService; - @Resource - InvCpThrProuductService thrProuductService; @PostMapping("/udiwms/stockCompare/detail/result") public BaseResponse realDeatilPage(@RequestBody @Valid InvProductDetailSelectRequest param) { @@ -189,12 +185,6 @@ public class StockCompareController extends BaseController { .eq(InvCpLocalProductEntity::getCompareId, param.getCompareId()) .eq(InvCpLocalProductEntity::getProductId, param.getProductId()) .eq(InvCpLocalProductEntity::getBatchNo, param.getBatchNo())); - -// stockCompareDetailService.remove(Wrappers.lambdaQuery(StockCompareDetailEntity.class) -// .eq(StockCompareDetailEntity::getCompareId, param.getCompareId()) -// .eq(StockCompareDetailEntity::getProductId, param.getProductId()) -// .eq(StockCompareDetailEntity::getMainAction, param.getMainAction()) -// ); return ResultVOUtils.successMsg("移除成功"); } diff --git a/src/main/java/com/glxp/api/controller/inv/UdiTraceController.java b/src/main/java/com/glxp/api/controller/inv/UdiTraceController.java index 0279ff6b7..e3c4e837a 100644 --- a/src/main/java/com/glxp/api/controller/inv/UdiTraceController.java +++ b/src/main/java/com/glxp/api/controller/inv/UdiTraceController.java @@ -75,7 +75,6 @@ public class UdiTraceController { filterCodeRequest.setCode(filterCodeTraceRequest.getCode()); } -// IoCodeEntity; filterCodeRequest.setSupId(filterCodeTraceRequest.getSupId()); List invProductDetailEntities = ioCodeDao.filterCodeList(filterCodeRequest); if (invProductDetailEntities.size() > 0) { @@ -92,7 +91,6 @@ public class UdiTraceController { filterOrderRequest.setOrderIds(orderIds); List orderEntities = orderService.filterList(filterOrderRequest); - FilterUdiRelRequest filterUdiInfoRequest = new FilterUdiRelRequest(); filterUdiInfoRequest.setNameCode(udiEntity.getUdi()); List udiRelevanceResponses = udiRelevanceService.filterUdiGp(filterUdiInfoRequest); @@ -124,8 +122,7 @@ public class UdiTraceController { }).collect(Collectors.toList()); - PageInfo pageInfo; - pageInfo = new PageInfo<>(udiTraceResponseList); + PageInfo pageInfo = new PageInfo<>(udiTraceResponseList); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(udiTraceResponseList); @@ -136,7 +133,6 @@ public class UdiTraceController { } - // TODO 20241017先把这个接口注释了 @AuthRuleAnnotation("") @GetMapping("spms/inv/products/order/trace") diff --git a/src/main/java/com/glxp/api/controller/monitor/SysLogininforController.java b/src/main/java/com/glxp/api/controller/monitor/SysLogininforController.java index d59458126..1bd2de8d0 100644 --- a/src/main/java/com/glxp/api/controller/monitor/SysLogininforController.java +++ b/src/main/java/com/glxp/api/controller/monitor/SysLogininforController.java @@ -37,8 +37,7 @@ public class SysLogininforController extends BaseController { public BaseResponse list(FilterLoginLogRequest filterLoginLogRequest) { List selectLogininforList = logininforService.selectLogininforList(filterLoginLogRequest); - PageInfo pageInfo; - pageInfo = new PageInfo<>(selectLogininforList); + PageInfo pageInfo = new PageInfo<>(selectLogininforList); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(selectLogininforList); diff --git a/src/main/java/com/glxp/api/controller/monitor/SysOperlogController.java b/src/main/java/com/glxp/api/controller/monitor/SysOperlogController.java index ab71b1e66..db2e9ece4 100644 --- a/src/main/java/com/glxp/api/controller/monitor/SysOperlogController.java +++ b/src/main/java/com/glxp/api/controller/monitor/SysOperlogController.java @@ -34,10 +34,8 @@ public class SysOperlogController extends BaseController { @SaCheckPermission("monitor:operlog:list") @GetMapping("/list") public BaseResponse list(FilterOperLogRequest filterOperLogRequest) { - List selectOperLogList = operLogService.selectOperLogList(filterOperLogRequest); - PageInfo pageInfo; - pageInfo = new PageInfo<>(selectOperLogList); + PageInfo pageInfo = new PageInfo<>(selectOperLogList); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(selectOperLogList); @@ -54,7 +52,6 @@ public class SysOperlogController extends BaseController { @SaCheckPermission("monitor:operlog:remove") @DeleteMapping("/{operIds}") public BaseResponse remove(@PathVariable Long[] operIds) { - int i = operLogService.deleteOperLogByIds(operIds); return ResultVOUtils.success("删除成功！"); } diff --git a/src/main/java/com/glxp/api/controller/purchase/IoPurChangeService.java b/src/main/java/com/glxp/api/controller/purchase/IoPurChangeService.java index fdd4f7271..4a228b7ef 100644 --- a/src/main/java/com/glxp/api/controller/purchase/IoPurChangeService.java +++ b/src/main/java/com/glxp/api/controller/purchase/IoPurChangeService.java @@ -166,10 +166,7 @@ public class IoPurChangeService { purApplyEntity1.setGeneratePlan(true); purApplyService.update(purApplyEntity1); } -// if (basicBusTypeChangeEntity != null && StrUtil.isNotEmpty(basicBusTypeChangeEntity.getTargetBusAction()) && basicBusTypeChangeEntity.isEnable() == true) { -// purApplyGen(purApplyEntity); -// System.out.println("6666666666666666666999999999999999"); -// } + } } diff --git a/src/main/java/com/glxp/api/controller/purchase/PurApplyArgumentController.java b/src/main/java/com/glxp/api/controller/purchase/PurApplyArgumentController.java index d54f76ea9..918982693 100644 --- a/src/main/java/com/glxp/api/controller/purchase/PurApplyArgumentController.java +++ b/src/main/java/com/glxp/api/controller/purchase/PurApplyArgumentController.java @@ -52,8 +52,7 @@ public class PurApplyArgumentController { public BaseResponse list(PurApplyArgumentRequest purApplyArgumentRequest) { List list = purApplyArgumentService.queryPageList(purApplyArgumentRequest); - PageInfo pageInfo; - pageInfo = new PageInfo<>(list); + PageInfo pageInfo = new PageInfo<>(list); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(list); diff --git a/src/main/java/com/glxp/api/controller/purchase/PurApplyController.java b/src/main/java/com/glxp/api/controller/purchase/PurApplyController.java index cf1aa05ec..ed12a9efa 100644 --- a/src/main/java/com/glxp/api/controller/purchase/PurApplyController.java +++ b/src/main/java/com/glxp/api/controller/purchase/PurApplyController.java @@ -64,7 +64,6 @@ public class PurApplyController { PurPlanService purPlanService; @Resource PurPlanDetailService purPlanDetailService; - @Resource IBasicBusTypeChangeService basicBusTypeChangeService; @Resource @@ -152,8 +151,7 @@ public class PurApplyController { purApplyRequest.setSysApprovalFlow(sys_approval_flow); List purApplyEntities = purApplyService.queryPageList(purApplyRequest); - PageInfo pageInfo; - pageInfo = new PageInfo<>(purApplyEntities); + PageInfo pageInfo = new PageInfo<>(purApplyEntities); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(purApplyEntities); @@ -171,18 +169,13 @@ public class PurApplyController { if (purApplyRequest.getStatus() == null) { purApplyRequest.setStatus(12); //查询已审核状态 } -// if (purApplyRequest.getIsInvCode() != null && purApplyRequest.getIsInvCode()) { -// AuthAdmin authAdmin = customerService.getUserBean(); -// purApplyRequest.setTargetInvCode(authAdmin.getLocInvCode() + ""); //查询自己仓库 -// } Boolean sys_approval_flow = "1".equals(systemParamConfigService.selectValueByParamKey("sys_approval_flow")); purApplyRequest.setSysApprovalFlow(sys_approval_flow); List purApplyEntities = purApplyService.queryPageList(purApplyRequest); - PageInfo pageInfo; - pageInfo = new PageInfo<>(purApplyEntities); + PageInfo pageInfo = new PageInfo<>(purApplyEntities); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(purApplyEntities); @@ -209,40 +202,6 @@ public class PurApplyController { if (purApplyRequest.getStatus() == 3) { purChangeService.purApplyChange(purApplyEntity); } -// //审核通过后转换成采购计划单 -// if (purApplyEntity.getStatus() == ConstantStatus.APPLY_AUDIT_ED && purApplyRequest.isAudtoPlan()) { -// PurPlanEntity purPlanEntity = new PurPlanEntity(); -// String billNo = gennerOrderUtils.createStOrderNo(new OrderNoTypeBean(Constant.JH_ORDER, "yyyyMMdd")); -// purPlanEntity.setBillNo(billNo); -// purPlanEntity.setBillDate(new Date()); -// purPlanEntity.setInvCode(purApplyEntity.getInvCode()); -// purPlanEntity.setDeptCode(purApplyEntity.getDeptCode()); -// purApplyEntity.setCreateUser(customerService.getUserId()+""); -// purPlanEntity.setUpdateUser(purApplyEntity.getUpdateUser()); -// purPlanEntity.setStatus(ConstantStatus.APPLY_DRAFT); -// purPlanEntity.setBillType("purPlan"); -// purPlanEntity.setCreateTime(new Date()); -// purPlanEntity.setUpdateTime(new Date()); -// purPlanEntity.setApplyBillNo(purApplyEntity.getBillNo()); -// purPlanEntity.setApplyCreateUser(purApplyEntity.getCreateUser()); -// purPlanEntity.setApplyRemark(purApplyEntity.getRemark()); -// purPlanEntity.setApplyAuditUser(purApplyEntity.getAuditUser()); -// purPlanEntity.setRemark("申购科室：" + purApplyRequest.getTargetInvCode() + -// ";申购人：" + 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)) { -// for (PurApplyDetailEntity purApplyDetailEntity : purApplyDetailEntities) { -// PurPlanDetailEntity purPlanDetailEntity = new PurPlanDetailEntity(); -// BeanUtils.copyProperties(purApplyDetailEntity, purPlanDetailEntity); -// purPlanDetailEntity.setOrderIdFk(purPlanEntity.getId() + ""); -// purPlanDetailService.insert(purPlanDetailEntity); -// } -// } -// } return ResultVOUtils.success("更新成功！"); } @@ -457,8 +416,7 @@ public class PurApplyController { public BaseResponse detailList(PurApplyDetailRequest purApplyDetailRequest) { List purApplyDetailEntities = purApplyDetailService.joinQueryList(purApplyDetailRequest); - PageInfo pageInfo; - pageInfo = new PageInfo<>(purApplyDetailEntities); + PageInfo pageInfo = new PageInfo<>(purApplyDetailEntities); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(purApplyDetailEntities); @@ -580,8 +538,7 @@ public class PurApplyController { @GetMapping("/purchase/apply/drug/list/detail") public BaseResponse drugDetailList(PurApplyDetailRequest purApplyDetailRequest) { List purApplyDetailEntities = purApplyDetailService.joinQueryListDrug(purApplyDetailRequest); - PageInfo pageInfo; - pageInfo = new PageInfo<>(purApplyDetailEntities); + PageInfo pageInfo = new PageInfo<>(purApplyDetailEntities); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(purApplyDetailEntities); diff --git a/src/main/java/com/glxp/api/controller/purchase/PurContractController.java b/src/main/java/com/glxp/api/controller/purchase/PurContractController.java index 1347b561d..da7d1c85e 100644 --- a/src/main/java/com/glxp/api/controller/purchase/PurContractController.java +++ b/src/main/java/com/glxp/api/controller/purchase/PurContractController.java @@ -101,8 +101,7 @@ public class PurContractController { purContractRequest.setSysApprovalFlow(sys_approval_flow); List purContractEntityResponses = purContractService.queryPageList(purContractRequest); - PageInfo pageInfo; - pageInfo = new PageInfo<>(purContractEntityResponses); + PageInfo pageInfo = new PageInfo<>(purContractEntityResponses); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(purContractEntityResponses); diff --git a/src/main/java/com/glxp/api/controller/purchase/PurInquiryController.java b/src/main/java/com/glxp/api/controller/purchase/PurInquiryController.java index d836a0531..ff7af88f8 100644 --- a/src/main/java/com/glxp/api/controller/purchase/PurInquiryController.java +++ b/src/main/java/com/glxp/api/controller/purchase/PurInquiryController.java @@ -59,8 +59,7 @@ public class PurInquiryController { Boolean sys_approval_flow = "1".equals(systemParamConfigService.selectValueByParamKey("sys_approval_flow")); purInquiryRequest.setSysApprovalFlow(sys_approval_flow); List purInquiryEntityResponses = purInquiryService.queryPageList(purInquiryRequest); - PageInfo pageInfo; - pageInfo = new PageInfo<>(purInquiryEntityResponses); + PageInfo pageInfo = new PageInfo<>(purInquiryEntityResponses); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(purInquiryEntityResponses); @@ -107,8 +106,7 @@ public class PurInquiryController { @GetMapping("/purchase/purInquiry/list/detail") public BaseResponse getDetailList(PurContractDetailRequest purContractDetailRequest) { List page = purInquiryItemService.queryPageList(purContractDetailRequest); - PageInfo pageInfo; - pageInfo = new PageInfo<>(page); + PageInfo pageInfo = new PageInfo<>(page); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(page); @@ -123,8 +121,7 @@ public class PurInquiryController { @GetMapping("/purchase/purInquiry/list/itemDetail") public BaseResponse getItemDetailList(PurContractDetailRequest purContractDetailRequest) { List page = purInquiryItemDetailService.queryPageList(purContractDetailRequest); - PageInfo pageInfo; - pageInfo = new PageInfo<>(page); + PageInfo pageInfo = new PageInfo<>(page); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(page); diff --git a/src/main/java/com/glxp/api/controller/purchase/PurInquiryOfferController.java b/src/main/java/com/glxp/api/controller/purchase/PurInquiryOfferController.java index d881ae8d6..6d53c86a5 100644 --- a/src/main/java/com/glxp/api/controller/purchase/PurInquiryOfferController.java +++ b/src/main/java/com/glxp/api/controller/purchase/PurInquiryOfferController.java @@ -62,8 +62,7 @@ public class PurInquiryOfferController { Boolean sys_approval_flow = "1".equals(systemParamConfigService.selectValueByParamKey("sys_approval_flow")); purInquiryOfferRequest.setSysApprovalFlow(sys_approval_flow); List purInquiryOfferEntityResponses = purInquiryOfferService.queryPageList(purInquiryOfferRequest); - PageInfo pageInfo; - pageInfo = new PageInfo<>(purInquiryOfferEntityResponses); + PageInfo pageInfo = new PageInfo<>(purInquiryOfferEntityResponses); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(purInquiryOfferEntityResponses); @@ -110,8 +109,7 @@ public class PurInquiryOfferController { @GetMapping("/purchase/purInquiryOffer/list/detail") public BaseResponse getDetailList(PurContractDetailRequest purContractDetailRequest) { List page = purInquiryOfferItemService.queryPageList(purContractDetailRequest); - PageInfo pageInfo; - pageInfo = new PageInfo<>(page); + PageInfo pageInfo = new PageInfo<>(page); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(page); @@ -126,8 +124,7 @@ public class PurInquiryOfferController { @GetMapping("/purchase/purInquiryOffer/list/itemDetail") public BaseResponse getItemDetailList(PurContractDetailRequest purContractDetailRequest) { List page = purInquiryOfferItemDetailService.queryPageList(purContractDetailRequest); - PageInfo pageInfo; - pageInfo = new PageInfo<>(page); + PageInfo pageInfo = new PageInfo<>(page); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(page); diff --git a/src/main/java/com/glxp/api/controller/purchase/PurOrderController.java b/src/main/java/com/glxp/api/controller/purchase/PurOrderController.java index 200fbd753..75062879c 100644 --- a/src/main/java/com/glxp/api/controller/purchase/PurOrderController.java +++ b/src/main/java/com/glxp/api/controller/purchase/PurOrderController.java @@ -52,15 +52,12 @@ import java.util.stream.Collectors; @RestController public class PurOrderController { - @Resource PurOrderService purOrderService; - @Resource PurPlanDetailService purPlanDetailService; @Resource PurOrderDetailService purOrderDetailService; - @Resource CustomerService customerService; @Resource @@ -136,8 +133,7 @@ public class PurOrderController { purOrderRequest.setSysApprovalFlow(sys_approval_flow); List purApplyEntities = purOrderService.queryPageList(purOrderRequest); - PageInfo pageInfo; - pageInfo = new PageInfo<>(purApplyEntities); + PageInfo pageInfo = new PageInfo<>(purApplyEntities); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(purApplyEntities); @@ -160,8 +156,7 @@ public class PurOrderController { purOrderRequest.setSysApprovalFlow(sys_approval_flow); List purApplyEntities = purOrderService.queryPageList(purOrderRequest); - PageInfo pageInfo; - pageInfo = new PageInfo<>(purApplyEntities); + PageInfo pageInfo = new PageInfo<>(purApplyEntities); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(purApplyEntities); @@ -177,7 +172,6 @@ public class PurOrderController { @PostMapping("/purchase/order/auditOrder") public BaseResponse auditOrder(@RequestBody PostPurOrderRequest postPurOrderRequest) { - Long userId = customerService.getUserId(); PurOrderEntity purOrderEntity = postPurOrderRequest.getPurOrderEntity(); purOrderEntity.setUpdateTime(new Date()); @@ -223,64 +217,6 @@ public class PurOrderController { } purChangeService.purOrderChange(purOrderEntity); -// String billNo = ""; -// List purOrderDetailEntities = purOrderDetailService.findByOrderId(purOrderEntity.getId() + ""); -// -// //对计划单里面的供应商进行分组 -// Map> map = purOrderDetailEntities.stream().collect(Collectors.groupingBy(PurOrderDetailEntity::getSupId)); -// -// if (postPurOrderRequest.getEditStatus() == ConstantStatus.APPLY_AUDIT_ED) { -// -// if (CollUtil.isNotEmpty(purOrderDetailEntities) && postPurOrderRequest.isAutoPurchase() == true -// && StrUtil.isNotEmpty(postPurOrderRequest.getTargetSubInv()) && StrUtil.isNotEmpty(postPurOrderRequest.getTargetBillAction())) { -// -// for (Map.Entry> m : map.entrySet()) { -// //生产单据表信息 -// IoOrderEntity ioOrderEntity = new IoOrderEntity(); -// ioOrderEntity.setBillNo(gennerOrderUtils.createScOrderNo(new OrderNoTypeBean(Constant.SCAN_ORDER, "yyyyMMdd"))); -// ioOrderEntity.setCorpOrderId(CustomUtil.getDate()); -// ioOrderEntity.setMainAction(ConstantType.TYPE_PUT); -// ioOrderEntity.setAction(postPurOrderRequest.getTargetBillAction()); -// ioOrderEntity.setFromCorp(m.getKey()); -// ioOrderEntity.setFromType(ConstantStatus.FROM_Order); -// ioOrderEntity.setStatus(1); -// ioOrderEntity.setDealStatus(1); -// ioOrderEntity.setOrderType(1); -// ioOrderEntity.setCreateTime(new Date()); -// ioOrderEntity.setCreateUser(postPurOrderRequest.getPurOrderEntity().getAuditUser()); -// ioOrderEntity.setUpdateTime(new Date()); -// ioOrderEntity.setUpdateUser(postPurOrderRequest.getPurOrderEntity().getAuditUser()); -// ioOrderEntity.setCustomerId("110"); -// ioOrderEntity.setDeptCode(postPurOrderRequest.getTargetDeptCode()); -// ioOrderEntity.setInvCode(postPurOrderRequest.getTargetSubInv()); -// ioOrderService.insertOrder(ioOrderEntity); -// billNo += ioOrderEntity.getBillNo() + ","; -// //插入业务单表 -// for (PurOrderDetailEntity obj : m.getValue()) { -// BasicProductsEntity basicProductsEntity = purOrderDetailService.selectIoOrderDetailBiz(obj.getId()); -// IoOrderDetailBizEntity ioOrderDetailBizEntity = new IoOrderDetailBizEntity(); -// ioOrderDetailBizEntity.setOrderIdFk(ioOrderEntity.getBillNo()); -// ioOrderDetailBizEntity.setBindRlFk(Long.valueOf(obj.getProductId())); -// ioOrderDetailBizEntity.setCount(obj.getCount()); -// ioOrderDetailBizEntity.setUuidFk(basicProductsEntity.getUuid()); -// ioOrderDetailBizEntity.setNameCode(basicProductsEntity.getNameCode()); -// ioOrderDetailBizEntity.setCoName(basicProductsEntity.getCpmctymc()); -// ioOrderDetailBizEntity.setCertCode(basicProductsEntity.getZczbhhzbapzbh()); -// ioOrderDetailBizEntity.setYlqxzcrbarmc(basicProductsEntity.getYlqxzcrbarmc()); -// ioOrderDetailBizEntity.setManufacturer(basicProductsEntity.getManufactory()); -// ioOrderDetailBizEntity.setMeasname(basicProductsEntity.getMeasname()); -// ioOrderDetailBizEntity.setSpec(basicProductsEntity.getGgxh()); -// if (basicProductsEntity.getPrice() != null) { -// ioOrderDetailBizEntity.setPrice(BigDecimal.valueOf(basicProductsEntity.getPrice())); -// } -// ioOrderDetailBizEntity.setSupId(obj.getSupId()); -// ioOrderDetailBizService.insert(ioOrderDetailBizEntity); -// } -// } -// purOrderEntity.setStockOrderNo(billNo.substring(0, billNo.length() - 1)); -// purOrderService.update(purOrderEntity); -// } -// } return ResultVOUtils.success("更新成功！"); } @@ -292,8 +228,7 @@ public class PurOrderController { public BaseResponse detailList(PurOrderDetailRequest purApplyDetailRequest) { List purOrderDetailResponseList = purOrderDetailService.joinQueryList(purApplyDetailRequest); - PageInfo pageInfo; - pageInfo = new PageInfo<>(purOrderDetailResponseList); + PageInfo pageInfo = new PageInfo<>(purOrderDetailResponseList); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(purOrderDetailResponseList); @@ -345,7 +280,6 @@ public class PurOrderController { PurOrderDetailRequest.setOrderIdFk(purOrderRequest.getId() + ""); List purOrderDetailEntities = purOrderDetailService.getPurOrderDetailEntityList(PurOrderDetailRequest); - List ids = new ArrayList<>(); for (PurOrderDetailEntity obj : purOrderDetailEntities) { for (PurOrderDetailEntity obj1 : purOrderDetailEntityList) { @@ -481,8 +415,7 @@ public class PurOrderController { PurOrderRequest purOrderRequest = new PurOrderRequest(); purOrderRequest.setBillNo(billNo); List purApplyEntities = purOrderService.queryPageList(purOrderRequest); - PageInfo pageInfo; - pageInfo = new PageInfo<>(purApplyEntities); + PageInfo pageInfo = new PageInfo<>(purApplyEntities); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(purApplyEntities); @@ -498,8 +431,7 @@ public class PurOrderController { public BaseResponse drugDetailList(PurOrderDetailRequest purApplyDetailRequest) { List purOrderDetailResponseList = purOrderDetailService.joinDrugQueryList(purApplyDetailRequest); - PageInfo pageInfo; - pageInfo = new PageInfo<>(purOrderDetailResponseList); + PageInfo pageInfo = new PageInfo<>(purOrderDetailResponseList); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(purOrderDetailResponseList); diff --git a/src/main/java/com/glxp/api/controller/purchase/PurOrderPrintController.java b/src/main/java/com/glxp/api/controller/purchase/PurOrderPrintController.java index e34e91eab..fd779d8e7 100644 --- a/src/main/java/com/glxp/api/controller/purchase/PurOrderPrintController.java +++ b/src/main/java/com/glxp/api/controller/purchase/PurOrderPrintController.java @@ -68,7 +68,6 @@ public class PurOrderPrintController { ReceiveService receiveService; @Resource ReceiveDetailService receivedetailService; - @Resource PurApplyService purApplyService; @Resource @@ -198,7 +197,6 @@ public class PurOrderPrintController { supData.put("auditUserName", purApplyResponse.getAuditByName()); supData.put("billDate", MsDateUtil.formatDate(purApplyResponse.getBillDate(), "yyyy-MM-dd")); supData.put("auditTime", MsDateUtil.formatDate(purApplyResponse.getAuditTime(), "yyyy-MM-dd")); - supData.put("count", obj.getCount()); supData.put("cpmctymc", obj.getProductName()); supData.put("ggxh", obj.getSpec()); diff --git a/src/main/java/com/glxp/api/controller/purchase/PurOrderReceiveController.java b/src/main/java/com/glxp/api/controller/purchase/PurOrderReceiveController.java index 0a854f241..788130ddd 100644 --- a/src/main/java/com/glxp/api/controller/purchase/PurOrderReceiveController.java +++ b/src/main/java/com/glxp/api/controller/purchase/PurOrderReceiveController.java @@ -175,14 +175,9 @@ public class PurOrderReceiveController extends BaseController { @GetMapping("/udiwms/receive/order/filter") public BaseResponse filterReceive(FilterReceiveRequest filterReceiveRequest) { -// if (filterReceiveRequest.getIsUser() != null && filterReceiveRequest.getIsUser()) { -// AuthAdmin authAdmin = customerService.getUserBean(); -// filterReceiveRequest.setCreateUser(authAdmin.getId() + ""); //查询自己 -// } if (filterReceiveRequest.getIsInvCode() != null && filterReceiveRequest.getIsInvCode()) { AuthAdmin authAdmin = customerService.getUserBean(); filterReceiveRequest.setTargetInvCode(authAdmin.getLocInvCode()); -// filterReceiveRequest.setTargetInvCode("1000000"); } Boolean sys_approval_flow = "1".equals(systemParamConfigService.selectValueByParamKey("sys_approval_flow")); @@ -201,8 +196,7 @@ public class PurOrderReceiveController extends BaseController { @GetMapping("/udiwms/receive/order/detail") public BaseResponse filterReceiveDetail(FilterReceiveDetailRequest filterReceiveDetailRequest) { List data = receivedetailService.filterList(filterReceiveDetailRequest); - PageInfo pageInfo; - pageInfo = new PageInfo<>(data); + PageInfo pageInfo = new PageInfo<>(data); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(data); @@ -213,8 +207,7 @@ public class PurOrderReceiveController extends BaseController { @GetMapping("/udiwms/receive/drug/order/detail") public BaseResponse filterReceiveDrugDetail(FilterReceiveDetailRequest filterReceiveDetailRequest) { List data = receivedetailService.filterDrugList(filterReceiveDetailRequest); - PageInfo pageInfo; - pageInfo = new PageInfo<>(data); + PageInfo pageInfo = new PageInfo<>(data); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(data); @@ -476,197 +469,6 @@ public class PurOrderReceiveController extends BaseController { return ResultVOUtils.success("成功"); } - //根据单据生成新单据 - public Boolean generateDocument(PurReceiveEntity purReceiveEntity) { - //查询耗材表 - purReceiveEntity = receiveService.selectById(purReceiveEntity.getId()); - //查询耗材详情 - List purReceiveDetailEntityList = receivedetailService.selectByOrderId(purReceiveEntity.getBillNo()); - PurApplyEntity purApplyEntity = new PurApplyEntity(); - //查询耗材要生成的业务单 - BasicBusTypeChangeEntity basicBusTypeChangeEntity = new BasicBusTypeChangeEntity(); - basicBusTypeChangeEntity = basicBusTypeChangeService.selectByOriginAction("HCLY"); - if (basicBusTypeChangeEntity != null && StrUtil.isNotEmpty(basicBusTypeChangeEntity.getTargetBusAction()) && basicBusTypeChangeEntity.isEnable() == true) { - purApplyEntity.setBillNo(gennerOrderUtils.createStOrderNo(new OrderNoTypeBean(Constant.SG_ORDER, "yyyyMMdd"))); - purApplyEntity.setBillDate(purReceiveEntity.getBillDate()); - purApplyEntity.setStatus(basicBusTypeChangeEntity.getBusAuditStatus()); - purApplyEntity.setRemark(purReceiveEntity.getRemark()); - purApplyEntity.setInvCode(purReceiveEntity.getTargetInvCode()); - purApplyEntity.setDeptCode(purReceiveEntity.getTargetDeptCode()); - purApplyEntity.setTargetInvCode(purReceiveEntity.getInvCode()); - purApplyEntity.setTargetDeptCode(purReceiveEntity.getDeptCode()); - purApplyEntity.setCreateUser(purReceiveEntity.getAuditUser()); - purApplyEntity.setCreateTime(timeProcess(purReceiveEntity.getCreateTime(), basicBusTypeChangeEntity.getBusBeforeTime())); - purApplyEntity.setUpdateUser(purReceiveEntity.getAuditUser()); - purApplyEntity.setUpdateTime(timeProcess(purReceiveEntity.getCreateTime(), basicBusTypeChangeEntity.getBusBeforeTime())); - if (purApplyEntity.getStatus() == 3) { - purApplyEntity.setAuditUser(""); - purApplyEntity.setAuditTime(new Date()); - } - //插入申购主表 - purApplyService.insert(purApplyEntity); - //用stream流复制list - List purApplyDetailEntityList = purReceiveDetailEntityList.stream().map(e -> { - PurApplyDetailEntity d = new PurApplyDetailEntity(); - d.setOrderIdFk(purApplyEntity.getId() + ""); - d.setProductId(e.getRelIdFk()); - UdiProductEntity udiProductEntity = udiProductService.findByNameCode(e.getNameCode()); - d.setProductName(udiProductEntity.getCpmctymc()); - d.setCount(e.getCount()); - d.setSupId(e.getSupId()); - d.setZczbhhzbapzbh(udiProductEntity.getZczbhhzbapzbh()); - return d; - }) - .collect(Collectors.toList()); - purApplyDetailService.insertPurApplyDetailEntity(purApplyDetailEntityList); - - //---------------------------------判断申购为已审核就生成计划单-------------------------------------------// - PurPlanEntity purPlanEntity = new PurPlanEntity(); - List purPlanDetailEntityList = new ArrayList<>(); - if (purApplyEntity.getStatus() == 3) { - basicBusTypeChangeEntity = basicBusTypeChangeService.selectByOriginAction(ConstantStatus.BUS_ORDER_CPSG); - if (basicBusTypeChangeEntity != null && StrUtil.isNotEmpty(basicBusTypeChangeEntity.getTargetBusAction()) && basicBusTypeChangeEntity.isEnable() == true) { - purPlanEntity.setBillNo(gennerOrderUtils.createStOrderNo(new OrderNoTypeBean(Constant.JH_ORDER, "yyyyMMdd"))); - purPlanEntity.setBillDate(purReceiveEntity.getBillDate()); - purPlanEntity.setStatus(basicBusTypeChangeEntity.getBusAuditStatus()); - purPlanEntity.setRemark(purReceiveEntity.getRemark()); - purPlanEntity.setInvCode(purReceiveEntity.getInvCode()); - purPlanEntity.setDeptCode(purReceiveEntity.getDeptCode()); - purPlanEntity.setCreateUser(purReceiveEntity.getAuditUser()); - purPlanEntity.setCreateTime(timeProcess(purReceiveEntity.getCreateTime(), basicBusTypeChangeEntity.getBusBeforeTime())); - purPlanEntity.setUpdateUser(purReceiveEntity.getAuditUser()); - purPlanEntity.setUpdateTime(timeProcess(purReceiveEntity.getCreateTime(), basicBusTypeChangeEntity.getBusBeforeTime())); - if (purPlanEntity.getStatus() == 3) { - purPlanEntity.setAuditUser(""); - purPlanEntity.setAuditTime(new Date()); - } - //插入计划主表 - purPlanService.insert(purPlanEntity); - //用stream流复制list - purPlanDetailEntityList = purReceiveDetailEntityList.stream().map(e -> { - PurPlanDetailEntity d = new PurPlanDetailEntity(); - d.setOrderIdFk(purPlanEntity.getId() + ""); - d.setProductId(e.getRelIdFk()); - UdiProductEntity udiProductEntity = udiProductService.findByNameCode(e.getNameCode()); - d.setProductName(udiProductEntity.getCpmctymc()); - d.setCount(e.getCount()); - d.setSupId(e.getSupId()); - d.setZczbhhzbapzbh(udiProductEntity.getZczbhhzbapzbh()); - return d; - }).collect(Collectors.toList()); - purPlanDetailService.insertPurPlanDetailEntity(purPlanDetailEntityList); - //更新申购表信息插入计划单号 - PurApplyEntity purApplyEntity1 = new PurApplyEntity(); - purApplyEntity1.setId(purApplyEntity.getId()); - purApplyEntity1.setPlanBillNo(purPlanEntity.getBillNo()); - purApplyEntity1.setGeneratePlan(true); - purApplyService.update(purApplyEntity1); - //---------------------------------判断计划为已审核就生成计划单-------------------------------------------//\ - PurOrderEntity purOrderEntity = new PurOrderEntity(); - if (purPlanEntity.getStatus() == 3) { - basicBusTypeChangeEntity = basicBusTypeChangeService.selectByOriginAction(ConstantStatus.BUS_ORDER_CGJH); - if (basicBusTypeChangeEntity != null && StrUtil.isNotEmpty(basicBusTypeChangeEntity.getTargetBusAction()) && basicBusTypeChangeEntity.isEnable() == true) { - purOrderEntity.setBillNo(gennerOrderUtils.createStOrderNo(new OrderNoTypeBean(Constant.CG_ORDER, "yyyyMMdd"))); - purOrderEntity.setBillDate(purReceiveEntity.getBillDate()); - purOrderEntity.setStatus(basicBusTypeChangeEntity.getBusAuditStatus()); - purOrderEntity.setRemark(purReceiveEntity.getRemark()); - purOrderEntity.setInvCode(purReceiveEntity.getInvCode()); - purOrderEntity.setDeptCode(purReceiveEntity.getDeptCode()); - purOrderEntity.setCreateUser(purReceiveEntity.getAuditUser()); - purOrderEntity.setCreateTime(timeProcess(purReceiveEntity.getCreateTime(), basicBusTypeChangeEntity.getBusBeforeTime())); - purOrderEntity.setUpdateUser(purReceiveEntity.getAuditUser()); - purOrderEntity.setUpdateTime(new Date()); - if (purOrderEntity.getStatus() == 3) { - purOrderEntity.setAuditUser(""); - purOrderEntity.setAuditTime(new Date()); - } - //插入订单主表 - purOrderService.insert(purOrderEntity); - //用stream流复制list - List purOrderDetailEntityList = purReceiveDetailEntityList.stream().map(e -> { - PurOrderDetailEntity d = new PurOrderDetailEntity(); - d.setOrderIdFk(purOrderEntity.getId() + ""); - d.setProductId(e.getRelIdFk()); - UdiProductEntity udiProductEntity = udiProductService.findByNameCode(e.getNameCode()); - d.setProductName(udiProductEntity.getCpmctymc()); - d.setCount(e.getCount()); - d.setSupId(e.getSupId()); - d.setZczbhhzbapzbh(udiProductEntity.getZczbhhzbapzbh()); - return d; - }).collect(Collectors.toList()); - purOrderDetailService.insertPurOrderDetailEntity(purOrderDetailEntityList); - // 更新计划表信息插入订单单号 - PurPlanEntity purPlanEntity1 = new PurPlanEntity(); - purPlanEntity1.setId(purPlanEntity.getId()); - purPlanEntity1.setStockOrderNo(purOrderEntity.getBillNo()); -// purPlanEntity.sets(true); - purPlanService.update(purPlanEntity1); - } - //---------------------------------判断计划为已审核就生成采购入库单-------------------------------------------//\ - //查询申购单详情 - List purPlanDetailEntities = purPlanDetailService.findByOrderId(purPlanEntity.getId() + ""); - //对计划单里面的供应商进行分组 - Map> map = purPlanDetailEntities.stream().collect(Collectors.groupingBy(PurPlanDetailEntity::getSupId)); - String billNo = ""; - if (basicBusTypeChangeEntity != null && StrUtil.isNotEmpty(basicBusTypeChangeEntity.getTargetAction()) && basicBusTypeChangeEntity.isEnable() == true) { - for (Map.Entry> m : map.entrySet()) { - //生产单据表信息 - IoOrderEntity ioOrderEntity = new IoOrderEntity(); - ioOrderEntity.setBillNo(gennerOrderUtils.createScOrderNo(new OrderNoTypeBean(Constant.SCAN_ORDER, "yyyyMMdd"))); - ioOrderEntity.setCorpOrderId(CustomUtil.getDate()); - ioOrderEntity.setMainAction(ConstantType.TYPE_PUT); - ioOrderEntity.setAction(basicBusTypeChangeEntity.getTargetAction()); - ioOrderEntity.setFromCorp(m.getKey()); - ioOrderEntity.setFromType(ConstantStatus.FROM_PLAN); - ioOrderEntity.setStatus(1); - ioOrderEntity.setDealStatus(1); - ioOrderEntity.setOrderType(1); - ioOrderEntity.setCreateTime(new Date()); - ioOrderEntity.setCreateUser(purReceiveEntity.getCreateUser()); - ioOrderEntity.setUpdateTime(new Date()); - ioOrderEntity.setUpdateUser(purReceiveEntity.getCreateUser()); - ioOrderEntity.setCustomerId("110"); - ioOrderEntity.setDeptCode(purReceiveEntity.getInvCode()); - ioOrderEntity.setInvCode(purReceiveEntity.getDeptCode()); - ioOrderService.insertOrder(ioOrderEntity); - billNo += ioOrderEntity.getBillNo() + ","; - //插入业务单表 - for (PurPlanDetailEntity obj : m.getValue()) { - BasicProductsEntity basicProductsEntity = purPlanDetailService.selectIoOrderDetailBiz(obj.getId()); - IoOrderDetailBizEntity ioOrderDetailBizEntity = new IoOrderDetailBizEntity(); - ioOrderDetailBizEntity.setOrderIdFk(ioOrderEntity.getBillNo()); - ioOrderDetailBizEntity.setBindRlFk(Long.valueOf(obj.getProductId())); - ioOrderDetailBizEntity.setCount(obj.getCount()); - ioOrderDetailBizEntity.setUuidFk(basicProductsEntity.getUuid()); - ioOrderDetailBizEntity.setNameCode(basicProductsEntity.getNameCode()); - ioOrderDetailBizEntity.setCoName(basicProductsEntity.getCpmctymc()); - ioOrderDetailBizEntity.setCertCode(basicProductsEntity.getZczbhhzbapzbh()); - ioOrderDetailBizEntity.setYlqxzcrbarmc(basicProductsEntity.getYlqxzcrbarmc()); - ioOrderDetailBizEntity.setManufacturer(basicProductsEntity.getManufactory()); - ioOrderDetailBizEntity.setMeasname(basicProductsEntity.getMeasname()); - ioOrderDetailBizEntity.setSpec(basicProductsEntity.getGgxh()); - if (basicProductsEntity.getPrice() != null) { - ioOrderDetailBizEntity.setPrice(basicProductsEntity.getPrice()); - } - ioOrderDetailBizEntity.setSupId(obj.getSupId()); - ioOrderDetailBizService.insert(ioOrderDetailBizEntity); - } - } - PurPlanEntity purPlanEntity1 = new PurPlanEntity(); - purPlanEntity1.setId(purPlanEntity.getId()); - purPlanEntity1.setStockOrderNo(billNo.substring(0, billNo.length() - 1)); - purPlanService.update(purPlanEntity1); - } - - - } - - } - } - } - return true; - } - /** * 添加申购单到采购单里面 @@ -791,15 +593,4 @@ public class PurOrderReceiveController extends BaseController { receiveService.updateOrder(purReceiveEntity); return ResultVOUtils.success(orderNo); } - - - public Date timeProcess(Date date, Integer timeCount) { - Calendar rightNow = Calendar.getInstance(); - rightNow.setTime(date); - rightNow.add(Calendar.HOUR, timeCount); - Date dt1 = rightNow.getTime(); - return dt1; - } - - } diff --git a/src/main/java/com/glxp/api/controller/purchase/PurPlanController.java b/src/main/java/com/glxp/api/controller/purchase/PurPlanController.java index 44e60eafc..a74d15eb1 100644 --- a/src/main/java/com/glxp/api/controller/purchase/PurPlanController.java +++ b/src/main/java/com/glxp/api/controller/purchase/PurPlanController.java @@ -55,7 +55,6 @@ import java.util.stream.Collectors; @RestController public class PurPlanController { - @Resource PurPlanService purPlanService; @Resource @@ -123,7 +122,6 @@ public class PurPlanController { purPlanService.update(purPlanEntity); } - return ResultVOUtils.success("提交成功！"); } @@ -142,8 +140,7 @@ public class PurPlanController { purApplyRequest.setSysApprovalFlow(sys_approval_flow); List purApplyEntities = purPlanService.queryPageList(purApplyRequest); - PageInfo pageInfo; - pageInfo = new PageInfo<>(purApplyEntities); + PageInfo pageInfo = new PageInfo<>(purApplyEntities); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(purApplyEntities); @@ -166,8 +163,7 @@ public class PurPlanController { purApplyRequest.setSysApprovalFlow(sys_approval_flow); List purApplyEntities = purPlanService.queryPageList(purApplyRequest); - PageInfo pageInfo; - pageInfo = new PageInfo<>(purApplyEntities); + PageInfo pageInfo = new PageInfo<>(purApplyEntities); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(purApplyEntities); @@ -189,8 +185,7 @@ public class PurPlanController { purApplyRequest.setSysApprovalFlow(sys_approval_flow); List purApplyEntities = purPlanService.queryPageList(purApplyRequest); - PageInfo pageInfo; - pageInfo = new PageInfo<>(purApplyEntities); + PageInfo pageInfo = new PageInfo<>(purApplyEntities); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(purApplyEntities); @@ -217,186 +212,12 @@ public class PurPlanController { if (purPlanEntity.getStatus() == 3) { purPlanEntity = purPlanService.selectById(purPlanEntity.getId()); purChangeService.purPlanChange(purPlanEntity); -// generateDocument(purPlanEntity); } -// String billNo=""; -// List purPlanDetailEntities = purPlanDetailService.findByOrderId(purApplyEntity.getId() + ""); -// -// //对计划单里面的供应商进行分组 -// Map> map = purPlanDetailEntities.stream().collect(Collectors.groupingBy(PurPlanDetailEntity::getSupId)); -// -// if (postPurPlanRequest.getEditStatus() == ConstantStatus.APPLY_AUDIT_ED) { -// -// if (CollUtil.isNotEmpty(purPlanDetailEntities) && postPurPlanRequest.isAutoPurchase()==true -// && StrUtil.isNotEmpty(postPurPlanRequest.getTargetSubInv()) && StrUtil.isNotEmpty(postPurPlanRequest.getTargetBillAction()) ) { -// -// for (Map.Entry> m:map.entrySet()) { -// //生产单据表信息 -// IoOrderEntity ioOrderEntity=new IoOrderEntity(); -// ioOrderEntity.setBillNo(gennerOrderUtils.createScOrderNo(new OrderNoTypeBean(Constant.SCAN_ORDER ,"yyyyMMdd"))); -// ioOrderEntity.setCorpOrderId(CustomUtil.getDate()); -// ioOrderEntity.setMainAction(ConstantType.TYPE_PUT); -// ioOrderEntity.setAction(postPurPlanRequest.getTargetBillAction()); -// ioOrderEntity.setFromCorp(m.getKey()); -// ioOrderEntity.setFromType(ConstantStatus.FROM_PLAN); -// ioOrderEntity.setStatus(1); -// ioOrderEntity.setDealStatus(1); -// ioOrderEntity.setOrderType(1); -// ioOrderEntity.setCreateTime(new Date()); -// ioOrderEntity.setCreateUser(postPurPlanRequest.getPurPlanEntity().getAuditUser()); -// ioOrderEntity.setUpdateTime(new Date()); -// ioOrderEntity.setUpdateUser(postPurPlanRequest.getPurPlanEntity().getAuditUser()); -// ioOrderEntity.setCustomerId("110"); -// ioOrderEntity.setDeptCode(postPurPlanRequest.getTargetDeptCode()); -// ioOrderEntity.setInvCode(postPurPlanRequest.getTargetSubInv()); -// ioOrderService.insertOrder(ioOrderEntity); -// billNo+=ioOrderEntity.getBillNo()+","; -// //插入业务单表 -// for (PurPlanDetailEntity obj:m.getValue()) { -// BasicProductsEntity basicProductsEntity = purPlanDetailService.selectIoOrderDetailBiz(obj.getId()); -// IoOrderDetailBizEntity ioOrderDetailBizEntity = new IoOrderDetailBizEntity(); -// ioOrderDetailBizEntity.setOrderIdFk(ioOrderEntity.getBillNo()); -// ioOrderDetailBizEntity.setBindRlFk(Long.valueOf(obj.getProductId())); -// ioOrderDetailBizEntity.setCount(obj.getCount()); -// ioOrderDetailBizEntity.setUuidFk(basicProductsEntity.getUuid()); -// ioOrderDetailBizEntity.setNameCode(basicProductsEntity.getNameCode()); -// ioOrderDetailBizEntity.setCoName(basicProductsEntity.getCpmctymc()); -// ioOrderDetailBizEntity.setCertCode(basicProductsEntity.getZczbhhzbapzbh()); -// ioOrderDetailBizEntity.setYlqxzcrbarmc(basicProductsEntity.getYlqxzcrbarmc()); -// ioOrderDetailBizEntity.setManufacturer(basicProductsEntity.getManufactory()); -// ioOrderDetailBizEntity.setMeasname(basicProductsEntity.getMeasname()); -// ioOrderDetailBizEntity.setSpec(basicProductsEntity.getGgxh()); -// if (basicProductsEntity.getPrice() != null) { -// ioOrderDetailBizEntity.setPrice(BigDecimal.valueOf(basicProductsEntity.getPrice())); -// } -// ioOrderDetailBizEntity.setSupId(obj.getSupId()); -// ioOrderDetailBizService.insert(ioOrderDetailBizEntity); -// } -// } -// purApplyEntity.setStockOrderNo(billNo.substring(0,billNo.length()-1)); -// purPlanService.update(purApplyEntity); -// } -// } return ResultVOUtils.success("更新成功！"); } - //根据单据生成新单据 - public Boolean generateDocument(PurPlanEntity purPlanEntity) { - BasicBusTypeChangeEntity basicBusTypeChangeEntity = new BasicBusTypeChangeEntity(); - //查询计划详情 - List purPlanDetailEntityList = purPlanDetailService.findByOrderId(purPlanEntity.getId() + ""); - //---------------------------------判断计划为已审核就生成计划单-------------------------------------------//\ - PurOrderEntity purOrderEntity = new PurOrderEntity(); - if (purPlanEntity.getStatus() == 3) { - basicBusTypeChangeEntity = basicBusTypeChangeService.selectByOriginAction(ConstantStatus.BUS_ORDER_CGJH); - if (basicBusTypeChangeEntity != null && StrUtil.isNotEmpty(basicBusTypeChangeEntity.getTargetBusAction()) && basicBusTypeChangeEntity.isEnable() == true) { - purOrderEntity.setBillNo(gennerOrderUtils.createStOrderNo(new OrderNoTypeBean(Constant.CG_ORDER, "yyyyMMdd"))); - purOrderEntity.setBillDate(purPlanEntity.getBillDate()); - purOrderEntity.setStatus(basicBusTypeChangeEntity.getBusAuditStatus()); - purOrderEntity.setRemark(purPlanEntity.getRemark()); - purOrderEntity.setEmergency(purPlanEntity.getEmergency()); - purOrderEntity.setArrivalTime(purPlanEntity.getArrivalTime()); - purOrderEntity.setInvCode(purPlanEntity.getInvCode()); - purOrderEntity.setDeptCode(purPlanEntity.getDeptCode()); - purOrderEntity.setCreateUser(purPlanEntity.getAuditUser()); - purOrderEntity.setCreateTime(timeProcess(purPlanEntity.getCreateTime(), basicBusTypeChangeEntity.getBusBeforeTime())); - purOrderEntity.setUpdateUser(purPlanEntity.getAuditUser()); - purOrderEntity.setUpdateTime(new Date()); - if (purOrderEntity.getStatus() == 3) { - purOrderEntity.setAuditUser(""); - purOrderEntity.setAuditTime(new Date()); - } - //插入订单主表 - purOrderService.insert(purOrderEntity); - //用stream流复制list - List purOrderDetailEntityList = purPlanDetailEntityList.stream().map(e -> { - PurOrderDetailEntity d = new PurOrderDetailEntity(); - d.setOrderIdFk(purOrderEntity.getId() + ""); - d.setProductId(e.getProductId()); - d.setProductName(e.getProductName()); - d.setCount(e.getCount()); - d.setSupId(e.getSupId()); - d.setZczbhhzbapzbh(e.getZczbhhzbapzbh()); - return d; - }).collect(Collectors.toList()); - purOrderDetailService.insertPurOrderDetailEntity(purOrderDetailEntityList); - // 更新计划表信息插入订单单号 - PurPlanEntity purPlanEntity1 = new PurPlanEntity(); - purPlanEntity1.setId(purPlanEntity.getId()); - purPlanEntity1.setStockOrderNo(purOrderEntity.getBillNo()); -// purPlanEntity.sets(true); - purPlanService.update(purPlanEntity1); - } - //---------------------------------判断计划为已审核就生成采购入库单-------------------------------------------//\ - //查询申购单详情 - List purPlanDetailEntities = purPlanDetailService.findByOrderId(purPlanEntity.getId() + ""); - //对计划单里面的供应商进行分组 - Map> map = purPlanDetailEntities.stream().collect(Collectors.groupingBy(PurPlanDetailEntity::getSupId)); - String billNo = ""; - if (basicBusTypeChangeEntity != null && StrUtil.isNotEmpty(basicBusTypeChangeEntity.getTargetAction()) && basicBusTypeChangeEntity.isEnable() == true) { - for (Map.Entry> m : map.entrySet()) { - //生产单据表信息 - IoOrderEntity ioOrderEntity = new IoOrderEntity(); - ioOrderEntity.setBillNo(gennerOrderUtils.createScOrderNo(new OrderNoTypeBean(Constant.SCAN_ORDER, "yyyyMMdd"))); - ioOrderEntity.setCorpOrderId(CustomUtil.getDate()); - ioOrderEntity.setMainAction(ConstantType.TYPE_PUT); - ioOrderEntity.setAction(basicBusTypeChangeEntity.getTargetAction()); - ioOrderEntity.setFromCorp(m.getKey()); - ioOrderEntity.setFromType(ConstantStatus.FROM_PLAN); - ioOrderEntity.setStatus(1); - ioOrderEntity.setDealStatus(1); - ioOrderEntity.setOrderType(1); - ioOrderEntity.setCreateTime(new Date()); - ioOrderEntity.setCreateUser(purPlanEntity.getCreateUser()); - ioOrderEntity.setUpdateTime(new Date()); - ioOrderEntity.setUpdateUser(purPlanEntity.getCreateUser()); - ioOrderEntity.setCustomerId("110"); - ioOrderEntity.setDeptCode(purPlanEntity.getInvCode()); - ioOrderEntity.setInvCode(purPlanEntity.getDeptCode()); - ioOrderService.insertOrder(ioOrderEntity); - billNo += ioOrderEntity.getBillNo() + ","; - //插入业务单表 - for (PurPlanDetailEntity obj : m.getValue()) { - BasicProductsEntity basicProductsEntity = purPlanDetailService.selectIoOrderDetailBiz(obj.getId()); - IoOrderDetailBizEntity ioOrderDetailBizEntity = new IoOrderDetailBizEntity(); - ioOrderDetailBizEntity.setOrderIdFk(ioOrderEntity.getBillNo()); - ioOrderDetailBizEntity.setBindRlFk(Long.valueOf(obj.getProductId())); - ioOrderDetailBizEntity.setCount(obj.getCount()); - ioOrderDetailBizEntity.setUuidFk(basicProductsEntity.getUuid()); - ioOrderDetailBizEntity.setNameCode(basicProductsEntity.getNameCode()); - ioOrderDetailBizEntity.setCoName(basicProductsEntity.getCpmctymc()); - ioOrderDetailBizEntity.setCertCode(basicProductsEntity.getZczbhhzbapzbh()); - ioOrderDetailBizEntity.setYlqxzcrbarmc(basicProductsEntity.getYlqxzcrbarmc()); - ioOrderDetailBizEntity.setManufacturer(basicProductsEntity.getManufactory()); - ioOrderDetailBizEntity.setMeasname(basicProductsEntity.getMeasname()); - ioOrderDetailBizEntity.setSpec(basicProductsEntity.getGgxh()); - if (basicProductsEntity.getPrice() != null) { - ioOrderDetailBizEntity.setPrice(basicProductsEntity.getPrice()); - } - ioOrderDetailBizEntity.setSupId(obj.getSupId()); - ioOrderDetailBizService.insert(ioOrderDetailBizEntity); - } - } - PurPlanEntity purPlanEntity1 = new PurPlanEntity(); - purPlanEntity1.setId(purPlanEntity.getId()); - purPlanEntity1.setStockOrderNo(billNo.substring(0, billNo.length() - 1)); - purPlanService.update(purPlanEntity1); - } - } - return true; - } - - public Date timeProcess(Date date, Integer timeCount) { - Calendar rightNow = Calendar.getInstance(); - rightNow.setTime(date); - rightNow.add(Calendar.HOUR, timeCount); - Date dt1 = rightNow.getTime(); - return dt1; - } - - /** * 查询采购计划列表 */ @@ -404,8 +225,7 @@ public class PurPlanController { public BaseResponse detailList(PurPlanDetailRequest purApplyDetailRequest) { List purApplyDetailEntities = purPlanDetailService.joinQueryList(purApplyDetailRequest); - PageInfo pageInfo; - pageInfo = new PageInfo<>(purApplyDetailEntities); + PageInfo pageInfo = new PageInfo<>(purApplyDetailEntities); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(purApplyDetailEntities); @@ -421,8 +241,7 @@ public class PurPlanController { public BaseResponse drugDetailList(PurPlanDetailRequest purApplyDetailRequest) { List purApplyDetailEntities = purPlanDetailService.joinDrugQueryList(purApplyDetailRequest); - PageInfo pageInfo; - pageInfo = new PageInfo<>(purApplyDetailEntities); + PageInfo pageInfo = new PageInfo<>(purApplyDetailEntities); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(purApplyDetailEntities); @@ -474,7 +293,6 @@ public class PurPlanController { purPlanDetailRequest.setOrderIdFk(purPlanRequest.getId() + ""); List purApplyDetailEntities = purPlanDetailService.getPurPlanDetailEntityList(purPlanDetailRequest); - List ids = new ArrayList<>(); for (PurPlanDetailEntity obj : purApplyDetailEntities) { for (PurPlanDetailEntity obj1 : purPlanDetailEntityList) { @@ -578,7 +396,6 @@ public class PurPlanController { @DeleteMapping("/purchase/plan/detail/{ids}") public BaseResponse detailRemove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) { - purPlanDetailService.deleteByIds(Arrays.asList(ids)); return ResultVOUtils.success("删除成功"); } diff --git a/src/main/java/com/glxp/api/controller/purchase/SupCertController.java b/src/main/java/com/glxp/api/controller/purchase/SupCertController.java index 25f527a1e..59b9aaf41 100644 --- a/src/main/java/com/glxp/api/controller/purchase/SupCertController.java +++ b/src/main/java/com/glxp/api/controller/purchase/SupCertController.java @@ -55,17 +55,14 @@ public class SupCertController { private AuthAdminService authAdminService; @Resource private SupCertService supCertService; - @Value("${file_path}") private String filePath; - @Resource private SystemPDFTemplateService systemPDFTemplateService; @Resource private SystemPDFModuleService systemPDFModuleService; -// @AuthRuleAnnotation("") @GetMapping("/sup/company/cert/filter") public BaseResponse filterCompanyCert(FilterSupCertRequest filterSupCertRequest, BindingResult bindingResult) { @@ -74,8 +71,7 @@ public class SupCertController { } List supCertEntityList = supCertService.filterCompanyCert(filterSupCertRequest); - PageInfo pageInfo; - pageInfo = new PageInfo<>(supCertEntityList); + PageInfo pageInfo = new PageInfo<>(supCertEntityList); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(supCertEntityList); diff --git a/src/main/java/com/glxp/api/controller/purchase/SupCompanyController.java b/src/main/java/com/glxp/api/controller/purchase/SupCompanyController.java index b55928610..ad41d5862 100644 --- a/src/main/java/com/glxp/api/controller/purchase/SupCompanyController.java +++ b/src/main/java/com/glxp/api/controller/purchase/SupCompanyController.java @@ -48,9 +48,6 @@ import java.util.ListIterator; @RestController public class SupCompanyController { - @Value("${file_path}") - private String filePath; - @Resource private AuthAdminService authAdminService; @Resource @@ -85,7 +82,6 @@ public class SupCompanyController { @Log(title = "资质证书", businessType = BusinessType.INSERT) public BaseResponse insertCompany(@RequestBody SupCompanyEntity companyEntity) { - //判断是不是存在草稿 if (companyEntity.getAuditStatus() == 6) { List supCertEntityList = supCertService.findAll(companyEntity.getCustomerId()); @@ -263,9 +259,6 @@ public class SupCompanyController { } } - - - AuthAdmin authAdmin = getUser(); companyEntity.setAuditor(authAdmin.getId() + ""); companyEntity.setAuditTime(new Date()); diff --git a/src/main/java/com/glxp/api/controller/purchase/SupManufacturerController.java b/src/main/java/com/glxp/api/controller/purchase/SupManufacturerController.java index 95b52885e..ea2d66548 100644 --- a/src/main/java/com/glxp/api/controller/purchase/SupManufacturerController.java +++ b/src/main/java/com/glxp/api/controller/purchase/SupManufacturerController.java @@ -303,7 +303,6 @@ public class SupManufacturerController { return ResultVOUtils.error(500, "参数错误！"); } - if (supManufacturerEntity.getAuditStatus() == 1 || supManufacturerEntity.getAuditStatus() == 4) { //查询上传的资质证书 FilterSupCertRequest filterSupCertRequest = new FilterSupCertRequest(); diff --git a/src/main/java/com/glxp/api/controller/purchase/SupProductController.java b/src/main/java/com/glxp/api/controller/purchase/SupProductController.java index 7a86dfbe8..a208813fd 100644 --- a/src/main/java/com/glxp/api/controller/purchase/SupProductController.java +++ b/src/main/java/com/glxp/api/controller/purchase/SupProductController.java @@ -158,11 +158,7 @@ public class SupProductController { public BaseResponse selectBind(@RequestBody SelectProductBindRequest selectProductBindRequest) { UdiRelevanceResponse udiRelevanceResponse = udiRelevanceService.selectUdiId(Long.valueOf(selectProductBindRequest.getRelIdFk())); - SupProductEntity supProductEntity = supProductService.findByManufactury(udiRelevanceResponse.getCpmctymc(), udiRelevanceResponse.getManufactory(), selectProductBindRequest.getManufacturerId()); -// if (supProductEntity != null) { -//// return ResultVOUtils.error(500, "该产品资质已存在，请勿重复添加！"); -// } else { - supProductEntity = new SupProductEntity(); + SupProductEntity supProductEntity = new SupProductEntity(); BeanUtils.copyProperties(udiRelevanceResponse, supProductEntity); supProductEntity.setProductId(selectProductBindRequest.getProductId()); supProductEntity.setRecordCode(udiRelevanceResponse.getZczbhhzbapzbh()); @@ -177,18 +173,9 @@ public class SupProductController { supProductEntity.setManufacturerIdFk(selectProductBindRequest.getManufacturerId()); supProductEntity.setCustomerId(selectProductBindRequest.getCustomerId()); supProductEntity.setHchzsb(udiRelevanceResponse.getCplb()); -// supProductEntity.setCompanyName(selectProductBindRequest.getCompanyName()); supProductEntity.setAuditStatus(selectProductBindRequest.getAuditStatus()); -// } - return ResultVOUtils.success(supProductEntity); -// boolean b = supProductService.insertRegistration(supProductEntity); -// if (b) { -// return ResultVOUtils.success(supProductEntity); -// } else { -// return ResultVOUtils.error(ResultEnum.NOT_NETWORK); -// } } @@ -213,7 +200,6 @@ public class SupProductController { } //判断是否上级供应商是否审核通过 - SupManufacturerEntity supManufacturerEntity = supManufacturerService.findManufacturer(supProductEntity.getManufacturerIdFk()); if (supManufacturerEntity.getAuditStatus() == ConstantStatus.AUDIT_UN || supManufacturerEntity.getAuditStatus() == ConstantStatus.AUDIT_DRAFT) { @@ -357,75 +343,6 @@ public class SupProductController { } -// if (supProductEntity.getAuditStatus() == ConstantStatus.AUDIT_PASS) { -// SupProductResponse supProductResponse = supProductService.findJoinRegistration(supProductEntity.getId()); -// -// //步骤1：先添加到主系统第三方产品信息； -// BasicThirdSysEntity basicThirdSysEntity = basicThirdSysService.selectMainThrSys(); -// ThrProductsEntity thrProductsEntity = new ThrProductsEntity(); -// thrProductsEntity.setCode(gennerOrderUtils.getRelId() + ""); -// thrProductsEntity.setThirdSys(basicThirdSysEntity.getThirdId()); -// thrProductsEntity.setThirdSysFk(basicThirdSysEntity.getThirdId()); -// thrProductsEntity.setName(supProductEntity.getRecordProductName()); -// thrProductsEntity.setSpec(supProductEntity.getSpecification()); -// thrProductsEntity.setStandard(supProductEntity.getSpecification()); -// thrProductsEntity.setManufactory(supProductResponse.getManufacturerName()); -// thrProductsService.insertThrProducts(thrProductsEntity); -// -// -// //步骤2：添加到关联表 -// String uuid = CustomUtil.getUUId(); -// UdiRelevanceEntity udiRelevanceEntity = new UdiRelevanceEntity(); -// udiRelevanceEntity.setThirdId(thrProductsEntity.getCode()); -// udiRelevanceEntity.setThirdName(thrProductsEntity.getName()); -// udiRelevanceEntity.setMainId(thrProductsEntity.getCode()); -// udiRelevanceEntity.setMainName(thrProductsEntity.getName()); -// udiRelevanceEntity.setMeasname(thrProductsEntity.getMeasname()); -// String time = DateUtil.getDateTime(); -// udiRelevanceEntity.setUpdateTime(time); -// udiRelevanceEntity.setModifyTime(time); -// udiRelevanceEntity.setUuid(uuid); -// udiRelevanceEntity.setManufactory(supProductResponse.getManufacturerName()); -// udiRelevanceEntity.setSupName(supProductResponse.getSupName()); -// udiRelevanceEntity.setId(gennerOrderUtils.getRelId() + ""); -// udiRelevanceService.insertUdiRelevance(udiRelevanceEntity); -// -// -// //步骤3：添加基础信息表 -// UdiInfoEntity udiInfoEntity = new UdiInfoEntity(); -// udiInfoEntity.setNameCode(thrProductsEntity.getCode()); -// udiInfoEntity.setCpmctymc(thrProductsEntity.getName()); -// udiInfoEntity.setManufactory(thrProductsEntity.getManufactory()); -// udiInfoEntity.setYlqxzcrbarmc(supProductEntity.getRecordPeopleName()); -// udiInfoEntity.setGgxh(thrProductsEntity.getSpec()); -// udiInfoEntity.setZczbhhzbapzbh(supProductEntity.getRecordCode()); -// udiInfoEntity.setUuid(udiRelevanceEntity.getUuid()); -// udiInfoEntity.setProductType(ConstantStatus.PRODUCT_TYPE_THIRD); -// udiInfoEntity.setDiType(1); -// udiInfoEntity.setScbssfbhph("是"); -// udiInfoEntity.setScbssfbhscrq("是"); -// udiInfoEntity.setScbssfbhsxrq("是"); -// udiInfoEntity.setScbssfbhxlh("否"); -// udiInfoEntity = UdiInfoUtil.initUdiInfoEntity(udiInfoEntity); -// udiInfoService.insertUdiInfo(udiInfoEntity); -// -// -// //步骤4：添加供应商关联表 -// CompanyProductRelevanceEntity companyProductRelevanceEntity = new CompanyProductRelevanceEntity(); -// companyProductRelevanceEntity.setCreate_time(new Date()); -// companyProductRelevanceEntity.setUpdate_time(new Date()); -// companyProductRelevanceEntity.setAuditStatus("3"); -// companyProductRelevanceEntity.setUnitFk(supProductResponse.getCustomerId()); -// companyProductRelevanceEntity.setUdiRlIdFk(udiRelevanceEntity.getId()); -// companyProductRelevanceEntity.setCustomerId(supProductResponse.getCustomerId()); -// companyProductRelevanceEntity.setProductId(supProductEntity.getProductId()); -// companyProductRelevanceEntity.setRegistrationId(supProductEntity.getProductId()); -// companyProductRelevanceEntity.setEnterpriseId(supProductEntity.getManufacturerIdFk()); -// companyProductRelevanceService.insertCompanyProductRelevance(companyProductRelevanceEntity); -// -// -// } - if (b) { return ResultVOUtils.success("审核通过！"); } else { diff --git a/src/main/java/com/glxp/api/controller/sync/SyncDataSetController.java b/src/main/java/com/glxp/api/controller/sync/SyncDataSetController.java index 6b1dfa3b4..51c58146a 100644 --- a/src/main/java/com/glxp/api/controller/sync/SyncDataSetController.java +++ b/src/main/java/com/glxp/api/controller/sync/SyncDataSetController.java @@ -106,8 +106,6 @@ public class SyncDataSetController { return ResultVOUtils.error(ResultEnum.NOT_NETWORK); } - //todo 请立即同步至UDI管理系统 - BaseResponse baseResponse = spGetHttpClient.updateSynsSet(syncDataSetResponse); if (baseResponse.getCode() == 20000) { return baseResponse; diff --git a/src/main/java/com/glxp/api/controller/system/ClassifyCodeController.java b/src/main/java/com/glxp/api/controller/system/ClassifyCodeController.java index 44cac19cb..7ce3e5545 100644 --- a/src/main/java/com/glxp/api/controller/system/ClassifyCodeController.java +++ b/src/main/java/com/glxp/api/controller/system/ClassifyCodeController.java @@ -22,8 +22,7 @@ public class ClassifyCodeController { @GetMapping("spms/classify/code/filter") public BaseResponse filterList(FilterClassifyCodeRequest filterDeviceKeyRequest) { List classifyCodeEntities = classifyCodeService.filteClassifyCode(filterDeviceKeyRequest); - PageInfo pageInfo; - pageInfo = new PageInfo<>(classifyCodeEntities); + PageInfo pageInfo = new PageInfo<>(classifyCodeEntities); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(classifyCodeEntities); diff --git a/src/main/java/com/glxp/api/controller/system/DeviceKeyController.java b/src/main/java/com/glxp/api/controller/system/DeviceKeyController.java index 792c2ba40..9366a0c1a 100644 --- a/src/main/java/com/glxp/api/controller/system/DeviceKeyController.java +++ b/src/main/java/com/glxp/api/controller/system/DeviceKeyController.java @@ -25,20 +25,14 @@ import java.util.List; @Slf4j @RestController public class DeviceKeyController { - // @Value("${spring.mail.username}") -// private String mail; -// @Value("${toMail}") -// private String toMail; + @Resource SysPdaKeyService sysPdaKeyService; -// @Resource -// private JavaMailSender javaMailSender; @GetMapping("sale/device/registerList") public BaseResponse registerList(FilterDeviceKeyRequest filterDeviceKeyRequest) { List deviceKeyEntities = sysPdaKeyService.findDeviceKey(filterDeviceKeyRequest); - PageInfo pageInfo; - pageInfo = new PageInfo<>(deviceKeyEntities); + PageInfo pageInfo = new PageInfo<>(deviceKeyEntities); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(deviceKeyEntities); @@ -77,7 +71,6 @@ public class DeviceKeyController { @PostMapping("/sale/info/deleterKey") public BaseResponse deleterKey(@RequestBody DeleteRequest deleteRequest) { - sysPdaKeyService.deleteDeviceKey(deleteRequest); return ResultVOUtils.success("删除成功"); @@ -97,14 +90,6 @@ public class DeviceKeyController { return ResultVOUtils.success("1"); } -// public void sendMail(String title, String content, String to) { -// SimpleMailMessage message = new SimpleMailMessage(); -// message.setFrom(mail); -// message.setTo(to); -// message.setSubject(title); -// message.setText(content); -// javaMailSender.send(message); -// } public String md5(String password) { try { diff --git a/src/main/java/com/glxp/api/controller/system/SysMenuHelpController.java b/src/main/java/com/glxp/api/controller/system/SysMenuHelpController.java index 2c51b10a6..fc8d6b12e 100644 --- a/src/main/java/com/glxp/api/controller/system/SysMenuHelpController.java +++ b/src/main/java/com/glxp/api/controller/system/SysMenuHelpController.java @@ -38,7 +38,6 @@ public class SysMenuHelpController { private ISysMenuService iSysMenuService; - @AuthRuleAnnotation("system/param/help/list") @GetMapping("/system/param/help/list") public BaseResponse list(@Valid SysMenuHelpRequest sysMenuHelpRequest, @@ -48,8 +47,7 @@ public class SysMenuHelpController { } List list = sysMenuHelpService.MenuHelpList(sysMenuHelpRequest); - PageInfo pageInfo; - pageInfo = new PageInfo<>(list); + PageInfo pageInfo = new PageInfo<>(list); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(list); diff --git a/src/main/java/com/glxp/api/controller/system/SysParamConfigController.java b/src/main/java/com/glxp/api/controller/system/SysParamConfigController.java index eaec56832..1345f2972 100644 --- a/src/main/java/com/glxp/api/controller/system/SysParamConfigController.java +++ b/src/main/java/com/glxp/api/controller/system/SysParamConfigController.java @@ -87,7 +87,6 @@ public class SysParamConfigController { @AuthRuleAnnotation("system/param/config/update") @PostMapping("/system/param/config/update") public BaseResponse update(@RequestBody SysParamConfigSaveRequest sysParamConfigSaveRequest) { -// systemParamConfigSaveRequest.setId(1); systemParamConfigService.updateById(sysParamConfigSaveRequest); if (sysParamConfigSaveRequest.getParentId() == 0) { SysParamConfigSaveRequest sysParamConfigSaveRequest1 = new SysParamConfigSaveRequest(); diff --git a/src/main/java/com/glxp/api/controller/system/SysPdfModuleController.java b/src/main/java/com/glxp/api/controller/system/SysPdfModuleController.java index 5b69230e1..f95968a3d 100644 --- a/src/main/java/com/glxp/api/controller/system/SysPdfModuleController.java +++ b/src/main/java/com/glxp/api/controller/system/SysPdfModuleController.java @@ -41,8 +41,6 @@ public class SysPdfModuleController { private SystemPDFTemplateRelevanceService systemPDFTemplateRelevanceService; @Resource private SystemPDFTemplateService systemPDFTemplateService; -// @Resource -// BussinessLocalTypeService bussinessLocalTypeService; @AuthRuleAnnotation("system/pdf/module/list") @GetMapping("/system/pdf/module/list") diff --git a/src/main/java/com/glxp/api/controller/system/SysPdfTemplateController.java b/src/main/java/com/glxp/api/controller/system/SysPdfTemplateController.java index daa430e1a..579daa9f3 100644 --- a/src/main/java/com/glxp/api/controller/system/SysPdfTemplateController.java +++ b/src/main/java/com/glxp/api/controller/system/SysPdfTemplateController.java @@ -46,7 +46,6 @@ public class SysPdfTemplateController { if (bindingResult.hasErrors()) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } -// systemPDFTemplateRequest.setType(2); List systemPDFTemplateEntityList = systemPDFTemplateService.queryPage(filterPdfTemplateRequest); List systemPDFTemplateResponseList = systemPDFTemplateEntityList.stream().map(item -> { SystemPDFTemplateResponse systemPDFTemplateResponse = new SystemPDFTemplateResponse(); diff --git a/src/main/java/com/glxp/api/controller/thrsys/ForThirdSysApiController.java b/src/main/java/com/glxp/api/controller/thrsys/ForThirdSysApiController.java index f8e0bbd3e..714e11070 100644 --- a/src/main/java/com/glxp/api/controller/thrsys/ForThirdSysApiController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ForThirdSysApiController.java @@ -85,39 +85,7 @@ public class ForThirdSysApiController { if (checkUdi == null) { return ResultVOUtils.error(500, "收费项目未对照！"); } -// boolean checkSuccess = true; -// String lostMsg = ""; -// //校验条码完整性 -// if ("是".equals(checkUdi.getScbssfbhph()) && StrUtil.isEmpty(udiEntity.getBatchNo())) { -// checkSuccess = false; -// lostMsg = lostMsg + ",批次号"; -// } -// if ("是".equals(checkUdi.getScbssfbhscrq()) && StrUtil.isEmpty(udiEntity.getProduceDate())) { -// checkSuccess = false; -// lostMsg = lostMsg + ",生产日期"; -// } -// -// if ("是".equals(checkUdi.getScbssfbhsxrq()) && StrUtil.isEmpty(udiEntity.getExpireDate())) { -// checkSuccess = false; -// lostMsg = lostMsg + ",失效日期"; -// } -// -// if ("是".equals(checkUdi.getScbssfbhxlh()) && StrUtil.isEmpty(udiEntity.getSerialNo())) { -// checkSuccess = false; -// lostMsg = lostMsg + ",序列号"; -// } -// if (StrUtil.isNotEmpty(udiEntity.getSerialNo()) && udiEntity.getSerialNo().length() > 20) { -// return ResultVOUtils.error(504, "序列号超出20位！"); -// } -// if (StrUtil.isNotEmpty(udiEntity.getBatchNo()) && udiEntity.getBatchNo().length() > 20) { -// return ResultVOUtils.error(504, "批次号超出20位！"); -// } -// if (StrUtil.isEmpty(udiEntity.getSerialNo()) && StrUtil.isEmpty(udiEntity.getBatchNo())) { -// checkSuccess = false; -// } -// if (!checkSuccess) { -// return ResultVOUtils.error("UDI码格式错误：缺少" + lostMsg); -// } + IoCodeEntity codeEntity = codeService.getOne(new QueryWrapper().likeLeft("code", filterInvProductRequest.getUdiCode()).last("limit 1")); if (codeEntity == null) { codeEntity = codeService.getOne(new QueryWrapper().likeLeft("errUdiCode", filterInvProductRequest.getUdiCode()).last("limit 1")); diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThirdAliDrugController.java b/src/main/java/com/glxp/api/controller/thrsys/ThirdAliDrugController.java index fb4dad11b..f37c67fd9 100644 --- a/src/main/java/com/glxp/api/controller/thrsys/ThirdAliDrugController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThirdAliDrugController.java @@ -1,5 +1,6 @@ package com.glxp.api.controller.thrsys; +import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.github.pagehelper.PageInfo; @@ -41,12 +42,10 @@ public class ThirdAliDrugController extends BaseController { @Resource private ThirdAliDrugService thirdAliDrugService; - @Resource private AuthAliUserService authAliUserService; @Resource private UdiProductService udiProductService; - @Resource private SpGetHttpClient spGetHttpClient; @@ -57,7 +56,6 @@ public class ThirdAliDrugController extends BaseController { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } - if (StrUtil.isEmpty(thirdAliDrug.getApprovalNum()) && StrUtil.isEmpty(thirdAliDrug.getNameCode()) && StrUtil.isEmpty(thirdAliDrug.getCpmctymc()) && StrUtil.isEmpty(thirdAliDrug.getManufacturer()) ) { @@ -73,11 +71,10 @@ public class ThirdAliDrugController extends BaseController { nameCodeIn.add(udiInfoEntity.getNameCode()); } } - } thirdAliDrug.setNameCodeIn(nameCodeIn); List list = thirdAliDrugService.filterList(thirdAliDrug); - if(list == null || list.size() == 0){ + if(CollUtil.isEmpty(list)){ AuthAliUser authAliUser = authAliUserService.getOne(); AlihealthThirdAliDrugInsertReqeust alihealthThirdAliDrugInsertReqeust = new AlihealthThirdAliDrugInsertReqeust(); alihealthThirdAliDrugInsertReqeust.setErpId(authAliUser.getErpid()); @@ -95,29 +92,17 @@ public class ThirdAliDrugController extends BaseController { try { BaseResponse baseResponse = spGetHttpClient.thirdAliDrugList(alihealthThirdAliDrugInsertReqeust); if (baseResponse.getCode() == 20000) { - - if (thirdAliDrugService.addOrUpdate((List) baseResponse.getData())) { list = thirdAliDrugService.filterList(thirdAliDrug); - } else { log.info("供应商平台获取阿里和国家库码段信息===未查到产品信息"); - } - - } else { log.info("供应商平台获取阿里和国家库码段信息出现错误===" + baseResponse.getMessage()); -// udiProductEntity.setBasicPrductRemak8("供应商平台获取阿里和国家库码段信息出现错误===" + baseResponse.getMessage()); -// error = "供应商平台获取阿里和国家库码段信息出现错误===" + baseResponse.getMessage(); - - } - } catch (Exception e) { e.printStackTrace(); log.info("供应商平台获取阿里和国家库码段信息出现错误===" + e.getMessage()); - } } PageInfo pageInfo = new PageInfo<>(list); diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThirdSysApiController.java b/src/main/java/com/glxp/api/controller/thrsys/ThirdSysApiController.java index eaf10179e..d435a43ce 100644 --- a/src/main/java/com/glxp/api/controller/thrsys/ThirdSysApiController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThirdSysApiController.java @@ -25,8 +25,7 @@ public class ThirdSysApiController { @GetMapping("/sys/api/findAll") public BaseResponse findAll(FilterSysApiRequest filterSysApiRequest) { List thirdSysApiEntities = thirdSysApiService.findSysApi(filterSysApiRequest); - PageInfo pageInfo; - pageInfo = new PageInfo<>(thirdSysApiEntities); + PageInfo pageInfo = new PageInfo<>(thirdSysApiEntities); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(thirdSysApiEntities); diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThrBusTypeOriginController.java b/src/main/java/com/glxp/api/controller/thrsys/ThrBusTypeOriginController.java index d29b248f7..9fb63b0a3 100644 --- a/src/main/java/com/glxp/api/controller/thrsys/ThrBusTypeOriginController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThrBusTypeOriginController.java @@ -60,12 +60,6 @@ public class ThrBusTypeOriginController { filterThrBusTypeOriginRequest.setThirdSys(thrSystemEntity.getThirdId()); } - /** - * else if (StrUtil.isEmpty(filterThrBusTypeOriginRequest.getThirdSys())) { - * ThrSystemEntity thrSystemEntity = thrSystemService.selectMainThrSys(); - * filterThrBusTypeOriginRequest.setThirdSys(thrSystemEntity.getThirdId()); - * } - */ List thrBusTypeOriginEntityEntities = thrBusTypeOriginService.filterEnableList(filterThrBusTypeOriginRequest); PageInfo pageInfo = new PageInfo<>(thrBusTypeOriginEntityEntities); return ResultVOUtils.page(pageInfo); diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThrCorpExportLogController.java b/src/main/java/com/glxp/api/controller/thrsys/ThrCorpExportLogController.java index 4edcf5578..e99fffacf 100644 --- a/src/main/java/com/glxp/api/controller/thrsys/ThrCorpExportLogController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThrCorpExportLogController.java @@ -52,7 +52,6 @@ public class ThrCorpExportLogController { private ThrCorpService thrCorpService; @Resource ThrCorpsDlService thrCorpsDlService; - @Resource private ErpBasicClient erpBasicClient; @Resource @@ -67,8 +66,7 @@ public class ThrCorpExportLogController { } List thrCorpExportLogEntities = thrCorpExportLogService.filterThrCorpExportLog(filterThrCorpExportLogRequest); - PageInfo pageInfo; - pageInfo = new PageInfo<>(thrCorpExportLogEntities); + PageInfo pageInfo = new PageInfo<>(thrCorpExportLogEntities); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(thrCorpExportLogEntities); @@ -215,8 +213,7 @@ public class ThrCorpExportLogController { BeanUtils.copyProperties(item, thrCorpEntity); return thrCorpEntity; }).collect(Collectors.toList()); - PageInfo pageInfo; - pageInfo = new PageInfo<>(thrCorpEntityList); + PageInfo pageInfo = new PageInfo<>(thrCorpEntityList); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(thrCorpEntityList); diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThrCorpImportLogController.java b/src/main/java/com/glxp/api/controller/thrsys/ThrCorpImportLogController.java index 69e0553b7..260bbbecd 100644 --- a/src/main/java/com/glxp/api/controller/thrsys/ThrCorpImportLogController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThrCorpImportLogController.java @@ -39,8 +39,7 @@ public class ThrCorpImportLogController { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } List thrCorpImportLogEntities = thrCorpImportLogService.filterThrCorpImportLog(filterThrCorpImportLogRequest); - PageInfo pageInfo; - pageInfo = new PageInfo<>(thrCorpImportLogEntities); + PageInfo pageInfo = new PageInfo<>(thrCorpImportLogEntities); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(thrCorpImportLogEntities); @@ -56,8 +55,7 @@ public class ThrCorpImportLogController { } List thrCorpImportDetailEntities = thrCorpImportDetailService.filterCorpDetailImport(filterThrCorpImportLogRequest); - PageInfo pageInfo; - pageInfo = new PageInfo<>(thrCorpImportDetailEntities); + PageInfo pageInfo = new PageInfo<>(thrCorpImportDetailEntities); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(thrCorpImportDetailEntities); diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThrCorpsController.java b/src/main/java/com/glxp/api/controller/thrsys/ThrCorpsController.java index 91273816b..c6d58c1a4 100644 --- a/src/main/java/com/glxp/api/controller/thrsys/ThrCorpsController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThrCorpsController.java @@ -60,8 +60,7 @@ public class ThrCorpsController { } List thrCorpEntities = thrCorpService.filterThrCorps(filterThrCorpRequest); - PageInfo pageInfo; - pageInfo = new PageInfo<>(thrCorpEntities); + PageInfo pageInfo = new PageInfo<>(thrCorpEntities); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(thrCorpEntities); @@ -213,8 +212,7 @@ public class ThrCorpsController { thrCorpEntity.setId(item.getUnitId()); return thrCorpEntity; }).collect(Collectors.toList()); - PageInfo pageInfo; - pageInfo = new PageInfo<>(thrCorpEntities); + PageInfo pageInfo = new PageInfo<>(thrCorpEntities); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(thrCorpEntityList); diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThrDeptController.java b/src/main/java/com/glxp/api/controller/thrsys/ThrDeptController.java index 6ee22923c..801fb8394 100644 --- a/src/main/java/com/glxp/api/controller/thrsys/ThrDeptController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThrDeptController.java @@ -41,8 +41,7 @@ public class ThrDeptController { @GetMapping("spms/thrsys/warehouse/filter") public BaseResponse filterInvWarehouse(FilterThrDeptRequest filterThrDeptRequest) { List thrInvWarehouseEntities = thrDeptService.filterThrInvWarehouse(filterThrDeptRequest); - PageInfo pageInfo; - pageInfo = new PageInfo<>(thrInvWarehouseEntities); + PageInfo pageInfo = new PageInfo<>(thrInvWarehouseEntities); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(thrInvWarehouseEntities); @@ -152,17 +151,9 @@ public class ThrDeptController { @GetMapping("/spms/sub/inv/warehouse/filterThridInv") public BaseResponse filterInvWarehouse(FilterThrSubInvWarehouseRequest filterThrSubInvWarehouseRequest) { -// todo -// InvWarehouseEntity invWarehouseEntity = invWarehouseService.selectByCode(filterThrSubInvWarehouseRequest.getParentId()); -// Object thirdId = ReflectUtil.getFieldValue(invWarehouseEntity, filterThrSubInvWarehouseRequest.getThirdSysFk()); -// if (thirdId == null) { -// return ResultVOUtils.error(500, "请先关联仓库对应的第三方仓库，再关联分库！"); -// } -// filterThrSubInvWarehouseRequest.setParentId((String) thirdId); filterThrSubInvWarehouseRequest.setStatus(0); List thrInvWarehouseEntities = thrInvWarehouseService.selectByThrDeptCode(filterThrSubInvWarehouseRequest); - PageInfo pageInfo; - pageInfo = new PageInfo<>(thrInvWarehouseEntities); + PageInfo pageInfo = new PageInfo<>(thrInvWarehouseEntities); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(thrInvWarehouseEntities); diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThrHslbController.java b/src/main/java/com/glxp/api/controller/thrsys/ThrHslbController.java index ad155d3d5..9c07974ed 100644 --- a/src/main/java/com/glxp/api/controller/thrsys/ThrHslbController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThrHslbController.java @@ -34,8 +34,7 @@ public class ThrHslbController { } List thrHslbEntities = thrHslbService.getHslbs(filterThrHslbRequest); - PageInfo pageInfo; - pageInfo = new PageInfo<>(thrHslbEntities); + PageInfo pageInfo = new PageInfo<>(thrHslbEntities); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(thrHslbEntities); diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThrInvOrderController.java b/src/main/java/com/glxp/api/controller/thrsys/ThrInvOrderController.java index 64b3e2a11..4bb8376f2 100644 --- a/src/main/java/com/glxp/api/controller/thrsys/ThrInvOrderController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThrInvOrderController.java @@ -41,8 +41,7 @@ public class ThrInvOrderController { } List thrInvOrders = thrInvOrderService.filterThrInvOrder(filterThrInvOrderRequest); - PageInfo pageInfo; - pageInfo = new PageInfo<>(thrInvOrders); + PageInfo pageInfo = new PageInfo<>(thrInvOrders); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(thrInvOrders); @@ -59,8 +58,7 @@ public class ThrInvOrderController { } List thrInvOrderDetails = thrInvOrderDetailService.filterThrInvOrderDetails(filterThrInvOrderDetailRequest); - PageInfo pageInfo; - pageInfo = new PageInfo<>(thrInvOrderDetails); + PageInfo pageInfo = new PageInfo<>(thrInvOrderDetails); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(thrInvOrderDetails); diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThrInvProductsController.java b/src/main/java/com/glxp/api/controller/thrsys/ThrInvProductsController.java index 29bd75698..96dbf2384 100644 --- a/src/main/java/com/glxp/api/controller/thrsys/ThrInvProductsController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThrInvProductsController.java @@ -59,8 +59,7 @@ public class ThrInvProductsController { } List thrInvProductsEntities = thrInvProductsService.filterThrInvProductss(filterThrInvProductsRequest); - PageInfo pageInfo; - pageInfo = new PageInfo<>(thrInvProductsEntities); + PageInfo pageInfo = new PageInfo<>(thrInvProductsEntities); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(thrInvProductsEntities); diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThrInvProductsExportLogController.java b/src/main/java/com/glxp/api/controller/thrsys/ThrInvProductsExportLogController.java index edbf71c31..331ec5c66 100644 --- a/src/main/java/com/glxp/api/controller/thrsys/ThrInvProductsExportLogController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThrInvProductsExportLogController.java @@ -57,8 +57,7 @@ public class ThrInvProductsExportLogController { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } List thrInvProductsExportLogEntities = thrInvProductsExportLogService.filterThrInvProductsExportLog(filterThrProductsExportLogRequest); - PageInfo pageInfo; - pageInfo = new PageInfo<>(thrInvProductsExportLogEntities); + PageInfo pageInfo = new PageInfo<>(thrInvProductsExportLogEntities); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(thrInvProductsExportLogEntities); @@ -174,8 +173,7 @@ public class ThrInvProductsExportLogController { erpInvProductResponse.setName(item.getInventoryName()); return erpInvProductResponse; }).collect(Collectors.toList()); - PageInfo pageInfo; - pageInfo = new PageInfo<>(erpInvProductResponseList); + PageInfo pageInfo = new PageInfo<>(erpInvProductResponseList); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(erpInvProductResponseList); diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThrInvProductsImportLogController.java b/src/main/java/com/glxp/api/controller/thrsys/ThrInvProductsImportLogController.java index 83159b3c5..fc73a597f 100644 --- a/src/main/java/com/glxp/api/controller/thrsys/ThrInvProductsImportLogController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThrInvProductsImportLogController.java @@ -40,8 +40,7 @@ public class ThrInvProductsImportLogController { } List thrInvProductsImportLogEntities = thrInvProductsImportLogService.filterThrInvProductsImportLog(filterThrCorpImportLogRequest); - PageInfo pageInfo; - pageInfo = new PageInfo<>(thrInvProductsImportLogEntities); + PageInfo pageInfo = new PageInfo<>(thrInvProductsImportLogEntities); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(thrInvProductsImportLogEntities); @@ -57,8 +56,7 @@ public class ThrInvProductsImportLogController { } List thrInvProductsImportDetailEntities = thrInvProductsDetailService.filterInvProductsDetailImport(filterThrCorpImportLogRequest); - PageInfo pageInfo; - pageInfo = new PageInfo<>(thrInvProductsImportDetailEntities); + PageInfo pageInfo = new PageInfo<>(thrInvProductsImportDetailEntities); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(thrInvProductsImportDetailEntities); diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThrInvWarehouseController.java b/src/main/java/com/glxp/api/controller/thrsys/ThrInvWarehouseController.java index eb189a47b..06e6bbb1f 100644 --- a/src/main/java/com/glxp/api/controller/thrsys/ThrInvWarehouseController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThrInvWarehouseController.java @@ -42,8 +42,7 @@ public class ThrInvWarehouseController { for (ThrInvWarehouseEntity thrInvWarehouseEntity : thrInvWarehouseEntities) { thrInvWarehouseEntity.setParentName(thrDeptEntity.getName()); } - PageInfo pageInfo; - pageInfo = new PageInfo<>(thrInvWarehouseEntities); + PageInfo pageInfo = new PageInfo<>(thrInvWarehouseEntities); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(thrInvWarehouseEntities); diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThrManusController.java b/src/main/java/com/glxp/api/controller/thrsys/ThrManusController.java index 9eb99e055..e9a9fd258 100644 --- a/src/main/java/com/glxp/api/controller/thrsys/ThrManusController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThrManusController.java @@ -54,8 +54,7 @@ public class ThrManusController { } List thrManufacturerEntities = thrManufacturerService.filterThrManu(filterThrCorpRequest); - PageInfo pageInfo; - pageInfo = new PageInfo<>(thrManufacturerEntities); + PageInfo pageInfo = new PageInfo<>(thrManufacturerEntities); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(thrManufacturerEntities); @@ -138,8 +137,7 @@ public class ThrManusController { } List thrManufacturerEntities = thrManufacturerService.getProductTypes(basicProducstRequest); - PageInfo pageInfo; - pageInfo = new PageInfo(thrManufacturerEntities); + PageInfo pageInfo = new PageInfo<>(thrManufacturerEntities); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(thrManufacturerEntities); diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThrOrderController.java b/src/main/java/com/glxp/api/controller/thrsys/ThrOrderController.java index 764f65d25..5be44c450 100644 --- a/src/main/java/com/glxp/api/controller/thrsys/ThrOrderController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThrOrderController.java @@ -1,5 +1,6 @@ package com.glxp.api.controller.thrsys; +import cn.hutool.core.collection.CollUtil; import org.springframework.beans.BeanUtils; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.TypeReference; @@ -65,8 +66,7 @@ public class ThrOrderController { } List thrOrderEntities = thrOrderService.filterThrOrder(filterThrOrderRequest); - PageInfo pageInfo; - pageInfo = new PageInfo<>(thrOrderEntities); + PageInfo pageInfo = new PageInfo<>(thrOrderEntities); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(thrOrderEntities); @@ -83,8 +83,7 @@ public class ThrOrderController { } List thrOrderDetailEntities = thrOrderDetailService.filterThrOrderDetailDetail(filterThrOrderDetailRequest); - PageInfo pageInfo; - pageInfo = new PageInfo<>(thrOrderDetailEntities); + PageInfo pageInfo = new PageInfo<>(thrOrderDetailEntities); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(thrOrderDetailEntities); @@ -205,14 +204,11 @@ public class ThrOrderController { } String id = deleteRequest.getId(); ThrOrderEntity thrOrderEntity = thrOrderService.findById(Integer.parseInt(id)); - String msg = selectDelect(thrOrderEntity); - if (msg == null) { - boolean b = thrOrderService.deleteById(id); - thrOrderDetailService.deleteByOrderIdFk(thrOrderEntity.getBillNo() + ""); - if (b) - return ResultVOUtils.success("删除成功"); - else return ResultVOUtils.error(500, "无法删除！"); - } else return ResultVOUtils.error(500, msg); + boolean b = thrOrderService.deleteById(id); + thrOrderDetailService.deleteByOrderIdFk(thrOrderEntity.getBillNo() + ""); + if (b) + return ResultVOUtils.success("删除成功"); + else return ResultVOUtils.error(500, "无法删除！"); } @@ -231,19 +227,6 @@ public class ThrOrderController { } - public String selectDelect(ThrOrderEntity thrOrderEntity) { - FilterThrOrderRequest filterErpOrderRequest = new FilterThrOrderRequest(); - //todo 单据类型还没设计好 -// filterErpOrderRequest.setErpOrderId(thrOrderEntity.getBillNo()); -// List erpOrderEntities = myErpOrderService.filterAllMyErpOrder(filterErpOrderRequest); -// if (erpOrderEntities != null && erpOrderEntities.size() > 0) { -// return "单据" + thrOrderEntity.getBillNo() + "已于出入库单据关联，无法删除"; -// } else { -// return null; -// } - return null; - } - @AuthRuleAnnotation("") @RequestMapping("/udiwms/thrsys/order/delAll") public BaseResponse delAll() { @@ -255,11 +238,6 @@ public class ThrOrderController { @AuthRuleAnnotation("") @RequestMapping("/udiwms/thrsys/orders/downloadAll") public BaseResponse downloadAll(FilterThrOrderRequest filterThrProductsRequest) { - String data = (String) redisUtil.get(Constant.dlThrOrders); - if (false) {//(data != null && data.equals("true")) { - return ResultVOUtils.error(500, "当前任务正在下载更新业务单据信息，请稍后重试！"); - } else { - redisUtil.set(Constant.dlThrOrders, "true", 10 * 30); if (filterThrProductsRequest.getBillAction() == null) { return ResultVOUtils.error(500, "未选择业务类型！"); } @@ -278,7 +256,6 @@ public class ThrOrderController { thrOrdersDlService.importOrders(genKey, filterThrProductsRequest.getBillAction(), null); } return ResultVOUtils.success("后台开始下载更新，请稍后刷新查看"); - } } @AuthRuleAnnotation("") @@ -371,7 +348,6 @@ public class ThrOrderController { return responseBaseResponse; } - ThrSystemDetailEntity thrSystemDetailEntity = iThrBusTypeOriginService.findSysByAction(filterErpOrderRequest.getBillAction(), "orderQueryUrl"); filterErpOrderRequest.setThirdOrderFk(thrSystemDetailEntity.getThirdSysFk()); if (thrSystemDetailEntity == null || !thrSystemDetailEntity.getEnabled()) { @@ -382,14 +358,13 @@ public class ThrOrderController { return ResultVOUtils.error(500, "第三方业务单据服务未关联"); } - FilterThrOrderRequest filterThrOrderRequest = new FilterThrOrderRequest(); BeanUtils.copyProperties(filterErpOrderRequest, filterThrOrderRequest); filterThrOrderRequest.setPage(filterErpOrderRequest.getPage()); filterThrOrderRequest.setLimit(filterErpOrderRequest.getLimit()); List erpOrderResponses = new ArrayList<>(); List data = thrOrderService.filterThrOrder(filterThrOrderRequest); - if (data != null && data.size() > 0) { + if (CollUtil.isNotEmpty(data)) { for (ThrOrderEntity thrOrderEntity : data) { FilterThrOrderDetailRequest filterThrOrderDetailRequest = new FilterThrOrderDetailRequest(); filterThrOrderDetailRequest.setOrderIdFk(thrOrderEntity.getBillNo() + ""); @@ -408,13 +383,8 @@ public class ThrOrderController { erpOrderResponses.add(erpOrderResponse); } } - //todo 单据表还未设计好 -// if (thrSystemDetailEntity.getLocalAction() != null) { -// BaseResponse> loca = getLoaclData(filterErpOrderRequest); -// erpOrderResponses.addAll(loca.getData().getList()); -// } - PageInfo pageInfo; - pageInfo = new PageInfo<>(data); + + PageInfo pageInfo = new PageInfo<>(data); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(erpOrderResponses); @@ -438,7 +408,7 @@ public class ThrOrderController { List erpOrderResponses = new ArrayList<>(); List data = thrOrderService.filterThrOrder(filterThrOrderRequest); - if (data != null && data.size() > 0) { + if (CollUtil.isNotEmpty(data)) { for (ThrOrderEntity thrOrderEntity : data) { FilterThrOrderDetailRequest filterThrOrderDetailRequest = new FilterThrOrderDetailRequest(); filterThrOrderDetailRequest.setOrderIdFk(thrOrderEntity.getId() + ""); @@ -460,8 +430,7 @@ public class ThrOrderController { erpOrderResponses.add(erpOrderResponse); } } - PageInfo pageInfo; - pageInfo = new PageInfo<>(data); + PageInfo pageInfo = new PageInfo<>(data); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(erpOrderResponses); diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThrOrderExportLogController.java b/src/main/java/com/glxp/api/controller/thrsys/ThrOrderExportLogController.java index 900ecd0bf..62866bf80 100644 --- a/src/main/java/com/glxp/api/controller/thrsys/ThrOrderExportLogController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThrOrderExportLogController.java @@ -60,8 +60,7 @@ public class ThrOrderExportLogController { } List udiInfoExportLogEntities = thrOrderExportLogService.filterThrOrderExportLog(filterUdiEpLogReques); - PageInfo pageInfo; - pageInfo = new PageInfo<>(udiInfoExportLogEntities); + PageInfo pageInfo = new PageInfo<>(udiInfoExportLogEntities); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(udiInfoExportLogEntities); @@ -169,14 +168,7 @@ public class ThrOrderExportLogController { if (bindingResult.hasErrors()) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } - //todo关联表未涉及好 -// BasicThirdSysDetailEntity basicThirdSysDetailEntity = bussinessTypeService.findByActionKey(filterErpOrderRequest.getBillAction(), "orderQueryUrl"); -// if (!basicThirdSysDetailEntity.getEnabled() || basicThirdSysDetailEntity.getThirdSysFk() == null) { -// return ResultVOUtils.error(500, "第三方系统业务单据接口服务未启用"); -// } -// if (basicThirdSysDetailEntity.getValue() == null) { -// return ResultVOUtils.error(500, "业务单据查询接口未定义"); -// } + ThrSystemDetailEntity thrSystemDetailEntity=new ThrSystemDetailEntity(); if (thrSystemDetailEntity.getFromType() != null && thrSystemDetailEntity.getFromType() == 0) { return erpOrderClient.getThrOrderResponse(filterErpOrderRequest); @@ -207,8 +199,7 @@ public class ThrOrderExportLogController { erpOrderResponses.add(erpOrderResponse); } } - PageInfo pageInfo; - pageInfo = new PageInfo<>(data); + PageInfo pageInfo = new PageInfo<>(data); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(erpOrderResponses); diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThrOrderImportLogController.java b/src/main/java/com/glxp/api/controller/thrsys/ThrOrderImportLogController.java index 27b577513..21a0cb6f0 100644 --- a/src/main/java/com/glxp/api/controller/thrsys/ThrOrderImportLogController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThrOrderImportLogController.java @@ -47,8 +47,7 @@ public class ThrOrderImportLogController { } List udiInfoImportLogEntities = thrOrderImportLogService.filterThrOrderImportLog(filterThrCorpImportLogRequest); - PageInfo pageInfo; - pageInfo = new PageInfo<>(udiInfoImportLogEntities); + PageInfo pageInfo = new PageInfo<>(udiInfoImportLogEntities); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(udiInfoImportLogEntities); @@ -64,8 +63,7 @@ public class ThrOrderImportLogController { } List thrOrderImportDetailEntities = thrOrderImportDetailService.filterOrderImportDetail(filterThrCorpImportLogRequest); - PageInfo pageInfo; - pageInfo = new PageInfo<>(thrOrderImportDetailEntities); + PageInfo pageInfo = new PageInfo<>(thrOrderImportDetailEntities); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(thrOrderImportDetailEntities); @@ -194,13 +192,6 @@ public class ThrOrderImportLogController { Cell cell5 = row.getCell(4); if (cell5 != null) { cell5.setCellType(CellType.STRING); - String billType = cell5.getStringCellValue(); - //todo 表功能还未设计好 -// BussinessTypeEntity bussinessTypeEntity = bussinessTypeService.findBTByName(billType); -// if (bussinessTypeEntity != null) { -// corpImportDetailEntity.setBillType(bussinessTypeEntity.getAction()); -// } else -// corpImportDetailEntity.setBillType(billType); } diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThrProductTypeCotroller.java b/src/main/java/com/glxp/api/controller/thrsys/ThrProductTypeCotroller.java index e6b026b8b..def9965cd 100644 --- a/src/main/java/com/glxp/api/controller/thrsys/ThrProductTypeCotroller.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThrProductTypeCotroller.java @@ -37,8 +37,7 @@ public class ThrProductTypeCotroller { } List thrProductTypeEntityList = thrProductTypeService.getProductTypes(filterThrProductTypeRequest); - PageInfo pageInfo; - pageInfo = new PageInfo(thrProductTypeEntityList); + PageInfo pageInfo = new PageInfo<>(thrProductTypeEntityList); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(thrProductTypeEntityList); diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThrProductsController.java b/src/main/java/com/glxp/api/controller/thrsys/ThrProductsController.java index e49c3b181..0e6d7651d 100644 --- a/src/main/java/com/glxp/api/controller/thrsys/ThrProductsController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThrProductsController.java @@ -81,12 +81,8 @@ public class ThrProductsController { BaseResponse> udiDlDeviceResponse = erpBasicClient.getErpProducts(filterThrProductsRequest); return udiDlDeviceResponse; } else { -// if (filterThrProductsRequest.getProductType() == null) { -// filterThrProductsRequest.setProductType(1); -// } List thrCorpEntities = thrProductsService.filterJoinThrProducts(filterThrProductsRequest); - PageInfo pageInfo; - pageInfo = new PageInfo<>(thrCorpEntities); + PageInfo pageInfo = new PageInfo<>(thrCorpEntities); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(thrCorpEntities); @@ -120,26 +116,6 @@ public class ThrProductsController { //删除产品信息 public String selectDetale(String id) { - ThrProductsEntity thrProductsEntity = thrProductsService.selectById(id); - //todo 耗材字典未设计好 -// if (thrProductsEntity != null) { -// FilterUdiInfoRequest filterUdiInfoRequest = new FilterUdiInfoRequest(); -// if ("thirdId".equals(thrProductsEntity.getThirdSysFk())) { -// filterUdiInfoRequest.setThirdId(thrProductsEntity.getCode()); -// } else if ("thirdId1".equals(thrProductsEntity.getThirdSysFk())) { -// filterUdiInfoRequest.setThirdId(thrProductsEntity.getCode()); -// } else if ("thirdId2".equals(thrProductsEntity.getThirdSysFk())) { -// filterUdiInfoRequest.setThirdId(thrProductsEntity.getCode()); -// } else if ("thirdId3".equals(thrProductsEntity.getThirdSysFk())) { -// filterUdiInfoRequest.setThirdId(thrProductsEntity.getCode()); -// } else if ("thirdId4".equals(thrProductsEntity.getThirdSysFk())) { -// filterUdiInfoRequest.setThirdId(thrProductsEntity.getCode()); -// } -// List udiRelevanceResponses = udiRelevanceService.filterUdiRelevance(filterUdiInfoRequest); -// if (udiRelevanceResponses != null && udiRelevanceResponses.size() > 0) { -// return "改产品已被选入耗材字典请先移除！"; -// } -// } boolean b = thrProductsService.deleteById(id); if (b) return null; @@ -171,14 +147,6 @@ public class ThrProductsController { } return ResultVOUtils.error(999, "数据已存在!"); - -// //新增主系统产品信息直接加到耗材字典里 -// BasicThirdSysEntity basicThirdSysEntity = basicThirdSysService.selectMainThrSys(); -// if (basicThirdSysEntity.getThirdId().equals(thrProductsEntity.getThirdSysFk())) -// if (!udiContrastService.isExit(null, thrProductsEntity.getCode(), null)) { -// udiContrastService.createOnlyMainId(thrProductsEntity.getCode()); -// } - } @Resource @@ -321,9 +289,6 @@ public class ThrProductsController { if (null == udiRelevanceResponse) { return ResultVOUtils.error(500, "参数不能为空"); } -// if (!IntUtil.value(udiRelevanceResponse.getNewNeedUpload()) ) { -// return ResultVOUtils.error(500, "产品未关联DI"); -// } return thrProductsService.postThrProduct(udiRelevanceResponse, "thirdId"); } diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThrProductsExportLogController.java b/src/main/java/com/glxp/api/controller/thrsys/ThrProductsExportLogController.java index 5f713f759..116261b67 100644 --- a/src/main/java/com/glxp/api/controller/thrsys/ThrProductsExportLogController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThrProductsExportLogController.java @@ -61,8 +61,7 @@ public class ThrProductsExportLogController { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } List thrProductsExportLogEntities = thrProductsExportLogService.filterThrProductsExportLog(filterThrProductsExportLogRequest); - PageInfo pageInfo; - pageInfo = new PageInfo<>(thrProductsExportLogEntities); + PageInfo pageInfo = new PageInfo<>(thrProductsExportLogEntities); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(thrProductsExportLogEntities); @@ -123,8 +122,6 @@ public class ThrProductsExportLogController { FilterThrProductsRequest filterThrProductsRequest = new FilterThrProductsRequest(); filterThrProductsRequest.setThirdSysFk(thrProductsExportRequest.getThirdSys()); filterThrProductsRequest.setThirdSys(thrProductsExportRequest.getThirdSys()); - //List thrProductsEntities = thrProductsService.filterThrProducts1(filterThrProductsRequest); - //thrProductsExportRequest.setThrProductsEntities(thrProductsEntities); thrProductsExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_PROCESS); String genKey = CustomUtil.getId(); String fileName = "D:\\udiwms\\exportFile\\" + "第三方产品信息" + genKey + ".UpperIn"; @@ -148,7 +145,6 @@ public class ThrProductsExportLogController { thrProductsExportLogEntity.setCreateTime(new Date()); thrProductsExportLogEntity.setRemark("本次导出数据" + thrProductsEntityList.size() + "条"); thrProductsExportLogService.insertThrProductsExportLog(thrProductsExportLogEntity); - //thrProductsDlService.genExcel(genKey, thrProductsExportRequest); //修改为导出json文件 thrProductsDlService.genJsonFile(genKey, thrProductsExportRequest); @@ -187,7 +183,6 @@ public class ThrProductsExportLogController { thrProductsExportLogEntity.setCreateTime(new Date()); thrProductsExportLogEntity.setRemark("本次导出数据" + thrProductsEntityList.size() + "条"); thrProductsExportLogService.insertThrProductsExportLog(thrProductsExportLogEntity); - //thrProductsDlService.genExcel(genKey, thrProductsExportRequest); //修改为导出json文件 thrProductsDlService.genJsonFile(genKey, thrProductsExportRequest); @@ -239,8 +234,7 @@ public class ThrProductsExportLogController { FilterThrProductsRequest filterThrProductsRequest1 = new FilterThrProductsRequest(); BeanUtils.copyProperties(filterThrProductsRequest, filterThrProductsRequest1); List thrCorpEntities = thrProductsService.filterJoinThrProducts(filterThrProductsRequest); - PageInfo pageInfo; - pageInfo = new PageInfo<>(thrCorpEntities); + PageInfo pageInfo = new PageInfo<>(thrCorpEntities); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(thrCorpEntities); diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThrProductsImportLogController.java b/src/main/java/com/glxp/api/controller/thrsys/ThrProductsImportLogController.java index d78e85569..a2b4fe93b 100644 --- a/src/main/java/com/glxp/api/controller/thrsys/ThrProductsImportLogController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThrProductsImportLogController.java @@ -40,8 +40,7 @@ public class ThrProductsImportLogController { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } List thrProductsImportLogEntities = thrProductsImportLogService.filterThrPorductsImportLog(filterThrProductsImportLogRequest); - PageInfo pageInfo; - pageInfo = new PageInfo<>(thrProductsImportLogEntities); + PageInfo pageInfo = new PageInfo<>(thrProductsImportLogEntities); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(thrProductsImportLogEntities); @@ -56,8 +55,7 @@ public class ThrProductsImportLogController { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } List thrProductsImportDetailEntities = thrProductsImportDetailService.filterProductsDetailImport(filterThrProductsImportLogRequest); - PageInfo pageInfo; - pageInfo = new PageInfo<>(thrProductsImportDetailEntities); + PageInfo pageInfo = new PageInfo<>(thrProductsImportDetailEntities); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(thrProductsImportDetailEntities); diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThrSystemController.java b/src/main/java/com/glxp/api/controller/thrsys/ThrSystemController.java index 1c8f55d11..48a62382b 100644 --- a/src/main/java/com/glxp/api/controller/thrsys/ThrSystemController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThrSystemController.java @@ -40,10 +40,6 @@ public class ThrSystemController { private ThrSystemService thrSystemService; @Resource private ThrSystemDetailService thrSystemDetailService; - // @Resource -// UdiRelevanceService udiRelevanceService; -// @Resource -// UnitMaintainService unitMaintainService; @Resource ThrSystemBusApiService thrSystemBusApiService; @Resource @@ -61,8 +57,7 @@ public class ThrSystemController { basicThirdSysEntities = thrSystemService.filterBasicThiSys(filterBasicThirdSysRequest); - PageInfo pageInfo; - pageInfo = new PageInfo<>(basicThirdSysEntities); + PageInfo pageInfo = new PageInfo<>(basicThirdSysEntities); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(basicThirdSysEntities); @@ -141,20 +136,6 @@ public class ThrSystemController { return ResultVOUtils.error(500, "主系统必须启用"); } - //todo 耗材字典还未完成 -// if (!temp.getMainSys().equals(basicThirdSysEntity.getMainSys())) { -// if (udiRelevanceService.isExit() || unitMaintainService.isExit()) { -// return ResultVOUtils.error(999, "产品信息已经关联，无法取消主系统！"); -// } -// if ((!temp.getEnabled()) && basicThirdSysEntity.getMainSys()) { -// if (!basicThirdSysEntity.getEnabled()) { -// return ResultVOUtils.error(999, "请先启用系统！"); -// } -// } -// if (!basicThirdSysEntity.getEnabled() && basicThirdSysEntity.getMainSys()) { -// return ResultVOUtils.error(999, "请先启用系统！"); -// } -// } if (thrSystemEntity.getMainSys()) { List basicThirdSysEntities = thrSystemService.filterBasicThiSys(new FilterBasicThirdSysRequest()); for (ThrSystemEntity thrSystemEntity1 : basicThirdSysEntities) { @@ -179,8 +160,7 @@ public class ThrSystemController { } List basicThirdSysEntities; basicThirdSysEntities = thrSystemDetailService.filterBasicThirdSysDetail(filterBasicThirdSysDetailRequest); - PageInfo pageInfo; - pageInfo = new PageInfo<>(basicThirdSysEntities); + PageInfo pageInfo = new PageInfo<>(basicThirdSysEntities); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(basicThirdSysEntities); @@ -237,8 +217,7 @@ public class ThrSystemController { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } List basicThirdSysEntities = thrSystemBusApiService.filterSysBusApi(filterBasicThirdSysDetailRequest); - PageInfo pageInfo; - pageInfo = new PageInfo<>(basicThirdSysEntities); + PageInfo pageInfo = new PageInfo<>(basicThirdSysEntities); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(basicThirdSysEntities); From d5d05916a3951f0cbdc446f6d43d578b0d71dbf0 Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Fri, 7 Mar 2025 11:18:12 +0800 Subject: [PATCH 3/7] =?UTF-8?q?3/7=20=E7=8E=B0=E5=9C=BA=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=8D=95=E6=8D=AE=20=E5=A2=9E=E5=8A=A0=E7=B4=A2=E5=BC=951.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/schemas/schema_v2.4.sql | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/main/resources/schemas/schema_v2.4.sql b/src/main/resources/schemas/schema_v2.4.sql index 4c5c77e8d..96d6c3843 100644 --- a/src/main/resources/schemas/schema_v2.4.sql +++ b/src/main/resources/schemas/schema_v2.4.sql @@ -5275,3 +5275,12 @@ call Modify_UNIQUE_index('io_code_temp', 'code', 'idex_code_temp_query', 'BTREE' CALL Modify_index('io_order_detail_code', 'orderIdFk', 'idex_query_orderIdFk', 'BTREE'); CALL Modify_index('io_order_detail_biz', 'orderIdFk', 'idex_query_orderIdFk', 'BTREE'); +CALL Modify_index('io_collect_order_origin', 'busType', 'idex_origin_query', 'BTREE'); + +CALL Modify_UNIQUE_index('io_collect_order', 'billNo', 'idex_collect_billNo', 'BTREE'); +CALL Modify_index('io_collect_order', 'busType', 'idex_collect_busType', 'BTREE'); +CALL Modify_index('io_collect_order', 'workPlaceCode', 'idex_collect_workPlaceCode', 'BTREE'); + +CALL Modify_UNIQUE_index('io_collect_order_backup', 'billNo', 'idex_backup_billNo', 'BTREE'); +CALL Modify_index('io_collect_order_backup', 'busType', 'idex_backup_busType', 'BTREE'); +CALL Modify_index('io_collect_order_backup', 'workPlaceCode', 'idex_backup_workPlaceCode', 'BTREE'); From 9cb19e86676c8a11e4a5bf7dd8cd43a2db55b14e Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Fri, 7 Mar 2025 11:45:54 +0800 Subject: [PATCH 4/7] =?UTF-8?q?3/7=20=E7=8E=B0=E5=9C=BA=E7=AE=A1=E7=90=86?= =?UTF-8?q?=20-=20=E6=8B=86=E9=9B=B6=20=E5=BA=93=E5=AD=98=20=E7=B4=A2?= =?UTF-8?q?=E5=BC=95=E4=BC=98=E5=8C=961.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/mybatis/mapper/inout/IoSplitFifoCodeMapper.xml | 2 +- src/main/resources/schemas/schema_v2.4.sql | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/resources/mybatis/mapper/inout/IoSplitFifoCodeMapper.xml b/src/main/resources/mybatis/mapper/inout/IoSplitFifoCodeMapper.xml index 7fdc0185f..1ac2ec043 100644 --- a/src/main/resources/mybatis/mapper/inout/IoSplitFifoCodeMapper.xml +++ b/src/main/resources/mybatis/mapper/inout/IoSplitFifoCodeMapper.xml @@ -77,7 +77,7 @@ LEFT JOIN basic_products bp ON bu.uuid = bp.uuid - AND code LIKE #{code} + AND code = #{code} AND relId = #{relId} diff --git a/src/main/resources/schemas/schema_v2.4.sql b/src/main/resources/schemas/schema_v2.4.sql index 96d6c3843..5ec31a935 100644 --- a/src/main/resources/schemas/schema_v2.4.sql +++ b/src/main/resources/schemas/schema_v2.4.sql @@ -5284,3 +5284,7 @@ CALL Modify_index('io_collect_order', 'workPlaceCode', 'idex_collect_workPlaceCo CALL Modify_UNIQUE_index('io_collect_order_backup', 'billNo', 'idex_backup_billNo', 'BTREE'); CALL Modify_index('io_collect_order_backup', 'busType', 'idex_backup_busType', 'BTREE'); CALL Modify_index('io_collect_order_backup', 'workPlaceCode', 'idex_backup_workPlaceCode', 'BTREE'); + +CALL Modify_UNIQUE_index('io_split_fifo_code', 'code', 'idex_fifo_code', 'BTREE'); +CALL Modify_UNIQUE_index('io_split_code', 'code', 'idex_split_code', 'BTREE'); +CALL Modify_index('io_split_code', 'workPlaceCode', 'idex_split_workPlaceCode', 'BTREE'); From 828704f29bdff28ff83bb0ed76e87a49793df860 Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Fri, 7 Mar 2025 14:12:55 +0800 Subject: [PATCH 5/7] =?UTF-8?q?3/7=20=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=811?= =?UTF-8?q?.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/glxp/api/dao/auth/AuthAdminDao.java | 3 - .../java/com/glxp/api/dao/auth/DeptDao.java | 26 -- .../com/glxp/api/dao/auth/DeptUserDao.java | 2 - .../com/glxp/api/dao/auth/SysPdaKeyDao.java | 2 - .../dao/auth/WarehouseBussinessTypeDao.java | 1 - .../glxp/api/dao/auth/WarehouseUserDao.java | 17 - .../com/glxp/api/dao/basic/BasicCorpDao.java | 5 - .../basic/BasicProductsImportDetailDao.java | 1 - .../dao/basic/CompanyProductRelevanceDao.java | 1 - .../glxp/api/dao/basic/EntrustReceDao.java | 1 - .../glxp/api/dao/basic/ProductInfoDao.java | 21 - .../dao/basic/SysWorkplaceQueueMapper.java | 2 - .../com/glxp/api/dao/basic/UdiCompanyDao.java | 6 - .../com/glxp/api/dao/basic/UdiProductDao.java | 2 - .../glxp/api/dao/basic/UdiRelevanceDao.java | 21 - .../com/glxp/api/dao/basic/UdiRlSupDao.java | 12 - .../mybatis/mapper/auth/AuthAdminDao.xml | 65 --- .../resources/mybatis/mapper/auth/DeptDao.xml | 21 - .../mybatis/mapper/auth/DeptUserDao.xml | 11 - .../mapper/auth/WarehouseBussinessTypeDao.xml | 6 - .../mybatis/mapper/auth/WarehouseUserDao.xml | 30 -- .../mybatis/mapper/basic/BasicCorpDao.xml | 53 --- .../basic/BasicProductsImportDetailDao.xml | 17 +- .../basic/CompanyProductRelevanceDao.xml | 8 - .../mybatis/mapper/basic/EntrustReceDao.xml | 22 - .../mybatis/mapper/basic/ProductInfoDao.xml | 400 ------------------ .../mapper/basic/SysWorkplaceQueueMapper.xml | 23 - .../mybatis/mapper/basic/UdiCompanyDao.xml | 40 -- .../mybatis/mapper/basic/UdiProductDao.xml | 103 ----- .../mybatis/mapper/basic/UdiRelevanceDao.xml | 61 --- .../mybatis/mapper/basic/UdiRlSupDao.xml | 28 -- .../mybatis/mapper/system/SysPdaKeyDao.xml | 36 -- 32 files changed, 1 insertion(+), 1046 deletions(-) diff --git a/src/main/java/com/glxp/api/dao/auth/AuthAdminDao.java b/src/main/java/com/glxp/api/dao/auth/AuthAdminDao.java index c26f286f5..21aab6a29 100644 --- a/src/main/java/com/glxp/api/dao/auth/AuthAdminDao.java +++ b/src/main/java/com/glxp/api/dao/auth/AuthAdminDao.java @@ -87,7 +87,4 @@ public interface AuthAdminDao extends BaseMapperPlus companyUserList(@Param("param")FilterInvLinkDataRequest filterInvLinkDataRequest); - List getUserByIds(@Param("userIds") List ids,@Param("key") String key); - - List getDepts(FilterAuthUserRequest filterAuthUserRequest); } diff --git a/src/main/java/com/glxp/api/dao/auth/DeptDao.java b/src/main/java/com/glxp/api/dao/auth/DeptDao.java index 5ce6b2216..e348cac42 100644 --- a/src/main/java/com/glxp/api/dao/auth/DeptDao.java +++ b/src/main/java/com/glxp/api/dao/auth/DeptDao.java @@ -32,36 +32,10 @@ public interface DeptDao extends BaseMapperPlus Long getIdByCode(@Param("fromCorpId") Long fromCorpId); - - /** - * 批量导入仓库信息 - * - * @param invWarehouseEntities - */ - void importInvWarehouse(@Param("invWarehouseEntities") List invWarehouseEntities); - - /** - * 更新第三方仓库ID - * - * @param id - * @param thridWarehouseId - * @param sysId - * @return - */ - boolean updateThridId(@Param("id") String id, @Param("thridWarehouseId") String thridWarehouseId, @Param("sysId") String sysId); - boolean updateTime(@Param("code") String code, @Param("updateTime") Date updateTime); - List getDeptById(@Param("ids") List ids); - List selectByPcode(@Param("pcode") String pcode); - - /** - * 根据code查询* - */ - DeptEntity selectByCodeAll(@Param("code") String code); - /** * 根据编码查询部门名称 * diff --git a/src/main/java/com/glxp/api/dao/auth/DeptUserDao.java b/src/main/java/com/glxp/api/dao/auth/DeptUserDao.java index 80054e875..513c7145d 100644 --- a/src/main/java/com/glxp/api/dao/auth/DeptUserDao.java +++ b/src/main/java/com/glxp/api/dao/auth/DeptUserDao.java @@ -25,8 +25,6 @@ public interface DeptUserDao extends BaseMapperPlus ids); - int insertBatch(List list); diff --git a/src/main/java/com/glxp/api/dao/auth/SysPdaKeyDao.java b/src/main/java/com/glxp/api/dao/auth/SysPdaKeyDao.java index 397f9015b..bc38f2e87 100644 --- a/src/main/java/com/glxp/api/dao/auth/SysPdaKeyDao.java +++ b/src/main/java/com/glxp/api/dao/auth/SysPdaKeyDao.java @@ -17,8 +17,6 @@ public interface SysPdaKeyDao { void updateDeviceKey(SysPdaKeyEntity sysPdaKeyEntity); - void updateDeviceKeyByImei(SysPdaKeyEntity sysPdaKeyEntity); - void deleteDeviceKey(DeleteRequest deleteRequest); } diff --git a/src/main/java/com/glxp/api/dao/auth/WarehouseBussinessTypeDao.java b/src/main/java/com/glxp/api/dao/auth/WarehouseBussinessTypeDao.java index 3a125db56..49de57bdd 100644 --- a/src/main/java/com/glxp/api/dao/auth/WarehouseBussinessTypeDao.java +++ b/src/main/java/com/glxp/api/dao/auth/WarehouseBussinessTypeDao.java @@ -12,7 +12,6 @@ import java.util.List; @Mapper public interface WarehouseBussinessTypeDao extends BaseMapperPlus { - int deleteByPrimaryKey(Integer id); List selectListByCode(@Param("code") String code); diff --git a/src/main/java/com/glxp/api/dao/auth/WarehouseUserDao.java b/src/main/java/com/glxp/api/dao/auth/WarehouseUserDao.java index 599cb6909..916b78bf5 100644 --- a/src/main/java/com/glxp/api/dao/auth/WarehouseUserDao.java +++ b/src/main/java/com/glxp/api/dao/auth/WarehouseUserDao.java @@ -18,33 +18,16 @@ public interface WarehouseUserDao extends BaseMapperPlus selectListByCode(@Param("code") String code); List selectListkey(FilterInvLinkDataRequest filterInvLinkDataRequest); - List selectNotSelectUserid(@Param("userIds") List userIds); List selectCodeByUser(@Param("userId") String userId); void deleteByCode(@Param("code") String code); - /** - * 更新此仓库下的主管状态 - * - * @param code - * @param isDirector - */ - void updateDirector(@Param("code") String code, @Param("isDirector") int isDirector); - - /** - * 根据id更新主管状态 - * - * @param id - * @param isDirector - */ - void updateDirectorById(@Param("id") Long id, @Param("isDirector") int isDirector); /** * 根据分仓编码统计绑定的用户数 diff --git a/src/main/java/com/glxp/api/dao/basic/BasicCorpDao.java b/src/main/java/com/glxp/api/dao/basic/BasicCorpDao.java index c553a099c..b4f73c061 100644 --- a/src/main/java/com/glxp/api/dao/basic/BasicCorpDao.java +++ b/src/main/java/com/glxp/api/dao/basic/BasicCorpDao.java @@ -15,7 +15,6 @@ public interface BasicCorpDao extends BaseMapperPlus filterList(BasicUnitMaintainFilterRequest basicUnitMaintainFilterRequest); List filterList2(BasicUnitMaintainFilterRequest basicUnitMaintainFilterRequest); - boolean insertBasicUnitMaintain(BasicCorpEntity basicUnitMaintainEntity); boolean insertThrUnitMaintainignore(BasicCorpEntity thrUnitMaintainResponse); @@ -27,10 +26,6 @@ public interface BasicCorpDao extends BaseMapperPlus batchSelectByIds(@Param("ids") List id); - - List batchSelectByErpIds(@Param("erpIds") List erpIds); - BasicCorpEntity selectByName(@Param("name") String name); diff --git a/src/main/java/com/glxp/api/dao/basic/BasicProductsImportDetailDao.java b/src/main/java/com/glxp/api/dao/basic/BasicProductsImportDetailDao.java index 6e2d65c11..04aacb2c0 100644 --- a/src/main/java/com/glxp/api/dao/basic/BasicProductsImportDetailDao.java +++ b/src/main/java/com/glxp/api/dao/basic/BasicProductsImportDetailDao.java @@ -17,7 +17,6 @@ public interface BasicProductsImportDetailDao { boolean updateUdiInfoImport(BasicProductsImportDetailEntity udiInfoImportEntity); - boolean insertUdiInfoImports(@Param("udiInfos") List udiInfos); boolean deleteById(@Param("id") String id); diff --git a/src/main/java/com/glxp/api/dao/basic/CompanyProductRelevanceDao.java b/src/main/java/com/glxp/api/dao/basic/CompanyProductRelevanceDao.java index ce3f28619..e6c39113f 100644 --- a/src/main/java/com/glxp/api/dao/basic/CompanyProductRelevanceDao.java +++ b/src/main/java/com/glxp/api/dao/basic/CompanyProductRelevanceDao.java @@ -18,6 +18,5 @@ public interface CompanyProductRelevanceDao extends BaseMapperPlus filterProductGroup(ProductInfoFilterRequest productInfoFilterRequest); - List filterCpmctymc(ProductInfoFilterRequest productInfoFilterRequest); - - List filterUdiByTyshxydm(ProductInfoFilterRequest productInfoFilterRequest); - - List filterUdiByCreditNo(ProductInfoFilterRequest productInfoFilterRequest); - - List filterUdiByNewest(ProductInfoFilterRequest productInfoFilterRequest); - - List selectByUpdateTime(@Param("startDate") String startDate, @Param("endDate") String endDate);//按更新时间查询 - boolean insertProductInfo(ProductInfoEntity productInfoEntity); boolean insertProductInfos(@Param("datas") List productInfoEntity); @@ -34,16 +24,8 @@ public interface ProductInfoDao extends BaseMapperPlus ids); - boolean updateProductInfo(ProductInfoEntity productInfoEntity); - - boolean updateProductByUuid(ProductInfoEntity productInfoEntity); - - List selectByUuid(@Param("uuid") String uuid); - List filterUdi(ProductInfoFilterRequest productInfoFilterRequest); - - List filterUdiNoPage(ProductInfoFilterRequest productInfoFilterRequest); Long filterUdiNoPageCount(ProductInfoFilterRequest productInfoFilterRequest); @@ -51,9 +33,6 @@ public interface ProductInfoDao extends BaseMapperPlus syncDlUdi(ProductInfoFilterRequest productInfoFilterRequest); - List filterUuidByCreditNo(ProductInfoFilterRequest productInfoFilterRequest); - - List selectAllByUuid(@Param("ids") List ids); } diff --git a/src/main/java/com/glxp/api/dao/basic/SysWorkplaceQueueMapper.java b/src/main/java/com/glxp/api/dao/basic/SysWorkplaceQueueMapper.java index 690a46910..ba4853eb8 100644 --- a/src/main/java/com/glxp/api/dao/basic/SysWorkplaceQueueMapper.java +++ b/src/main/java/com/glxp/api/dao/basic/SysWorkplaceQueueMapper.java @@ -18,8 +18,6 @@ public interface SysWorkplaceQueueMapper extends BaseMapper { List filterList(SysWorkplaceQueueRequest request); List filterBindList(SysWorkplaceQueueRequest request); - Integer selectMaxGrid(@Param("freightCode") String freightCode,@Param("layer") Integer layer); - String selectMaxCode(String layerCode); SysWorkplaceQueue selectByLayerCode(String layerCode); diff --git a/src/main/java/com/glxp/api/dao/basic/UdiCompanyDao.java b/src/main/java/com/glxp/api/dao/basic/UdiCompanyDao.java index d1494f8e6..c4798cd48 100644 --- a/src/main/java/com/glxp/api/dao/basic/UdiCompanyDao.java +++ b/src/main/java/com/glxp/api/dao/basic/UdiCompanyDao.java @@ -10,20 +10,14 @@ import java.util.List; @Mapper public interface UdiCompanyDao { - List selectAllTyshxyh(); - List filterUdiCompany(UdiCompanyRequest udiCompanyRequest); boolean insertUdiCompany(UdiCompanyEntity udiCompanyEntity); - boolean insertUdiCompanys(@Param("udiCompanyEntities") List udiCompanyEntities); - boolean deleteById(@Param("id") String id); boolean deleteAll(@Param("ids") List ids); - boolean updateUdiCompany(UdiCompanyEntity udiCompanyEntity); - List syncDlCompany(UdiCompanyRequest udiCompanyRequest); } diff --git a/src/main/java/com/glxp/api/dao/basic/UdiProductDao.java b/src/main/java/com/glxp/api/dao/basic/UdiProductDao.java index 0c3fbaea5..8a8c2ddb5 100644 --- a/src/main/java/com/glxp/api/dao/basic/UdiProductDao.java +++ b/src/main/java/com/glxp/api/dao/basic/UdiProductDao.java @@ -55,8 +55,6 @@ public interface UdiProductDao extends BaseMapperPlus batchSelectByUuid(@Param("uuids") List uuids); - List filterUdiInfo2(FilterUdiRelRequest filterUdiRelRequest); - UdiRelevanceResponse filterUdiInfoById(String id); /** diff --git a/src/main/java/com/glxp/api/dao/basic/UdiRelevanceDao.java b/src/main/java/com/glxp/api/dao/basic/UdiRelevanceDao.java index 832763160..498a28772 100644 --- a/src/main/java/com/glxp/api/dao/basic/UdiRelevanceDao.java +++ b/src/main/java/com/glxp/api/dao/basic/UdiRelevanceDao.java @@ -35,17 +35,14 @@ public interface UdiRelevanceDao extends BaseMapperPlus contrastJoinSelect(FilterUdiRelRequest filterUdiRelRequest); - UdiRelevanceEntity selectById(@Param("id") Long id); UdiRelevanceEntity selectByThirdId(FilterUdiRelRequest filterUdiRelRequest); List filterEntity(FilterUdiRelRequest filterUdiRelRequest); - boolean insertUdiRelevance(UdiRelevanceEntity udiRelevanceEntity); - boolean insertUdiRelevanceignore(UdiRelevanceEntity udiRelevanceEntity); boolean updateUdiRelevance(UdiRelevanceEntity udiRelevanceEntity); @@ -53,8 +50,6 @@ public interface UdiRelevanceDao extends BaseMapperPlus id); - boolean deleteByUuid(@Param("uuid") String uuid); - /** * 根据UUID批量查询信息 * @@ -66,15 +61,6 @@ public interface UdiRelevanceDao extends BaseMapperPlus batchSelectByIds(@Param("ids") List ids); - /** - * /** - * 查找产品UUID - * - * @param relId - * @return - */ - String selectUuidById(@Param("relId") String relId); - List selectGroupByNameCode(@Param("nameCode") String nameCode, @Param("isDisable") Boolean isDisable); @@ -104,13 +90,6 @@ public interface UdiRelevanceDao extends BaseMapperPlus - - - - diff --git a/src/main/resources/mybatis/mapper/auth/DeptDao.xml b/src/main/resources/mybatis/mapper/auth/DeptDao.xml index 0efff38b7..5911d6e41 100644 --- a/src/main/resources/mybatis/mapper/auth/DeptDao.xml +++ b/src/main/resources/mybatis/mapper/auth/DeptDao.xml @@ -276,38 +276,17 @@ - - update auth_dept - set ${sysId} = #{thridWarehouseId,jdbcType=VARCHAR} - where id = #{id} - - update auth_dept SET updateTime = #{updateTime} where code = #{code} - - - diff --git a/src/main/resources/mybatis/mapper/auth/WarehouseUserDao.xml b/src/main/resources/mybatis/mapper/auth/WarehouseUserDao.xml index d5849b334..a714c20c8 100644 --- a/src/main/resources/mybatis/mapper/auth/WarehouseUserDao.xml +++ b/src/main/resources/mybatis/mapper/auth/WarehouseUserDao.xml @@ -19,25 +19,6 @@ isDirector, locSubInvCode - - delete @@ -122,15 +103,4 @@ where code = #{code} - - update auth_warehouse_user - set isDirector = #{isDirector} - where code = #{code} - - - - update auth_warehouse_user - set isDirector = #{isDirector} - where id = #{id} - diff --git a/src/main/resources/mybatis/mapper/basic/BasicCorpDao.xml b/src/main/resources/mybatis/mapper/basic/BasicCorpDao.xml index 0a24162e4..6d65636c1 100644 --- a/src/main/resources/mybatis/mapper/basic/BasicCorpDao.xml +++ b/src/main/resources/mybatis/mapper/basic/BasicCorpDao.xml @@ -106,41 +106,6 @@ limit 1 - - REPLACE - INTO basic_corp - (thirdId, erpId, name, spell, - addr, status, type, creditNo, contact, mobile, thirdId1, thirdId2, thirdId3, thirdId4, - thirdName, thirdName1, thirdName2, thirdName3, thirdName4, updateTime, corpType, outType, createUser, - createTime, updateUser, remark) - values (#{thirdId}, - #{erpId}, - #{name}, - #{spell}, - #{addr}, - #{status}, - #{type}, - #{creditNo}, - #{contact}, - #{mobile}, - #{thirdId1}, - #{thirdId2}, - #{thirdId3}, - #{thirdId4}, - #{thirdName}, - #{thirdName1}, - #{thirdName2}, - #{thirdName3}, - #{thirdName4}, - #{updateTime}, - #{corpType}, - #{outType}, - #{createUser}, - #{createTime}, - #{updateUser}, - #{remark}) - @@ -271,24 +236,6 @@ WHERE id = #{id} - - - - - - SELECT company_product_relevance.id, diff --git a/src/main/resources/mybatis/mapper/basic/EntrustReceDao.xml b/src/main/resources/mybatis/mapper/basic/EntrustReceDao.xml index 6cf3a80a6..67d52bd71 100644 --- a/src/main/resources/mybatis/mapper/basic/EntrustReceDao.xml +++ b/src/main/resources/mybatis/mapper/basic/EntrustReceDao.xml @@ -130,28 +130,6 @@ order by updateTime desc - - - replace - INTO basic_entrust_accept(`action`, curDept, entrustInv, `entrustUser`, userId, - updateTime, remark, entrustAction, finishRece, curInv, entrustDept, entrustInv, - entrustEnd) - values (#{action}, - #{entrustInv}, - #{entrustUser}, - #{userId}, - #{updateTime}, - #{remark}, - #{entrustAction}, - #{finishRece}, - #{curInv}, - #{entrustDept}, - #{entrustInv}, - #{entrustEnd}) - - - DELETE FROM basic_entrust_accept diff --git a/src/main/resources/mybatis/mapper/basic/ProductInfoDao.xml b/src/main/resources/mybatis/mapper/basic/ProductInfoDao.xml index 0501567aa..b4b3b22b3 100644 --- a/src/main/resources/mybatis/mapper/basic/ProductInfoDao.xml +++ b/src/main/resources/mybatis/mapper/basic/ProductInfoDao.xml @@ -70,206 +70,12 @@ GROUP BY uuid - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - UPDATE sys_workplace_queue diff --git a/src/main/resources/mybatis/mapper/basic/UdiCompanyDao.xml b/src/main/resources/mybatis/mapper/basic/UdiCompanyDao.xml index fc1c3323e..d832496c9 100644 --- a/src/main/resources/mybatis/mapper/basic/UdiCompanyDao.xml +++ b/src/main/resources/mybatis/mapper/basic/UdiCompanyDao.xml @@ -3,15 +3,6 @@ - - - diff --git a/src/main/resources/mybatis/mapper/basic/UdiProductDao.xml b/src/main/resources/mybatis/mapper/basic/UdiProductDao.xml index 974fbef2a..b5854e612 100644 --- a/src/main/resources/mybatis/mapper/basic/UdiProductDao.xml +++ b/src/main/resources/mybatis/mapper/basic/UdiProductDao.xml @@ -31,109 +31,6 @@ - - - - - - select count(*) - FROM company_product_relevance - inner JOIN basic_udirel - ON company_product_relevance.udiRlIdFk = basic_udirel.id - inner JOIN basic_products ON basic_udirel.uuid = basic_products.uuid - - - AND nameCode LIKE concat(#{nameCode}, '%') - - - and unitFk = #{unitFk} - - - diff --git a/src/main/resources/mybatis/mapper/system/SysPdaKeyDao.xml b/src/main/resources/mybatis/mapper/system/SysPdaKeyDao.xml index 413e6ac46..02d5ba71a 100644 --- a/src/main/resources/mybatis/mapper/system/SysPdaKeyDao.xml +++ b/src/main/resources/mybatis/mapper/system/SysPdaKeyDao.xml @@ -63,42 +63,6 @@ WHERE id = #{id} - - UPDATE sys_pda_check - - - isCheck=#{isCheck}, - - - companyName=#{companyName}, - - - phone=#{phone}, - - - contact=#{contact}, - - - imeiKey=#{imeiKey}, - - - date=#{date}, - - - imei=#{imei}, - - - creditNum=#{creditNum}, - - - rgType=#{rgType}, - - - remark=#{remark}, - - - WHERE imei = #{imei} - replace From 161be86db0932752fc0bda6beac9aaf522d9f3f3 Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Fri, 7 Mar 2025 14:30:51 +0800 Subject: [PATCH 6/7] =?UTF-8?q?3/7=20=E4=BC=98=E5=8C=961.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/dao/thrsys/ThrCorpExportLogDao.java | 1 - .../glxp/api/dao/thrsys/ThrProductsDao.java | 2 - .../mybatis/mapper/thrsys/ThrProductsDao.xml | 43 ------------------- 3 files changed, 46 deletions(-) diff --git a/src/main/java/com/glxp/api/dao/thrsys/ThrCorpExportLogDao.java b/src/main/java/com/glxp/api/dao/thrsys/ThrCorpExportLogDao.java index ed843553d..36644d64f 100644 --- a/src/main/java/com/glxp/api/dao/thrsys/ThrCorpExportLogDao.java +++ b/src/main/java/com/glxp/api/dao/thrsys/ThrCorpExportLogDao.java @@ -11,7 +11,6 @@ import java.util.List; @Mapper public interface ThrCorpExportLogDao { - List filterThrCorpExportLog(FilterThrCorpExportLogRequest filterThrCorpExportLogRequest); boolean insertThrCorpExportLog(ThrCorpExportLogEntity thrCorpExportLogEntity); diff --git a/src/main/java/com/glxp/api/dao/thrsys/ThrProductsDao.java b/src/main/java/com/glxp/api/dao/thrsys/ThrProductsDao.java index 1a6cee352..2a6a7f0f6 100644 --- a/src/main/java/com/glxp/api/dao/thrsys/ThrProductsDao.java +++ b/src/main/java/com/glxp/api/dao/thrsys/ThrProductsDao.java @@ -32,8 +32,6 @@ public interface ThrProductsDao extends BaseMapperPlus list); - List selectByLastTime(@Param("lastUpdateTime") Date lastUpdateTime); /** diff --git a/src/main/resources/mybatis/mapper/thrsys/ThrProductsDao.xml b/src/main/resources/mybatis/mapper/thrsys/ThrProductsDao.xml index f554a081b..2b05ee99e 100644 --- a/src/main/resources/mybatis/mapper/thrsys/ThrProductsDao.xml +++ b/src/main/resources/mybatis/mapper/thrsys/ThrProductsDao.xml @@ -225,49 +225,6 @@ where updateTime >= #{lastUpdateTime} - - replace - INTO thr_products - (code, `name`, measname, spec, registerNo, manufactory, - cplb, flbm, qxlb, ybbm, sptm, tyshxydm, zczbhhzbapzbh, ylqxzcrbarmc, ylqxzcrbarywmc, cpms, - thirdSysFk, updateTime, supName, model, standard, qtbm, zczyxqz, remark, remark1, remark2, remark3, - price, - createUser, createTime, updateUser, manufactoryCode, supCode, type, prcitmcode,invCode) - values - - #{item.code}, - #{item.name}, - #{item.measname}, - #{item.spec}, - #{item.registerNo}, - #{item.manufactory}, - #{item.cplb}, - #{item.flbm}, - #{item.qxlb}, - #{item.ybbm}, - #{item.sptm}, - #{item.tyshxydm}, - #{item.zczbhhzbapzbh}, - #{item.ylqxzcrbarmc}, - #{item.ylqxzcrbarywmc}, - #{item.cpms}, - #{item.thirdSysFk}, - #{item.updateTime}, - #{item.supName}, - #{item.model}, - #{item.standard}, - #{item.qtbm}, - #{item.zczyxqz}, - #{item.remark}, - #{item.remark1}, - #{item.remark2}, - #{item.remark3}, - #{item.price}, - #{item.createUser}, - #{item.createTime}, - #{item.updateUser}, #{item.manufactoryCode}, #{item.supCode}, #{item.type}, #{item.prcitmcode},#{item.invCode} - - diff --git a/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml b/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml index 368020c31..33c103e42 100644 --- a/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml +++ b/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml @@ -254,29 +254,47 @@ - SELECT * - FROM io_order - WHERE (supplementNo IS NULL OR supplementNo = '') - AND `action` IN (SELECT `action` - FROM basic_bussiness_type - WHERE supplementOrderType IS NOT NULL - and supplementOrderType - != '') + SELECT io.* + FROM io_order io + WHERE (io.supplementNo IS NULL OR io.supplementNo = '') + AND EXISTS( + SELECT 1 + FROM basic_bussiness_type bbt + WHERE bbt.action = io.action + AND bbt.supplementOrderType IS NOT NULL + AND bbt.supplementOrderType != '' + ) - select io.*, - (select name from basic_bussiness_type bus where bus.action = io.action) billTypeName, - (select name from auth_dept ad where ad.code = io.deptCode) deptName, - (select name from auth_warehouse aw where aw.code = io.invCode) invName, - (select employeeName from auth_user au where au.id = io.createUser) createUserName, - (select employeeName from auth_user au2 where au2.id = io.updateUser) updateUserName, - (select employeeName from auth_user au3 where au3.id = io.reviewUser) reviewUserName, - (select employeeName from auth_user au4 where au4.id = io.checkUser) checkUserName, - (select name from auth_dept ad2 where ad2.code = io.fromDeptCode) fromDeptName, - (select name from auth_warehouse aw2 where aw2.code = io.fromInvCode) fromInvName, - (select name from basic_corp bc where bc.erpId = io.fromCorp) fromCorpName, - (select name from basic_corp bc where bc.erpId = io.customerId) customerName - from io_order as io - inner join io_order_invoice ioi on io.billNo = ioi.orderIdFk + SELECT + io.*, + bus.name AS billTypeName, + ad.name AS deptName, + aw.name AS invName, + au_create.employeeName AS createUserName, + au_update.employeeName AS updateUserName, + au_review.employeeName AS reviewUserName, + au_check.employeeName AS checkUserName, + ad_from.name AS fromDeptName, + aw_from.name AS fromInvName, + bc_from.name AS fromCorpName, + bc_customer.name AS customerName + FROM + io_order AS io + INNER JOIN + io_order_invoice AS ioi ON io.billNo = ioi.orderIdFk + LEFT JOIN + basic_bussiness_type AS bus ON bus.action = io.action + LEFT JOIN + auth_dept AS ad ON ad.code = io.deptCode + LEFT JOIN + auth_warehouse AS aw ON aw.code = io.invCode + LEFT JOIN + auth_user AS au_create ON au_create.id = io.createUser + LEFT JOIN + auth_user AS au_update ON au_update.id = io.updateUser + LEFT JOIN + auth_user AS au_review ON au_review.id = io.reviewUser + LEFT JOIN + auth_user AS au_check ON au_check.id = io.checkUser + LEFT JOIN + auth_dept AS ad_from ON ad_from.code = io.fromDeptCode + LEFT JOIN + auth_warehouse AS aw_from ON aw_from.code = io.fromInvCode + LEFT JOIN + basic_corp AS bc_from ON bc_from.erpId = io.fromCorp + LEFT JOIN + basic_corp AS bc_customer ON bc_customer.erpId = io.customerId AND ioi.invoiceEncode = #{invoiceEncode} diff --git a/src/main/resources/mybatis/mapper/inout/IoOrderMutiMapper.xml b/src/main/resources/mybatis/mapper/inout/IoOrderMutiMapper.xml index 780470d91..96c11e63b 100644 --- a/src/main/resources/mybatis/mapper/inout/IoOrderMutiMapper.xml +++ b/src/main/resources/mybatis/mapper/inout/IoOrderMutiMapper.xml @@ -5,14 +5,19 @@ SELECT io.*, - (SELECT NAME FROM auth_warehouse aw WHERE aw.CODE = io.curInv) invName, - (SELECT NAME FROM basic_corp bc WHERE bc.erpId = io.fromCorp) fromCorpName, - (SELECT NAME FROM basic_bussiness_type bus WHERE bus.action = io.targetAction) targetActionName + a1.NAME AS invName, + bc.NAME AS fromCorpName, + bus.NAME AS targetActionName FROM io_order_muti_set io - left join auth_warehouse a1 on a1.code=io.curInv + LEFT JOIN + auth_warehouse a1 ON a1.code = io.curInv + LEFT JOIN + basic_corp bc ON bc.erpId = io.fromCorp + LEFT JOIN + basic_bussiness_type bus ON bus.action = io.targetAction + AND a1.name like concat('%', #{curInv}, '%') diff --git a/src/main/resources/mybatis/mapper/inout/IoOrderUploadLogDao.xml b/src/main/resources/mybatis/mapper/inout/IoOrderUploadLogDao.xml index f444a5a1d..b82de9941 100644 --- a/src/main/resources/mybatis/mapper/inout/IoOrderUploadLogDao.xml +++ b/src/main/resources/mybatis/mapper/inout/IoOrderUploadLogDao.xml @@ -28,8 +28,11 @@ - select *, ( SELECT NAME FROM auth_dept WHERE io_stat_day.deptCode = auth_dept.CODE ) deptName - from io_stat_day + SELECT io_stat_day.*, + ad.NAME AS deptName + FROM io_stat_day + LEFT JOIN + auth_dept ad ON io_stat_day.deptCode = ad.CODE AND recordKeyFk = #{recordKey} @@ -21,7 +24,11 @@ diff --git a/src/main/resources/mybatis/mapper/inout/IoStatDetailMapper.xml b/src/main/resources/mybatis/mapper/inout/IoStatDetailMapper.xml index 123c066fe..d1082f05a 100644 --- a/src/main/resources/mybatis/mapper/inout/IoStatDetailMapper.xml +++ b/src/main/resources/mybatis/mapper/inout/IoStatDetailMapper.xml @@ -33,8 +33,11 @@ diff --git a/src/main/resources/mybatis/mapper/inout/IoStatMonthDao.xml b/src/main/resources/mybatis/mapper/inout/IoStatMonthDao.xml index f5aae9dfe..c7e634793 100644 --- a/src/main/resources/mybatis/mapper/inout/IoStatMonthDao.xml +++ b/src/main/resources/mybatis/mapper/inout/IoStatMonthDao.xml @@ -2,8 +2,11 @@ diff --git a/src/main/resources/mybatis/mapper/inout/IoStatQuarterDao.xml b/src/main/resources/mybatis/mapper/inout/IoStatQuarterDao.xml index d35d0568f..bbd7ba6ff 100644 --- a/src/main/resources/mybatis/mapper/inout/IoStatQuarterDao.xml +++ b/src/main/resources/mybatis/mapper/inout/IoStatQuarterDao.xml @@ -2,8 +2,11 @@ diff --git a/src/main/resources/mybatis/mapper/inout/IoStatYearDao.xml b/src/main/resources/mybatis/mapper/inout/IoStatYearDao.xml index a5360a710..c989d89d4 100644 --- a/src/main/resources/mybatis/mapper/inout/IoStatYearDao.xml +++ b/src/main/resources/mybatis/mapper/inout/IoStatYearDao.xml @@ -2,8 +2,10 @@ diff --git a/src/main/resources/mybatis/mapper/inout/ReceiveDao.xml b/src/main/resources/mybatis/mapper/inout/ReceiveDao.xml index ea0e87d27..a70fc1366 100644 --- a/src/main/resources/mybatis/mapper/inout/ReceiveDao.xml +++ b/src/main/resources/mybatis/mapper/inout/ReceiveDao.xml @@ -2,18 +2,36 @@