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..18fc36fc6 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java @@ -2202,10 +2202,7 @@ public class IoCodeTempController extends BaseController { } else { IoCodeEntity ioCodeEntity = new IoCodeEntity(); BeanUtils.copyProperties(codeEnttity, ioCodeEntity); - String supId = transInoutService.checkInvExitSup(ioCodeEntity); - if (supId == null) { - supId = transInoutService.checkExitSup(codeEnttity); - } + String supId = transInoutService.checkExitSup(codeEnttity); if (supId == null) { codeEnttity.setSupId(null); BaseResponse baseResponse = ResultVOUtils.error(503, "该产品未绑定供应商,请指定对应的供应商"); diff --git a/src/main/java/com/glxp/api/service/collect/IoCollectOrderBackupService.java b/src/main/java/com/glxp/api/service/collect/IoCollectOrderBackupService.java index 9cce5c5e7..09a0adb3c 100644 --- a/src/main/java/com/glxp/api/service/collect/IoCollectOrderBackupService.java +++ b/src/main/java/com/glxp/api/service/collect/IoCollectOrderBackupService.java @@ -192,6 +192,15 @@ public class IoCollectOrderBackupService extends ServiceImpl ioCollectOrderBizs = collectOrderBizService.listByBillNo(collectOrder.getBillNo()); +// for (IoCollectOrderBiz ioCollectOrderBiz : ioCollectOrderBizs){ +// IoCollectOrderBizBackup ioCollectOrderBizBackup = new IoCollectOrderBizBackup(); +// BeanUtils.copyProperties(ioCollectOrderBiz, ioCollectOrderBizBackup); +// boolean save1 = ioCollectOrderBizBackupService.save(ioCollectOrderBizBackup); +// if (!save1){ +// throw new JsonException(500,"处方备用明细上传失败"); +// } +// } } /** @@ -441,6 +467,11 @@ public class IoCollectOrderBackupService extends ServiceImpl setScanCodeOrderDetail(CollectOrderBizRequest collectOrderBizRequest) { +// List list = ioCollectOrderBizBackupService.filterListByBillNo(collectOrderBizRequest); +// List ioCollectCodeBackups = ioCollectCodeBackService.listByBillNo(collectOrderBizRequest.getOrderIdFk());; +// List collectOrderBizResponses = new ArrayList<>(); +// for (CollectOrderBizResponse collectOrderBiz : list) { +// CollectOrderBizResponse collectOrderBizResponse = new CollectOrderBizResponse(); +// BeanUtils.copyProperties(collectOrderBiz, collectOrderBizResponse); +// //查询手动赋码的code +// for (IoCollectCodeBackup ioCollectCodeBackup : ioCollectCodeBackups) { +// UdiRelevanceResponse udiRelevanceResponse = udiRelevanceService.selectByNameCode(collectOrderBizResponse.getNameCode()); +// if (ioCollectCodeBackup.getRelId().equals(udiRelevanceResponse.getId())) { +// collectOrderBizResponse.setScanUdiCode(StrUtil.trimToEmpty(collectOrderBizResponse.getScanUdiCode()) + "," + ioCollectCodeBackup.getCode()); +// } +// } +// if (StrUtil.isNotEmpty(collectOrderBizResponse.getScanUdiCode())){ +// collectOrderBizResponse.setFinishUdiCode(collectOrderBizResponse.getScanUdiCode() == null ? "" : collectOrderBizResponse.getScanUdiCode().substring(1)); +// } +// collectOrderBizResponses.add(collectOrderBizResponse); +// } +// +// return collectOrderBizResponses; +// } + public List setScanCodeOrderDetail(CollectOrderBizRequest collectOrderBizRequest) { List list = ioCollectOrderBizBackupService.filterListByBillNo(collectOrderBizRequest); + List ioCollectCodeBackups = ioCollectCodeBackService.listByBillNo(collectOrderBizRequest.getOrderIdFk()); List collectOrderBizResponses = new ArrayList<>(); Map udiRelevanceMap = new HashMap<>(); @@ -563,6 +618,18 @@ public class IoCollectOrderBackupService extends ServiceImpl filterList(CollectOrderBizRequest collectOrderRequest) { if (collectOrderRequest == null) { return Collections.emptyList(); @@ -52,19 +49,13 @@ public class IoCollectOrderBizBackupService extends ServiceImpl buyTypeMap = new HashMap<>(); List buyTypeBuyer = new ArrayList<>(); List buyTypeSales = new ArrayList<>(); -// Integer buyerCount = 0; -// Integer salesCount = 0; Integer buyerScanCount = 0; Integer salesScanCount = 0; BigDecimal buyerCentage = new BigDecimal(0); BigDecimal salesCentage = new BigDecimal(0); Integer codeCount = 0; - Integer fifoSplitOneCount = 0; Integer fifoSplitTwoCount = 0; - - - if (list != null && list.size() > 0) { BaseResponse> baseResponse = erpBasicClient.getBuyType("thirdId"); if (baseResponse.getCode() == 20000) { @@ -75,13 +66,9 @@ public class IoCollectOrderBizBackupService extends ServiceImpl(Arrays.asList(buyTypeMap.get("buyType_3505"))); buyTypeSales.addAll(Arrays.asList(buyTypeMap.get("buyType_3506"))); } - for (CollectOrderBizResponse collectOrderBizResponse : list) { collectOrderBizResponse.setCount(collectOrderBizResponse.getCount() == null ? 0 : collectOrderBizResponse.getCount()); collectOrderBizResponse.setScanCount(collectOrderBizResponse.getScanCount() == null ? 0 : collectOrderBizResponse.getScanCount()); - - - if(2 == collectOrderBizResponse.getUploadStatus()){ for (String buyType : buyTypeSales) { if (buyType.equals(collectOrderBizResponse.getBusType())) { @@ -127,25 +114,6 @@ public class IoCollectOrderBizBackupService extends ServiceImpl 0) { -// sb.append("-"); -// } -// sb.append(collectOrderBizResponse.getQueueName()); -// } -// if (collectOrderBizResponse.getWorkplaceQueueCode() != null && !collectOrderBizResponse.getWorkplaceQueueCode().isEmpty()) { -// if (sb.length() > 0) { -// sb.append("-"); -// } -// sb.append("(").append(collectOrderBizResponse.getWorkplaceQueueCode()).append(")"); -// } return sb.toString(); } diff --git a/src/main/java/com/glxp/api/service/collect/IoCollectOrderCodeManService.java b/src/main/java/com/glxp/api/service/collect/IoCollectOrderCodeManService.java index d8d7f5bd8..d1010d18f 100644 --- a/src/main/java/com/glxp/api/service/collect/IoCollectOrderCodeManService.java +++ b/src/main/java/com/glxp/api/service/collect/IoCollectOrderCodeManService.java @@ -129,10 +129,6 @@ public class IoCollectOrderCodeManService extends ServiceImpl().eq(IoCollectOrderCodeMan::getOrderIdFk, billNo) .eq(IoCollectOrderCodeMan::getUdiCode, code).last("limit 1")); } - - - @Resource - InvWarehouseService invWarehouseService; @Resource SysWorkplacePutRelService workplacePutRelService; @Resource @@ -197,23 +193,6 @@ public class IoCollectOrderCodeManService extends ServiceImpl() -// .eq(IoCollectCodeBackup::getCode, code) -// .eq(IoCollectCodeBackup::getPurType, udiRelevanceResponse.getPurType())); -// if (collectCodeBackup == null) { -// String PurTypeName = IntUtil.value(udiRelevanceResponse.getPurType()) == 2 ? "预验收" : "寄售"; -// throw new JsonException(500, "当前产品追溯码未进入" + PurTypeName + "库"); -// } -// } -// } - //2-1.校验预验收库存是否已存在 String preInBillNo = addTagCodeReqeust.getPreInBillNo(); String orderId = addTagCodeReqeust.getBillNo(); @@ -297,10 +276,6 @@ public class IoCollectOrderCodeManService extends ServiceImpl collectOrderCodes = collectOrderCodeManService.listByBillNo(collectOrder.getBillNo()); -// BasicBussinessTypeEntity bussinessTypeEntity; -// sysWorkplaceDocumentEntity.getInoutType(); -// -// //构造单据数据 -// IoOrderEntity orderEntity = new IoOrderEntity(); -// bussinessTypeEntity = bussinessTypeService.findByAction(sysWorkplaceDocumentEntity.getDocumentTypeCode()); -// orderEntity.setMainAction(bussinessTypeEntity.getMainAction()); -// orderEntity.setAction(bussinessTypeEntity.getAction()); -// orderEntity.setCreateTime(new Date()); -// orderEntity.setInvCode(sysWorkplaceDocumentEntity.getInvCode() + ""); -// orderEntity.setDeptCode(""); -// orderEntity.setFromCorp(collectOrder.getFromCorp()); -// orderEntity.setCorpOrderId(CustomUtil.getId() + "x"); -// orderEntity.setExportStatus(0); -// orderEntity.setStatus(ConstantStatus.ORDER_STATUS_CHECK_PROCESS); -// orderEntity.setDealStatus(ConstantStatus.ORDER_DEAL_DRAFT); -// orderEntity.setCreateUser(collectOrder.getCreateUser()); -// orderEntity.setCreateTime(new Date()); -// orderEntity.setUpdateUser(collectOrder.getCreateUser()); -// orderEntity.setUpdateTime(new Date()); -// orderEntity.setCustomerId("110"); -// orderEntity.setOrderType(2); -// orderEntity.setFromType(2); -// String orderNo = gennerOrderUtils.createScOrderNo(new OrderNoTypeBean(Constant.SCAN_ORDER + StrUtil.trimToEmpty(bussinessTypeEntity.getPrefix()), "yyyyMMdd")); -// orderEntity.setBillNo(orderNo); -// List lossCodesList = new ArrayList<>(); -// -// for (IoCollectOrderCodeMan collectOrderCodeMan : collectOrderCodes) { -// lossCodesList.add(buildCodeEntity(collectOrderCodeMan, orderEntity)); -// } -// orderService.insertOrder(orderEntity); -// codesTempDao.insertBatch(lossCodesList); -// addInoutService.dealProcess(orderEntity); -// if (!ioCheckInoutService.checkManual(orderEntity.getBillNo())) { -// ioCheckInoutService.check(orderEntity.getBillNo()); -// } -// } else if (IntUtil.value(sysWorkplaceDocumentEntity.getIsMatching()) == 1 && sysWorkplaceDocumentEntity.getScanType() != 1) { -// //更新单据为已完成 -// IoOrderEntity orderEntity = orderService.findByBillNo(collectOrder.getBillNo()); -// orderEntity.setStatus(7); -// orderService.update(orderEntity); -// } else if (IntUtil.value(sysWorkplaceDocumentEntity.getIsMatching()) == 0) { -// //todo 根据单据类型上传医保或者第三方系统 -// PostCollectOrderRequest orderRequest = new PostCollectOrderRequest(); -// orderRequest.setThirdSys("thirdId"); -// CollectOrderBizRequest collectOrderBizRequest = new CollectOrderBizRequest(); -// collectOrderBizRequest.setOrderIdFk(collectOrder.getBillNo()); -// List collectOrderBizResponses = combieOrderDetail(collectOrderBizRequest); -// collectOrder.setCollectOrderBizResponseList(collectOrderBizResponses); -// List collectOrderList = new ArrayList<>(); -// collectOrderList.add(collectOrder); -// orderRequest.setCollectOrderList(collectOrderList); -// BaseResponse baseResponse = erpBasicClient.postOrder(orderRequest); -// log.debug("单据返回=========" + baseResponse); -// if (baseResponse.getCode() == 20000) { -// // -// } else { -// throw new JsonException("连接第三方系统接口服务出错，" + baseResponse.getMessage()); -// } -// -// } -// //插入处方备份表 -// IoCollectOrderBackup ioCollectOrderBackup = new IoCollectOrderBackup(); -// BeanUtils.copyProperties(collectOrder, ioCollectOrderBackup); -// boolean save = ioCollectOrderBackupService.save(ioCollectOrderBackup); -// if (!save){ -// throw new JsonException(500,"处方备用上传失败"); -// } -// List ioCollectOrderBizs = collectOrderBizService.listByBillNo(collectOrder.getBillNo()); -// for (IoCollectOrderBiz ioCollectOrderBiz : ioCollectOrderBizs){ -// IoCollectOrderBizBackup ioCollectOrderBizBackup = new IoCollectOrderBizBackup(); -// BeanUtils.copyProperties(ioCollectOrderBiz, ioCollectOrderBizBackup); -// boolean save1 = ioCollectOrderBizBackupService.save(ioCollectOrderBizBackup); -// if (!save1){ -// throw new JsonException(500,"处方备用明细上传失败"); -// } -// } -// -// -// } @Resource UdiRlSupService udiRlSupService; diff --git a/src/main/java/com/glxp/api/service/collect/IoCollectSetService.java b/src/main/java/com/glxp/api/service/collect/IoCollectSetService.java index 4baae2eb0..bd5823db5 100644 --- a/src/main/java/com/glxp/api/service/collect/IoCollectSetService.java +++ b/src/main/java/com/glxp/api/service/collect/IoCollectSetService.java @@ -11,7 +11,7 @@ import com.glxp.api.dao.collect.IoCollectSetMapper; public class IoCollectSetService extends ServiceImpl { public IoCollectSet getSet() { - List collectSets = new ArrayList<>(); + List collectSets; try { collectSets = this.list(); }catch (Exception e){ diff --git a/src/main/java/com/glxp/api/service/collect/IoSplitDesOrderService.java b/src/main/java/com/glxp/api/service/collect/IoSplitDesOrderService.java index 4716441a6..d2f89af5a 100644 --- a/src/main/java/com/glxp/api/service/collect/IoSplitDesOrderService.java +++ b/src/main/java/com/glxp/api/service/collect/IoSplitDesOrderService.java @@ -187,7 +187,6 @@ public class IoSplitDesOrderService extends ServiceImpl() .eq(IoSplitFifoCodeEntity::getWorkPlaceCode, splitFifoInv.getWorkPlaceCode()) -// .eq(IoSplitFifoCodeEntity::getBatchNo, splitFifoInv.getBatchNo()) .eq(IoSplitFifoCodeEntity::getRelId, splitFifoInv.getRelId())); if (splitFifoCodeEntity == null) { throw new JsonException("该工位不存在，请检查后重试！"); @@ -207,7 +205,6 @@ public class IoSplitDesOrderService extends ServiceImpl { List detail(DeviceInfoDetailByDeptCodeQuery query); - List listVoByProductIdAndStatus(Long productId, DeviceStatusEnum status); - List listVoByCodes(List deviceCodes, String deptCode, List status); boolean exitOrder(Long orderId, String deviceCode); diff --git a/src/main/java/com/glxp/api/service/dev/DeviceInspectOrderService.java b/src/main/java/com/glxp/api/service/dev/DeviceInspectOrderService.java index 021a777d8..c205291b5 100644 --- a/src/main/java/com/glxp/api/service/dev/DeviceInspectOrderService.java +++ b/src/main/java/com/glxp/api/service/dev/DeviceInspectOrderService.java @@ -62,20 +62,4 @@ public interface DeviceInspectOrderService { */ BaseResponse deleteOrder(String id); - /** - * 根据报修单号生成新的维保单 - * - * @param repairOrderId - * @return - */ - BaseResponse addByRepairOrderId(String repairOrderId); - - /** - * 根据巡检计划单号生成新的维保单 - * - * @param planOrderId - * @return - */ - BaseResponse addByPlanOrderId(String planOrderId); - } diff --git a/src/main/java/com/glxp/api/service/dev/DeviceInspectPlanService.java b/src/main/java/com/glxp/api/service/dev/DeviceInspectPlanService.java index ea9053c3a..b3a8ce63c 100644 --- a/src/main/java/com/glxp/api/service/dev/DeviceInspectPlanService.java +++ b/src/main/java/com/glxp/api/service/dev/DeviceInspectPlanService.java @@ -63,7 +63,6 @@ public interface DeviceInspectPlanService { */ BaseResponse deletePlan(String id); - void genTaskDev(DeviceInspectPlanEntity deviceInspectPlanEntity); } diff --git a/src/main/java/com/glxp/api/service/dev/DeviceInspectTaskService.java b/src/main/java/com/glxp/api/service/dev/DeviceInspectTaskService.java index a7ab4cb88..55a8f04ef 100644 --- a/src/main/java/com/glxp/api/service/dev/DeviceInspectTaskService.java +++ b/src/main/java/com/glxp/api/service/dev/DeviceInspectTaskService.java @@ -29,12 +29,6 @@ public class DeviceInspectTaskService extends ServiceImpl filterList(FilterDeviceInspectTakeRequest filterDeviceInspectTakeRequest) { if (null == filterDeviceInspectTakeRequest) { return Collections.emptyList(); diff --git a/src/main/java/com/glxp/api/service/dev/DeviceProjectSetService.java b/src/main/java/com/glxp/api/service/dev/DeviceProjectSetService.java index aaa39ac43..f223c461b 100644 --- a/src/main/java/com/glxp/api/service/dev/DeviceProjectSetService.java +++ b/src/main/java/com/glxp/api/service/dev/DeviceProjectSetService.java @@ -61,7 +61,7 @@ public class DeviceProjectSetService extends ServiceImpl list = null; + List list ; if (id != null && !"".equals(id)) { list = deviceProjectSetMapper.selectList(new QueryWrapper().eq("code", code).ne("id", id)); } else diff --git a/src/main/java/com/glxp/api/service/dev/DeviceReceiveOrderDetailService.java b/src/main/java/com/glxp/api/service/dev/DeviceReceiveOrderDetailService.java index ae94df6c0..b067ddd00 100644 --- a/src/main/java/com/glxp/api/service/dev/DeviceReceiveOrderDetailService.java +++ b/src/main/java/com/glxp/api/service/dev/DeviceReceiveOrderDetailService.java @@ -53,7 +53,6 @@ public interface DeviceReceiveOrderDetailService { */ BaseResponse checkCode(String code); - List selectByorderIdFk(FilterDeviceReceiveOrderDetailRequest detailRequest); diff --git a/src/main/java/com/glxp/api/service/dev/DeviceRepairOrderDetailService.java b/src/main/java/com/glxp/api/service/dev/DeviceRepairOrderDetailService.java index 992a78717..b1aa4f7a1 100644 --- a/src/main/java/com/glxp/api/service/dev/DeviceRepairOrderDetailService.java +++ b/src/main/java/com/glxp/api/service/dev/DeviceRepairOrderDetailService.java @@ -13,8 +13,6 @@ public interface DeviceRepairOrderDetailService extends IService filterByorderIdFk(String orderIdFk); - - boolean addDeviceRepairOrderDetail(DeviceRepairOrderDetailEntity deviceRepairOrderDetailEntity); boolean updateDeviceRepairOrderDetail(DeviceRepairOrderDetailEntity deviceRepairOrderDetailEntity); diff --git a/src/main/java/com/glxp/api/service/dev/DeviceUpkeepDetailService.java b/src/main/java/com/glxp/api/service/dev/DeviceUpkeepDetailService.java index 0fd37e977..ee807fa4a 100644 --- a/src/main/java/com/glxp/api/service/dev/DeviceUpkeepDetailService.java +++ b/src/main/java/com/glxp/api/service/dev/DeviceUpkeepDetailService.java @@ -12,16 +12,8 @@ import java.util.List; * 针对表【device_upkeep_detail(保养任务明细)】的数据库操作Service */ public interface DeviceUpkeepDetailService extends IService { - - List pageList(DeviceUpkeepDetailQuery query); - - - - List listByTaskId(Long taskId, String deviceCode); DeviceUpkeepDetailEntity getOne(Long taskId, String deviceCode); - - void finishItem(Long taskId, String deviceCode, String deptCode, Boolean normalFlag, AuthAdmin user); } diff --git a/src/main/java/com/glxp/api/service/dev/DeviceUpkeepService.java b/src/main/java/com/glxp/api/service/dev/DeviceUpkeepService.java index 5d6971249..ab3017976 100644 --- a/src/main/java/com/glxp/api/service/dev/DeviceUpkeepService.java +++ b/src/main/java/com/glxp/api/service/dev/DeviceUpkeepService.java @@ -23,22 +23,10 @@ public interface DeviceUpkeepService extends IService { void genByPlanId(Long planId, boolean b, AuthAdmin user); - - DeviceUpkeepPrintVo checkInfoPrint(Long taskId, String deviceCode); void finishUpkeep(Long taskId, String deviceCode); List pageListDetail(DeviceUpkeepQuery query); - /** - * 完成一个保养设备 - * - * @param taskId 任务id - * @param deviceCode 设备编码 - * @return - */ -// void finishDevice(Long taskId, String deviceCode); - -// void finishUpkeep(String deviceCode, String deptCode, Long taskId, AuthAdmin user); } diff --git a/src/main/java/com/glxp/api/service/dev/impl/DeptDeviceDetailServiceImpl.java b/src/main/java/com/glxp/api/service/dev/impl/DeptDeviceDetailServiceImpl.java index 23e7bb9e8..5c55d62ca 100644 --- a/src/main/java/com/glxp/api/service/dev/impl/DeptDeviceDetailServiceImpl.java +++ b/src/main/java/com/glxp/api/service/dev/impl/DeptDeviceDetailServiceImpl.java @@ -55,8 +55,6 @@ public class DeptDeviceDetailServiceImpl implements DeptDeviceDetailService { FilterDeviceReceiveOrderDetailRequest detailRequest = new FilterDeviceReceiveOrderDetailRequest(); detailRequest.setOrderIdFk(orderId); List deviceReceiveOrderDetailResponses = deviceReceiveOrderDetailDao.filterList(detailRequest); - - Date date = new Date(); for (DeviceReceiveOrderDetailResponse receiveOrderDetailResponse : deviceReceiveOrderDetailResponses) { //查询此编码的产品是否已经在科室设备明细中 Long count = deptDeviceDetailDao.selectCount(new QueryWrapper().eq("deptCode", receiveOrderEntity.getFromDeptCode()) @@ -85,8 +83,6 @@ public class DeptDeviceDetailServiceImpl implements DeptDeviceDetailService { deviceDetail.setStatus(DeviceStatus.DEVICE_STATUS_NORMAL); deviceDetail.setAddType(1); deviceDetail.setCreateUser(receiveOrderEntity.getAuditUser()); -// deviceDetail.setCreateTime(date); -// deviceDetail.setUpdateTime(date); deptDeviceDetailDao.insert(deviceDetail); }else{ DeptDeviceDetailEntity deptDeviceDetailEntity = deptDeviceDetailDao.selectOne(new QueryWrapper().eq("deptCode", receiveOrderEntity.getFromDeptCode())); diff --git a/src/main/java/com/glxp/api/service/dev/impl/DeviceChangeOrderServiceImpl.java b/src/main/java/com/glxp/api/service/dev/impl/DeviceChangeOrderServiceImpl.java index 64995fcf7..6f9e6ebbf 100644 --- a/src/main/java/com/glxp/api/service/dev/impl/DeviceChangeOrderServiceImpl.java +++ b/src/main/java/com/glxp/api/service/dev/impl/DeviceChangeOrderServiceImpl.java @@ -143,19 +143,6 @@ public class DeviceChangeOrderServiceImpl extends ServiceImpl { if (order.getType() == DeviceChangeTypeEnum.ADD) { -// UdiRelevanceResponse productInfo = udiRelevanceService.selectByRelId(i.getProductId().toString()); -// if (productInfo == null) { -// throw new JsonException(String.format("未找到设备 %s", i.getProductName())); -// } -// i.setNameCode(productInfo.getNameCode()) -// .setProductName(productInfo.getCpmctymc()) -// .setGgxh(productInfo.getGgxh()) -// .setMeasname(productInfo.getMeasname()) -// .setManufactory(productInfo.getManufactory()) -// .setZczbhhzbapzbh(productInfo.getZczbhhzbapzbh()) -// .setSupId(productInfo.getUnitFk()) -// .setSupName(productInfo.getSupName()) -// ; DeviceInfoEntity deviceInfoEntity = BeanUtil.copyProperties(i, DeviceInfoEntity.class); deviceInfoEntity.setCheckLock(false); deviceInfoEntity.setCreateUserId(order.getCreateUser()); @@ -165,15 +152,7 @@ public class DeviceChangeOrderServiceImpl extends ServiceImpl list = super.baseMapper.pageVo(query); -// List list = super.list(Wrappers.lambdaQuery(DeviceCheckEntity.class) -// .orderByAsc(DeviceCheckEntity::getCreateTime) -// ); return list; } diff --git a/src/main/java/com/glxp/api/service/dev/impl/DeviceInfoServiceImpl.java b/src/main/java/com/glxp/api/service/dev/impl/DeviceInfoServiceImpl.java index d079f3621..24fff3b26 100644 --- a/src/main/java/com/glxp/api/service/dev/impl/DeviceInfoServiceImpl.java +++ b/src/main/java/com/glxp/api/service/dev/impl/DeviceInfoServiceImpl.java @@ -53,11 +53,9 @@ public class DeviceInfoServiceImpl extends ServiceImpl listVoByProductIdAndStatus(Long productId, DeviceStatusEnum status) { - - List list = super.baseMapper.listVoByProductIdAndStatus(productId, status); -// List list = super.list(Wrappers.lambdaQuery(DeviceInfoEntity.class) -// .eq(DeviceInfoEntity::getProductId, productId) -// .eq(DeviceInfoEntity::getStatus, status) -// ); - return list; - } - @Override public List listVoByCodes(List deviceCodes, String deptCode, List status) { diff --git a/src/main/java/com/glxp/api/service/dev/impl/DeviceInspectOrderServiceImpl.java b/src/main/java/com/glxp/api/service/dev/impl/DeviceInspectOrderServiceImpl.java index def03762f..1f0e245aa 100644 --- a/src/main/java/com/glxp/api/service/dev/impl/DeviceInspectOrderServiceImpl.java +++ b/src/main/java/com/glxp/api/service/dev/impl/DeviceInspectOrderServiceImpl.java @@ -117,46 +117,4 @@ public class DeviceInspectOrderServiceImpl implements DeviceInspectOrderService deviceInspectOrderDao.deleteById(id); return ResultVOUtils.success(); } - - @Override - public BaseResponse addByRepairOrderId(String repairOrderId) { - //查询报修单信息 - DeviceRepairOrderEntity deviceRepairOrderEntity = deviceRepairOrderDao.selectByOrderId(repairOrderId); - DeviceInspectOrderEntity orderEntity = new DeviceInspectOrderEntity(); - String orderId = gennerOrderUtils.createStOrderNo(new OrderNoTypeBean(Constant.DEVICE_INSPECT_ORDER, "yyyyMMdd")); - orderEntity.setOrderId(orderId); - orderEntity.setCode(deviceRepairOrderEntity.getCode()); - orderEntity.setDeptCode(deviceRepairOrderEntity.getDeptCode()); - orderEntity.setInvCode(deviceRepairOrderEntity.getInvCode()); - orderEntity.setStatus(0); //状态：新增 - orderEntity.setType(1); //维保类型：报修 - orderEntity.setDeviceStatus(1); //设备状态：正常 - orderEntity.setLastOrderId(repairOrderId); - orderEntity.setCreateTime(new Date()); - orderEntity.setUpdateTime(new Date()); - orderEntity.setCreateUser(customerService.getUserIdStr()); - deviceInspectOrderDao.insert(orderEntity); - return ResultVOUtils.success(); - } - - @Override - public BaseResponse addByPlanOrderId(String planOrderId) { - //查询报修单信息 - DeviceInspectPlanEntity deviceInspectPlanEntity = deviceInspectPlanDao.selectByOrderId(planOrderId); - DeviceInspectOrderEntity orderEntity = new DeviceInspectOrderEntity(); - String orderId = gennerOrderUtils.createStOrderNo(new OrderNoTypeBean(Constant.DEVICE_INSPECT_ORDER, "yyyyMMdd")); - orderEntity.setOrderId(orderId); - orderEntity.setCode(deviceInspectPlanEntity.getCode()); - orderEntity.setDeptCode(deviceInspectPlanEntity.getDeptCode()); - orderEntity.setInvCode(deviceInspectPlanEntity.getInvCode()); - orderEntity.setStatus(0); //状态：新增 - orderEntity.setType(2); //维保类型：计划 - orderEntity.setDeviceStatus(1); //设备状态：正常 - orderEntity.setLastOrderId(planOrderId); - orderEntity.setCreateTime(new Date()); - orderEntity.setUpdateTime(new Date()); - orderEntity.setCreateUser(customerService.getUserIdStr()); - deviceInspectOrderDao.insert(orderEntity); - return ResultVOUtils.success(); - } } diff --git a/src/main/java/com/glxp/api/service/dev/impl/DeviceInspectPlanServiceImpl.java b/src/main/java/com/glxp/api/service/dev/impl/DeviceInspectPlanServiceImpl.java index d26dcefab..96a268cc9 100644 --- a/src/main/java/com/glxp/api/service/dev/impl/DeviceInspectPlanServiceImpl.java +++ b/src/main/java/com/glxp/api/service/dev/impl/DeviceInspectPlanServiceImpl.java @@ -48,8 +48,6 @@ public class DeviceInspectPlanServiceImpl implements DeviceInspectPlanService { @Resource private GennerOrderUtils gennerOrderUtils; @Resource - private DeviceInspectOrderService deviceInspectOrderService; - @Resource private DeviceInspectTaskService deviceInspectTaskService; @Resource private DeviceInspectPlanDelectMapper deviceInspectPlanDelectMapper; diff --git a/src/main/java/com/glxp/api/service/dev/impl/DevicePlanServiceImpl.java b/src/main/java/com/glxp/api/service/dev/impl/DevicePlanServiceImpl.java index a43b93350..0976bad74 100644 --- a/src/main/java/com/glxp/api/service/dev/impl/DevicePlanServiceImpl.java +++ b/src/main/java/com/glxp/api/service/dev/impl/DevicePlanServiceImpl.java @@ -33,10 +33,6 @@ public class DevicePlanServiceImpl extends ServiceImpl pageList(DevicePlanQuery query) { PageHelper.startPage(query.getPage(), query.getLimit()); List list =super.baseMapper.pageVo(query); -// List list = super.list(Wrappers.lambdaQuery(DevicePlanEntity.class) -// .like(StrUtil.isNotBlank(query.getName()), DevicePlanEntity::getName, query.getName()) -// .orderByDesc(DevicePlanEntity::getStartDate) -// ); return list; } diff --git a/src/main/java/com/glxp/api/service/dev/impl/DeviceReceiveOrderDetailServiceImpl.java b/src/main/java/com/glxp/api/service/dev/impl/DeviceReceiveOrderDetailServiceImpl.java index 72b91850f..d64e78590 100644 --- a/src/main/java/com/glxp/api/service/dev/impl/DeviceReceiveOrderDetailServiceImpl.java +++ b/src/main/java/com/glxp/api/service/dev/impl/DeviceReceiveOrderDetailServiceImpl.java @@ -43,8 +43,6 @@ public class DeviceReceiveOrderDetailServiceImpl implements DeviceReceiveOrderDe @Resource private InvProductNewDao invProductNewDao; @Resource - private InvProductDao invProductDao; - @Resource private SystemParamConfigService systemParamConfigService; @Resource private UdiProductService udiProductService; @@ -125,18 +123,7 @@ public class DeviceReceiveOrderDetailServiceImpl implements DeviceReceiveOrderDe } } else { SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey("device_product"); - if (systemParamConfigEntity.getParamValue().equals("0") || addDetailRequest.getType() == 1) { - //TODO 20241017 这个插入设备领用记录详情需要依赖订单详情表先注释了看下要不要用其他方式写 -// //通过选库存添加 -// //查询选中的库存信息 -// for (String invProductId : addDetailRequest.getInvProductIds()) { -// //查询库存详情 -// InvProductNewVo invProductDetailEntities = invProductNewDao.selectById(Integer.valueOf(invProductId)); -// DeviceReceiveOrderDetailEntity orderDetail = getDeviceReceiveOrderDetailEntity(addDetailRequest.getOrderIdFk(), invProductDetailEntities.getCode(), invProductDetailEntities); -// //插入设备领用记录详情 -// deviceReceiveOrderDetailDao.insert(orderDetail); -// } - } else if (systemParamConfigEntity.getParamValue().equals("1") || addDetailRequest.getType() == 3) { + if (systemParamConfigEntity.getParamValue().equals("1") || addDetailRequest.getType() == 3) { for (String invProductId : addDetailRequest.getInvProductIds()) { DeviceReceiveOrderDetailEntity deviceReceiveOrderDetailEntity = new DeviceReceiveOrderDetailEntity(); diff --git a/src/main/java/com/glxp/api/service/dev/impl/DeviceRepairOrderServiceImpl.java b/src/main/java/com/glxp/api/service/dev/impl/DeviceRepairOrderServiceImpl.java index a0e0d2569..5d605c6e6 100644 --- a/src/main/java/com/glxp/api/service/dev/impl/DeviceRepairOrderServiceImpl.java +++ b/src/main/java/com/glxp/api/service/dev/impl/DeviceRepairOrderServiceImpl.java @@ -49,12 +49,8 @@ public class DeviceRepairOrderServiceImpl implements DeviceRepairOrderService { @Resource private GennerOrderUtils gennerOrderUtils; @Resource - private DeviceInspectOrderService deviceInspectOrderService; - @Resource private DeviceInspectTaskService deviceInspectTaskService; @Resource - private DeviceInspectPlanDelectMapper deviceInspectPlanDelectMapper; - @Resource private DeviceInspectTaskDetailService deviceInspectTaskDetailService; @Resource private DeviceRepairOrderDetailMapper deviceRepairOrderDetailMapper; diff --git a/src/main/java/com/glxp/api/service/dev/impl/DeviceUpkeepServiceImpl.java b/src/main/java/com/glxp/api/service/dev/impl/DeviceUpkeepServiceImpl.java index cc929d6a0..507c55507 100644 --- a/src/main/java/com/glxp/api/service/dev/impl/DeviceUpkeepServiceImpl.java +++ b/src/main/java/com/glxp/api/service/dev/impl/DeviceUpkeepServiceImpl.java @@ -104,7 +104,6 @@ public class DeviceUpkeepServiceImpl extends ServiceImpl upkeepDetailList = new ArrayList<>(); List upkeepDetailItemList = new ArrayList<>(); Map> finalItemMap = itemMap; @@ -136,7 +135,6 @@ public class DeviceUpkeepServiceImpl extends ServiceImpl { -// //查询库存信息 -// InvProductEntity invProductEntity = invProductDao.selectById(invProductId); -// //查询库存详情码信息 -// FilterInvProductDetailRequest detailRequest = new FilterInvProductDetailRequest(); -// detailRequest.setRelId(String.valueOf(invProductEntity.getRelIdFk())); -// detailRequest.setBatchNo(invProductEntity.getBatchNo()); -// detailRequest.setDeptCode(invProductEntity.getDeptCode()); -// detailRequest.setInvCode(invProductEntity.getInvCode()); -// detailRequest.setProductionDate(invProductEntity.getProductionDate()); -// detailRequest.setExpireDate(invProductEntity.getExpireDate()); -// List invProductDetailEntities = invProductNewDao.filterInvProductDetailList(detailRequest); -// //提取去重后的码集合 -// List codeList = invProductDetailEntities.stream().map(InvProductNewVo::getCode).distinct().collect(Collectors.toList()); -// //初始化码数量计算集合数据 -// Map codeMap = new HashMap<>(codeList.size()); -// codeList.forEach(code -> codeMap.put(code, 0)); -// //计算当前在库存中的码明细 -// for (InvProductNewVo invProductDetailEntity : invProductDetailEntities) { -// UdiEntity udi = FilterUdiUtils.getUdi(invProductDetailEntity.getCode()); -// if (StrUtil.isNotBlank(udi.getSerialNo())) { -// //有序列号产品，根据产品数量计算即可 -// Integer count = codeMap.get(invProductDetailEntity.getCode()); -// if (invProductDetailEntity.getMainAction().equals(ConstantType.TYPE_OUT)) { -// //出库 -// count = count - 1; -// } else { -// //入库 -// count = count + 1; -// } -// codeMap.put(invProductDetailEntity.getCode(), count); -// } else { -// //无序列号产品条码，直接查询库存，使用此库存信息计算出养护数量 -// int count = invProductEntity.getInCount() - invProductEntity.getOutCount(); -// codeMap.put(invProductDetailEntity.getCode(), count); -// } -// } -// -// //根据库存中的码明细，生成库存养护记录详情 -// for (String code : codeMap.keySet()) { -// if (codeMap.get(code) > 0) { -// //获取库存详情 -// InvProductNewVo invProductDetailEntity = null; -// for (InvProductNewVo detailEntity : invProductDetailEntities) { -// if (detailEntity.getCode().equals(code)) { -// invProductDetailEntity = detailEntity; -// break; -// } -// } -// //生成库存养护记录详情 -// InvMAOrderDetailEntity maOrderDetail = new InvMAOrderDetailEntity(); -// maOrderDetail.setOrderIdFk(addMAOrderDetailRequest.getOrderIdFk()); -// maOrderDetail.setCode(invProductDetailEntity.getCode()); -// maOrderDetail.setRelId(invProductDetailEntity.getRelId()); -// maOrderDetail.setNameCode(invProductDetailEntity.getNameCode()); -// maOrderDetail.setProductionDate(invProductDetailEntity.getProduceDate()); -// maOrderDetail.setExpireDate(invProductDetailEntity.getExpireDate()); -// maOrderDetail.setBatchNo(invProductDetailEntity.getBatchNo()); -// maOrderDetail.setCount(codeMap.get(code)); -// maOrderDetail.setMaStatus(0); -// maOrderDetail.setDeviceStatus(1); -// maOrderDetail.setCreateTime(new Date()); -// if (null != invMAExplanationEntity) { -// maOrderDetail.setRemark(invMAExplanationEntity.getText()); -// } -// invMAOrderDetailDao.insert(maOrderDetail); -// } -// } -// }); -// return ResultVOUtils.success("添加成功"); } @Override diff --git a/src/main/java/com/glxp/api/service/forthird/impl/ForThirdSysApiService.java b/src/main/java/com/glxp/api/service/forthird/impl/ForThirdSysApiService.java index d496e3a3a..cbd9e7371 100644 --- a/src/main/java/com/glxp/api/service/forthird/impl/ForThirdSysApiService.java +++ b/src/main/java/com/glxp/api/service/forthird/impl/ForThirdSysApiService.java @@ -119,7 +119,6 @@ public class ForThirdSysApiService { orderEntity.setUpdateTime(new Date()); orderEntity.setCustomerId("110"); orderEntity.setDeptCode(orderRequest.getDeptCode()); -// orderEntity.setCheckPreInOrders(addOrderRequest.getCheckPreInOrders()); orderEntity.setInvCode(orderRequest.getInvCode()); orderEntity.setOrderType(orderRequest.getOrderType()); orderEntity.setBusType(bussinessTypeEntity.getBusType()); diff --git a/src/main/java/com/glxp/api/service/inout/IoAddInoutService.java b/src/main/java/com/glxp/api/service/inout/IoAddInoutService.java index e7cf6c1ef..81c4bd48e 100644 --- a/src/main/java/com/glxp/api/service/inout/IoAddInoutService.java +++ b/src/main/java/com/glxp/api/service/inout/IoAddInoutService.java @@ -741,12 +741,6 @@ public class IoAddInoutService { orderEntity.setDealStatus(ConstantStatus.ORDER_DEAL_POST); orderService.update(orderEntity); ioCheckInoutService.checkCodeResult(orderEntity.getBillNo()); -// if (checkWebNewType == 0) { -// -// } else { -// dealProcess(orderEntity); -// ioCheckInoutService.checkRightResult(orderEntity.getBillNo()); -// } return ResultVOUtils.success("提交成功！"); } @@ -788,82 +782,6 @@ public class IoAddInoutService { return null; } - - public String checkInvExitSup(IoCodeEntity codeEnttity) { - String supId = checkNorInv(codeEnttity); - if (supId == null) { - return checkPreInv(codeEnttity); - } - return supId; - } - - //查普通库存 todo - public String checkNorInv(IoCodeEntity codeEnttity) { - -// FilterInvWarehouseRequest filterInvWarehouseRequest = new FilterInvWarehouseRequest(); -// filterInvWarehouseRequest.setLevel(1); -// filterInvWarehouseRequest.setAdvanceType(false); -// List invWarehouseEntities = invWarehouseService.filterInvWarehouse(filterInvWarehouseRequest); -// List codes = new ArrayList<>(); -// if (!invWarehouseEntities.isEmpty()) { -// for (InvWarehouseEntity invWarehouseEntity : invWarehouseEntities) { -// codes.add(invWarehouseEntity.getCode()); -// } -// } -// FilterInvProductRequest filterInvProductDetailRequest = new FilterInvProductRequest(); -// filterInvProductDetailRequest.setRelIdFk(codeEnttity.getRelId()); -// filterInvProductDetailRequest.setBatchNo(codeEnttity.getBatchNo()); -// filterInvProductDetailRequest.setInvCodes(codes); -// List invProductEntities = invProductService.filterInvProduct(filterInvProductDetailRequest); -// if (invProductEntities.size() > 0) { -// String supId = invProductEntities.get(0).getSupId(); -// int count = 0; -// for (InvProductEntity invProductEntity : invProductEntities) { -// if (!supId.equals(invProductEntity.getSupId())) { -// return null; -// } -// count = count + (invProductEntity.getInCount() - invProductEntity.getOutCount()); -// } -// if (count > 0) -// return supId; -// } - - return null; - } - - //查寄售库存 todo - public String checkPreInv(IoCodeEntity codeEnttity) { -// FilterInvWarehouseRequest filterInvWarehouseRequest = new FilterInvWarehouseRequest(); -// filterInvWarehouseRequest.setLevel(1); -// filterInvWarehouseRequest.setAdvanceType(true); -// List invWarehouseEntities = invWarehouseService.filterInvWarehouse(filterInvWarehouseRequest); -// List codes = new ArrayList<>(); -// if (!invWarehouseEntities.isEmpty()) { -// for (InvWarehouseEntity invWarehouseEntity : invWarehouseEntities) { -// codes.add(invWarehouseEntity.getCode()); -// } -// } -// FilterInvProductRequest filterInvProductDetailRequest = new FilterInvProductRequest(); -// filterInvProductDetailRequest.setRelIdFk(codeEnttity.getRelId()); -// filterInvProductDetailRequest.setBatchNo(codeEnttity.getBatchNo()); -// filterInvProductDetailRequest.setInvCodes(codes); -// List invProductEntities = invPreProductService.filterInvProduct(filterInvProductDetailRequest); -// if (invProductEntities.size() > 0) { -// String supId = invProductEntities.get(0).getSupId(); -// int count = 0; -// for (InvProductEntity invProductEntity : invProductEntities) { -// if (!supId.equals(invProductEntity.getSupId())) { -// return null; -// } -// count = count + (invProductEntity.getInCount() - invProductEntity.getOutCount()); -// } -// if (count > 0) -// return supId; -// } - - return null; - } - //查询本单是否有重复条码 public String checkOrderRepeatCode(IoCodeTempEntity codeEntity, List filterList) { int count = 0; diff --git a/src/main/java/com/glxp/api/service/inout/IoChangeInoutService.java b/src/main/java/com/glxp/api/service/inout/IoChangeInoutService.java index 8d3ff8c37..93b59a10f 100644 --- a/src/main/java/com/glxp/api/service/inout/IoChangeInoutService.java +++ b/src/main/java/com/glxp/api/service/inout/IoChangeInoutService.java @@ -72,13 +72,6 @@ public class IoChangeInoutService { //结束，不生成库存， } - - //后续做修改 - public void changeBusOrder(IoOrderEntity orderEntity) { - - } - - //普通出入库单据流转 public void genNewOrder(IoOrderEntity orderEntity) { @@ -208,7 +201,6 @@ public class IoChangeInoutService { } else { // 原先单据流程 filterSupMaps.put("test", useInList); -// filterSupMaps.put(bussinessChangeTypeEntity.getDefaultInvCode(), useInList); } //根据往来单位生成入库单 for (String corpName : filterSupMaps.keySet()) { @@ -258,9 +250,6 @@ public class IoChangeInoutService { outOrder.setCustomerId(corpName); outOrder.setFromCorp(corpName); } - //原先流程---使用流转单据默认仓库 -// outOrder.setFromInvCode(bussinessChangeTypeEntity.getDefaultInvCode()); -// outOrder.setFromDeptCode(bussinessChangeTypeEntity.getDefaultDeptCode()); } else { //向上级补单模式 outOrder.setCustomerId(Constant.SYSTEM_CUSTOMER_ID); @@ -276,17 +265,9 @@ public class IoChangeInoutService { InvWarehouseEntity fromInv = invWarehouseService.findByInvSubByCode(bussinessChangeTypeEntity.getDefaultInvCode()); outOrder.setFromDeptCode(fromInv.getParentId()); } - //原先流程---使用流转单据默认仓库 -// outOrder.setFromInvCode(bussinessChangeTypeEntity.getDefaultInvCode()); -// outOrder.setFromDeptCode(bussinessChangeTypeEntity.getDefaultDeptCode()); outOrder.setFromCorp(null); } outOrder.setCorpOrderId(CustomUtil.getId() + "x"); - //原先流程---使用流转单据默认仓库 -// InvWarehouseEntity invWarehouseEntity = invWarehouseService.findByInvSubByCode(bussinessChangeTypeEntity.getInvCode()); -// outOrder.setInvCode(invWarehouseEntity.getCode()); -// outOrder.setDeptCode(invWarehouseEntity.getParentId()); - InvWarehouseEntity invWarehouseEntity = invWarehouseService.findByInvSubByCode(orderEntity.getInvCode()); outOrder.setInvCode(invWarehouseEntity.getCode()); outOrder.setDeptCode(invWarehouseEntity.getParentId()); diff --git a/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java b/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java index 09c4912f8..cdbf37eff 100644 --- a/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java +++ b/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java @@ -412,45 +412,6 @@ public class IoCheckInoutService { @Resource BasicSkPrescribeDiService basicSkPrescribeDiService; - /** - * 单据类型是否校验处方(边扫边校验） - */ - public String checkPrescribeDi(IoCodeTempEntity codeEntity, String adNum) { - BasicSkPrescribeDiEntity basicSkPrescribeDiEntity = basicSkPrescribeDiService.findByRelId(adNum, codeEntity.getRelId()); - IoOrderDetailCodeEntity orderDetailCodeEntity = orderDetailCodeService.findByUnique(codeEntity.getOrderId(), codeEntity.getRelId(), codeEntity.getBatchNo(), codeEntity.getPrice()); - int curCount = 0; - if (orderDetailCodeEntity != null) { - curCount = orderDetailCodeEntity.getReCount() + codeEntity.getMyReCount(); - } else { - curCount = codeEntity.getMyReCount(); - } - if (curCount > IntUtil.value(basicSkPrescribeDiEntity.getCount())) { - return "当前产品数量超出！"; - } - return null; - } - - @Resource - IoOrderSkPrescribeService orderSkPrescribeService; - - /** - * 单据提交后，保存处方校验结果 - */ - public void checkUploadPrescribe(IoOrderEntity orderEntity) { - List orderDetailCodeEntities = orderDetailCodeService.findByOrderId(orderEntity.getBillNo()); - List basicSkPrescribeDiResponses = checkPrescirbe(orderDetailCodeEntities, orderEntity); - - orderSkPrescribeService.remove(new QueryWrapper().eq("orderIdFk", orderEntity.getBillNo())); - if (CollUtil.isNotEmpty(basicSkPrescribeDiResponses)) { - for (BasicSkPrescribeDiResponse basicSkPrescribeDiResponse : basicSkPrescribeDiResponses) { - IoOrderSkPrescribeEntity orderSkPrescribeEntity = new IoOrderSkPrescribeEntity(); - BeanUtils.copyProperties(basicSkPrescribeDiResponse, orderSkPrescribeEntity); - orderSkPrescribeEntity.setOrderIdFk(orderEntity.getBillNo()); - orderSkPrescribeService.save(orderSkPrescribeEntity); - } - } - } - /** * 单据类型是否校验处方(单据提交时校验） @@ -738,7 +699,6 @@ public class IoCheckInoutService { } //更新扫码详情表 orderDetailCodeDao.updateBatchById(orderDetailCodeEntities); -// orderDetailCodeService.update() codeTempService.deleteByBillNo(orderEntity.getBillNo()); orderEntity.setErrMsg("校验成功！"); orderEntity.setStatus(ConstantStatus.ORDER_STATUS_CHECK_SUCCESS); @@ -1193,8 +1153,6 @@ public class IoCheckInoutService { IoChangeInoutService changeInoutService; @Resource InvPreinProductDetailService invPreinProductDetailService; - @Resource - UdiCalCountUtil udiCalCountUtil; //校验完成后生成库存 public void genInv(IoOrderEntity orderEntity, BasicBussinessTypeEntity bussinessTypeEntity) { diff --git a/src/main/java/com/glxp/api/service/inout/IoCheckInvService.java b/src/main/java/com/glxp/api/service/inout/IoCheckInvService.java index 0fa4cf554..de13640c3 100644 --- a/src/main/java/com/glxp/api/service/inout/IoCheckInvService.java +++ b/src/main/java/com/glxp/api/service/inout/IoCheckInvService.java @@ -117,7 +117,6 @@ public class IoCheckInvService { return ResultVOUtils.error(500, "当前库存不足"); } } - } else { int exitCount = IntUtil.value(codeTempService.selectExitCount(codeTempEntity.getOrderId(), codeTempEntity.getBatchNo(), codeTempEntity.getRelId(), codeTempEntity.getSupId())); if (isEdit) { @@ -190,10 +189,6 @@ public class IoCheckInvService { } else return ResultVOUtils.error(500, "预验收库存数量不足！"); } else { -// if (StrUtil.isNotEmpty(invPreinDetailEntity.getBatchNo()) && StrUtil.isNotEmpty(codeTempEntity.getBatchNo()) -// && !invPreinDetailEntity.getBatchNo().equals(codeTempEntity.getBatchNo())) { -// return ResultVOUtils.error(500, "当前批次号与预验收录入批次号不匹配！"); -// } if (StrUtil.isNotEmpty(codeTempEntity.getOrderId())) {//非首次添加 if (StrUtil.isEmpty(codeTempEntity.getSerialNo())) {//该单据已有该产品 //无序列号，则可能存在多个预验收入库单 diff --git a/src/main/java/com/glxp/api/service/inout/IoCodeTempService.java b/src/main/java/com/glxp/api/service/inout/IoCodeTempService.java index dc537e1d2..6f2acdca0 100644 --- a/src/main/java/com/glxp/api/service/inout/IoCodeTempService.java +++ b/src/main/java/com/glxp/api/service/inout/IoCodeTempService.java @@ -319,10 +319,6 @@ public class IoCodeTempService { PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(pageInfo.getList()); -// ArrayList ioCodeTempResponses = new ArrayList<>(); -// ioCodeTempResponses.addAll(ioCodeResponses.stream() -// .map(ioCodeResponse -> convertToIoCodeTempResponse(ioCodeResponse)) -// .collect(Collectors.toList())); return ResultVOUtils.success(pageSimpleResponse); } @@ -343,11 +339,4 @@ public class IoCodeTempService { .eq(IoCodeTempEntity::getGroupNumber,groupNumber) ); } - - -// public IoCodeTempResponse convertToIoCodeTempResponse(IoCodeResponse response) { -// IoCodeTempResponse tempResponse = new IoCodeTempResponse(); -// BeanUtils.copyProperties(response,tempResponse); -// return tempResponse; -// } } diff --git a/src/main/java/com/glxp/api/service/inout/IoGenInvService.java b/src/main/java/com/glxp/api/service/inout/IoGenInvService.java index df74fda48..e6bcaf82e 100644 --- a/src/main/java/com/glxp/api/service/inout/IoGenInvService.java +++ b/src/main/java/com/glxp/api/service/inout/IoGenInvService.java @@ -131,65 +131,6 @@ public class IoGenInvService { } - //生成用户普通库存 - public void genNorInvUser(String orderId) { - IoOrderEntity orderEntity = orderService.findByBillNo(orderId); - List orderDetailResultEntities = orderDetailResultService.findByOrderId(orderId); - List codeEnttities = codeService.findByOrderId(orderId); - - //生成库存产品表 - for (IoOrderDetailResultEntity orderDetailResultEntity : orderDetailResultEntities) { - InvUserProductEntity invUserProductEntity = invUserProductService.selectByUnique(orderDetailResultEntity.getBindRlFk(), orderDetailResultEntity.getBatchNo(), orderDetailResultEntity.getSupId(), orderEntity.getDeptCode(), orderEntity.getInvCode(), orderEntity.getCreateUser(), ConstantStatus.ACTION_TYPE_NORMAL); - if (invUserProductEntity == null) { - invUserProductEntity = new InvUserProductEntity(); - invUserProductEntity.setRelIdFk(orderDetailResultEntity.getBindRlFk()); - invUserProductEntity.setNameCode(orderDetailResultEntity.getNameCode()); - invUserProductEntity.setBatchNo(orderDetailResultEntity.getBatchNo()); - invUserProductEntity.setProductionDate(orderDetailResultEntity.getProductDate()); - invUserProductEntity.setExpireDate(orderDetailResultEntity.getExpireDate()); - invUserProductEntity.setInCount(0); - invUserProductEntity.setType(ConstantStatus.ACTION_TYPE_NORMAL); - invUserProductEntity.setOutCount(0); - invUserProductEntity.setSupId(orderDetailResultEntity.getSupId()); - invUserProductEntity.setDeptCode(orderEntity.getDeptCode()); - invUserProductEntity.setInvCode(orderEntity.getInvCode()); - invUserProductEntity.setCreateTime(new Date()); - invUserProductEntity.setUpdateTime(new Date()); - invUserProductService.addInvUserProduct(invUserProductEntity); - } - - if (orderEntity.getMainAction().equals(ConstantType.TYPE_OUT)) { - invUserProductEntity.setOutCount(invUserProductEntity.getOutCount() + orderDetailResultEntity.getReCount()); - } else if (orderEntity.getMainAction().equals(ConstantType.TYPE_PUT)) { - invUserProductEntity.setInCount(invUserProductEntity.getInCount() + orderDetailResultEntity.getReCount()); - } - invUserProductEntity.setReCount(invUserProductEntity.getInCount() - invUserProductEntity.getOutCount()); - invUserProductEntity.setUpdateTime(new Date()); - invUserProductService.updateInvUserProduct(invUserProductEntity); - } - - //生成库存码详情 - List invUserProductDetailEntityList = new ArrayList<>(); - for (IoCodeEntity codeEntity : codeEnttities) { - InvUserProductDetailEntity invUserProductDetailEntity = new InvUserProductDetailEntity(); - BeanUtils.copyProperties(codeEntity, invUserProductDetailEntity); - invUserProductDetailEntity.setRelId(codeEntity.getRelId()); - invUserProductDetailEntity.setUpdateTime(new Date()); - invUserProductDetailEntity.setId(null); - invUserProductDetailEntity.setInvSpaceCode(codeEntity.getWarehouseCode()); - invUserProductDetailEntity.setPurchaseType(ConstantStatus.PRUCHASE_COMMON); - if (invUserProductDetailEntity.getMainAction().equals(ConstantType.TYPE_PUT)) { - invUserProductDetailEntity.setInCount(invUserProductDetailEntity.getReCount()); - } else if (invUserProductDetailEntity.getMainAction().equals(ConstantType.TYPE_OUT)) { - invUserProductDetailEntity.setOutCount(invUserProductDetailEntity.getReCount()); - } - invUserProductDetailEntityList.add(invUserProductDetailEntity); - } - - invUserProductDetailService.addInvUserProductDetailList(invUserProductDetailEntityList); - } - - @Resource InvPreProductService invPreProductService; @Resource @@ -406,66 +347,6 @@ public class IoGenInvService { } - //生成用户预验收库存 - public void genUserPreInInv(String orderId) { - - - IoOrderEntity orderEntity = orderService.findByBillNo(orderId); - List orderDetailResultEntities = orderDetailResultService.findByOrderId(orderId); - List codeEnttities = codeService.findByOrderId(orderId); - //生成库存产品表 - for (IoOrderDetailResultEntity orderDetailResultEntity : orderDetailResultEntities) { - InvUserProductEntity invUserProductEntity = invUserProductService.selectByUnique(orderDetailResultEntity.getBindRlFk(), orderDetailResultEntity.getBatchNo(), orderDetailResultEntity.getSupId(), orderEntity.getDeptCode(), orderEntity.getInvCode(), orderEntity.getCreateUser(), ConstantStatus.ACTION_TYPE_ADVANCE); - if (invUserProductEntity == null) { - invUserProductEntity = new InvUserProductEntity(); - invUserProductEntity.setRelIdFk(orderDetailResultEntity.getBindRlFk()); - invUserProductEntity.setNameCode(orderDetailResultEntity.getNameCode()); - invUserProductEntity.setBatchNo(orderDetailResultEntity.getBatchNo()); - invUserProductEntity.setProductionDate(orderDetailResultEntity.getProductDate()); - invUserProductEntity.setExpireDate(orderDetailResultEntity.getExpireDate()); - invUserProductEntity.setInCount(0); - invUserProductEntity.setType(ConstantStatus.ACTION_TYPE_ADVANCE); - invUserProductEntity.setOutCount(0); - invUserProductEntity.setSupId(orderDetailResultEntity.getSupId()); - invUserProductEntity.setDeptCode(orderEntity.getDeptCode()); - invUserProductEntity.setInvCode(orderEntity.getInvCode()); - invUserProductEntity.setCreateTime(new Date()); - invUserProductEntity.setUpdateTime(new Date()); - invUserProductService.addInvUserProduct(invUserProductEntity); - } - - if (orderEntity.getMainAction().equals(ConstantType.TYPE_OUT)) { - invUserProductEntity.setOutCount(invUserProductEntity.getOutCount() + orderDetailResultEntity.getReCount()); - } else if (orderEntity.getMainAction().equals(ConstantType.TYPE_PUT)) { - invUserProductEntity.setInCount(invUserProductEntity.getInCount() + orderDetailResultEntity.getReCount()); - } - invUserProductEntity.setReCount(invUserProductEntity.getInCount() - invUserProductEntity.getOutCount()); - invUserProductEntity.setUpdateTime(new Date()); - invUserProductService.updateInvUserProduct(invUserProductEntity); - } - - //生成库存码详情 - List invUserProductDetailEntityList = new ArrayList<>(); - for (IoCodeEntity codeEntity : codeEnttities) { - InvUserProductDetailEntity invUserProductDetailEntity = new InvUserProductDetailEntity(); - BeanUtils.copyProperties(codeEntity, invUserProductDetailEntity); - invUserProductDetailEntity.setRelId(codeEntity.getRelId()); - invUserProductDetailEntity.setUpdateTime(new Date()); - invUserProductDetailEntity.setId(null); - invUserProductDetailEntity.setInvSpaceCode(codeEntity.getWarehouseCode()); - invUserProductDetailEntity.setPurchaseType(ConstantStatus.PRUCHASE_COMMON); - if (invUserProductDetailEntity.getMainAction().equals(ConstantType.TYPE_PUT)) { - invUserProductDetailEntity.setInCount(invUserProductDetailEntity.getReCount()); - } else if (invUserProductDetailEntity.getMainAction().equals(ConstantType.TYPE_OUT)) { - invUserProductDetailEntity.setOutCount(invUserProductDetailEntity.getReCount()); - } - invUserProductDetailEntityList.add(invUserProductDetailEntity); - } - - invUserProductDetailService.addInvUserProductDetailList(invUserProductDetailEntityList); - - - } } diff --git a/src/main/java/com/glxp/api/service/inout/IoOrderDetailBizService.java b/src/main/java/com/glxp/api/service/inout/IoOrderDetailBizService.java index 2ac2df98f..8a18f92dc 100644 --- a/src/main/java/com/glxp/api/service/inout/IoOrderDetailBizService.java +++ b/src/main/java/com/glxp/api/service/inout/IoOrderDetailBizService.java @@ -43,11 +43,6 @@ public interface IoOrderDetailBizService { List filterList(FilterOrderDetailBizRequest orderDetailBizRequest); - List getfilterList(FilterOrderDetailCodeRequest orderDetailBizRequest); - - - IoOrderDetailBizEntity selectByBatchNoAndBindRlFk(String batchNo, String bindRlFk); - List checkOrderList(String orderId); List filterListInv(FilterOrderDetailBizRequest orderDetailBizRequest); diff --git a/src/main/java/com/glxp/api/service/inout/IoOrderDetailCodeService.java b/src/main/java/com/glxp/api/service/inout/IoOrderDetailCodeService.java index f4521f1a5..bb230d6a6 100644 --- a/src/main/java/com/glxp/api/service/inout/IoOrderDetailCodeService.java +++ b/src/main/java/com/glxp/api/service/inout/IoOrderDetailCodeService.java @@ -41,7 +41,7 @@ public interface IoOrderDetailCodeService { */ int deleteByOrderId(String orderId); - public List checkOrderList(String orderId, String productName); + List checkOrderList(String orderId, String productName); boolean isExit(String orderId); diff --git a/src/main/java/com/glxp/api/service/inout/IoOrderMutiSetService.java b/src/main/java/com/glxp/api/service/inout/IoOrderMutiSetService.java index 8f6783bc4..a4af2815f 100644 --- a/src/main/java/com/glxp/api/service/inout/IoOrderMutiSetService.java +++ b/src/main/java/com/glxp/api/service/inout/IoOrderMutiSetService.java @@ -11,8 +11,4 @@ public interface IoOrderMutiSetService extends IService{ List filterList(IoOrderMutiSetRequest ioOrderMutiSetRequest); - - - - } diff --git a/src/main/java/com/glxp/api/service/inout/IoOrderService.java b/src/main/java/com/glxp/api/service/inout/IoOrderService.java index d7fc7f205..ab41a71ea 100644 --- a/src/main/java/com/glxp/api/service/inout/IoOrderService.java +++ b/src/main/java/com/glxp/api/service/inout/IoOrderService.java @@ -65,8 +65,6 @@ public interface IoOrderService { */ List filterList(FilterOrderRequest filterOrderRequest); - List getfilterList(FilterOrderRequest filterOrderRequest); - List getfilterOrderList(FilterOrderRequest filterOrderRequest); /** @@ -138,9 +136,6 @@ public interface IoOrderService { */ BaseResponse submitToThrSys(String billNo); - - boolean isExitByAction(String action); - List findAllByAction(String action); /** @@ -153,16 +148,11 @@ public interface IoOrderService { List selectList(Long userId); - List selectOrderIdList(@Param("data") String data); - void updateOrderInventory(String billNo, Integer status); - IoOrderEntity findCorpOrderId(String billNo); - IoOrderResponse findByWorkPlaceCode(String workPlaceCode,String getWorkPlaceQueueCode,Long UserId); - String selectAliYljgSearchbillByAliBillNo(String key); } diff --git a/src/main/java/com/glxp/api/service/inout/IoSplitCodeService.java b/src/main/java/com/glxp/api/service/inout/IoSplitCodeService.java index b2943eb54..04043300b 100644 --- a/src/main/java/com/glxp/api/service/inout/IoSplitCodeService.java +++ b/src/main/java/com/glxp/api/service/inout/IoSplitCodeService.java @@ -268,7 +268,6 @@ public class IoSplitCodeService extends ServiceImpl invIdFks) { - return splitFifoCodeMapper.selectOne( - new LambdaQueryWrapper() - .eq(IoSplitFifoCodeEntity::getCode, code) - .in(IoSplitFifoCodeEntity::getInvIdFk, invIdFks) - .last("limit 1") - ); - } - - /** * 库存量提醒 * @@ -338,92 +328,6 @@ public class IoSplitFifoCodeService extends ServiceImpl ioSplitCodeResponses = this.baseMapper.filterGroupList(splitFifoCodeRequest); -// if (CollUtil.isEmpty(ioSplitCodeResponses)) return; -// Map> splitMap = ioSplitCodeResponses.stream().collect(Collectors.groupingBy(IoSplitCodeResponse::getRelId)); -// -// //2.遍历当前工位待处理的单据，根据orderTime排序 -// CollectOrderRequest collectOrderRequest = new CollectOrderRequest(); -// collectOrderRequest.setWorkPlaceCode(workPaceCode); -// collectOrderRequest.setTagStatus(1); -// List orderList = collectOrderMapper.filterList(collectOrderRequest); -// if (CollUtil.isEmpty(orderList)) return; -// -// //3.为每个单据底下的单据详情分配数量 -// for (int i = 0; i < orderList.size(); i++) { -// IoCollectOrderResponse order = orderList.get(i); -// CollectOrderBizRequest bizRequest = new CollectOrderBizRequest(); -// bizRequest.setOrderIdFk(String.valueOf(order.getBillNo())); -// List bizList = collectOrderBizMapper.filterList(bizRequest); -// if (CollUtil.isNotEmpty(bizList)) { -// //自动分配 工位存量、更新splitMap、更新 bizList上的 缺少存量数 -// Integer invAlert = autoAllocationWorkPace(splitMap, bizList); -// collectOrderMapper.updateInvAlert(order.getId(), invAlert); -// } -// } -// -// } - -// /** -// * 自动分配 工位存量、更新splitMap、更新 bizList上的 缺少存量数 -// * -// * @param splitMap -// * @param bizList -// */ -// @Transactional(rollbackFor = Exception.class) -// Integer autoAllocationWorkPace(Map> splitMap, List bizList) { -// Integer invAlert = 1; -// for (int i = 0; i < bizList.size(); i++) { -// CollectOrderBizResponse collectOrderBizResponse = bizList.get(i); -// Long relId = collectOrderBizResponse.getRelId(); -// String batchNo = collectOrderBizResponse.getBatchNo(); -// Integer count = collectOrderBizResponse.getCount(); //当前明细 需要的数量 -// Long bizId = collectOrderBizResponse.getId(); -// -// List ioSplitCodeResponses = splitMap.get(relId); -// List newioSplitCodeResponses = new ArrayList<>(ioSplitCodeResponses.size()); -// -// if (CollUtil.isNotEmpty(ioSplitCodeResponses)) { -// for (int j = 0; j < ioSplitCodeResponses.size(); j++) { -// IoSplitCodeResponse ioSplit = ioSplitCodeResponses.get(j); -// Integer totalCount = ioSplit.getTotalCount(); -// if ((StrUtil.isBlank(batchNo) || batchNo.equals(ioSplit.getBatchNo())) && count > 0 && totalCount > 0) { -// Integer resCount = totalCount - count;//预分配后剩余 工位存量 -// if (resCount >= 0) {//足够分配 -// count = 0; -// ioSplit.setTotalCount(resCount); -// } else {//不够分配 -// count = -resCount; -// ioSplit.setTotalCount(0); -// } -// } -// newioSplitCodeResponses.add(ioSplit); -// } -// -// splitMap.put(relId, newioSplitCodeResponses); -// } -// -// if (count > 0) {//不够分配 -// collectOrderBizMapper.updateAutoResCount(bizId, -count); -// invAlert = 2; -// } else { -// collectOrderBizMapper.updateAutoResCount(bizId, collectOrderBizResponse.getCount()); -// } -// } -// -// return invAlert; -// } - @Transactional(rollbackFor = Exception.class) Integer autoAllocationBillNoInv(Map> splitMap, List bizList) { Integer invAlert = 1; @@ -537,20 +441,6 @@ public class IoSplitFifoCodeService extends ServiceImpl().eq(IoSplitFifoCodeEntity::getWorkPlaceQueueCode, code).last("limit 1")); - } - - //判断当前工位底下是否有其他产品 - public List findByRelId(Long workPlaceCode, Long relId) { - return list(new LambdaQueryWrapper() - .eq(IoSplitFifoCodeEntity::getWorkPlaceCode, workPlaceCode) - .eq(IoSplitFifoCodeEntity::getRelId, relId) - .last("limit 1")); - } - public List getCodeList(String workPlaceQueueCode) { List list = this.list(new LambdaQueryWrapper() .select(IoSplitFifoCodeEntity::getCode) diff --git a/src/main/java/com/glxp/api/service/inout/IoSplitFifoInvService.java b/src/main/java/com/glxp/api/service/inout/IoSplitFifoInvService.java index 9498e8eff..f31f0fdab 100644 --- a/src/main/java/com/glxp/api/service/inout/IoSplitFifoInvService.java +++ b/src/main/java/com/glxp/api/service/inout/IoSplitFifoInvService.java @@ -113,7 +113,6 @@ public class IoSplitFifoInvService extends ServiceImpl buildQueryWrapper(IoOrderDetailStatRsponse ioOrderDetailResultEntity, DateTime lastMonth) { - QueryWrapper wrapper = new QueryWrapper<>(); - if (lastMonth.monthBaseOne() == 1) { - //当前汇总的记录为1月，上一月份的时间取前一年的12月 - wrapper.eq("year", lastMonth.year() - 1) - .eq("month", 12); - } else { - wrapper.eq("year", lastMonth.year()) - .eq("month", lastMonth.monthBaseOne() - 1);//取上上月的数据 - } - - wrapper.eq("relIdFk", ioOrderDetailResultEntity.getBindRlFk()); - wrapper.eq(StrUtil.isNotBlank(ioOrderDetailResultEntity.getDeptCode()), "deptCode", ioOrderDetailResultEntity.getDeptCode()); - wrapper.eq(StrUtil.isNotBlank(ioOrderDetailResultEntity.getBatchNo()), "batchNo", ioOrderDetailResultEntity.getBatchNo()); - wrapper.eq(StrUtil.isNotBlank(ioOrderDetailResultEntity.getNameCode()), "nameCode", ioOrderDetailResultEntity.getNameCode()) - .eq(StrUtil.isNotBlank(ioOrderDetailResultEntity.getNameCode()), "invCode", ioOrderDetailResultEntity.getInvCode()); - return wrapper; - } - } diff --git a/src/main/java/com/glxp/api/service/inout/PlatformService.java b/src/main/java/com/glxp/api/service/inout/PlatformService.java index 7b598b769..2ca4b97c7 100644 --- a/src/main/java/com/glxp/api/service/inout/PlatformService.java +++ b/src/main/java/com/glxp/api/service/inout/PlatformService.java @@ -15,11 +15,11 @@ import java.util.Map; public interface PlatformService { - public int save(PlatformEntity platformEntity); + int save(PlatformEntity platformEntity); - public int remove(String id); + int remove(String id); - public BaseResponse update(PlatformEntity platformEntity); + BaseResponse update(PlatformEntity platformEntity); List list(Map map); @@ -87,21 +87,11 @@ public interface PlatformService { * @param platformLinkRequest * @return */ - public String verifyUnitMaintainPlatform(PlatformLinkRequest platformLinkRequest); - - /** - * 查询关联数据 - * - * @param customerId - * @param action - * @param unitId - * @return - */ - UnitMaintainPlatformEntity findLinkData(long customerId, String action, String unitId); + String verifyUnitMaintainPlatform(PlatformLinkRequest platformLinkRequest); /** * 获取客户关联详情 - * @param platformId + * @param platformLinkRequest * @return */ List selectDelectList(PlatformLinkRequest platformLinkRequest); diff --git a/src/main/java/com/glxp/api/service/inout/impl/ExcelServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/ExcelServiceImpl.java index 004eedce7..10329fa49 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/ExcelServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inout/impl/ExcelServiceImpl.java @@ -116,27 +116,6 @@ public class ExcelServiceImpl implements ExcelService { */ @Override public void excelSheetExport(HttpServletResponse response) { -// try { -// //构建多集合集合 -// List> lists = new ArrayList<>(); -// lists.add(structureDate(10)); -// lists.add(structureDate(20)); -// lists.add(structureDate(30)); -// lists.add(structureDate(40)); -// lists.add(structureDate(50)); -// lists.add(structureDate(60)); -// //Sheet页初始化 -// Map clazzMap = new HashMap<>(); -// clazzMap.put(0, "一年级成绩表"); -// clazzMap.put(1, "二年级成绩表"); -// clazzMap.put(2, "三年级成绩表"); -// clazzMap.put(3, "四年级成绩表"); -// clazzMap.put(4, "五年级成绩表"); -// clazzMap.put(5, "六年级成绩表"); -// excelHandler.exportExcels(response, Collections.singletonList(lists), clazzMap, "excel导出-单sheet"); -// } catch (Exception e) { -// throw new RenException("导出失败"); -// } } /** @@ -146,19 +125,7 @@ public class ExcelServiceImpl implements ExcelService { */ @Override public void excelTemplate(HttpServletResponse response) { -// try { -// //准备数据 -// JSONObject obj = new JSONObject(); -// obj.put("date","2022年"); -// obj.put("season","秋季"); -// obj.put("user","王远"); -// obj.put("userDate",new Date()); -// List list = structureDate(20); -// excelHandler.exportTemplateExcels(response,list,obj, ExcelTemplateEnum.TEMPLATE_1.getDesc(),ExcelTemplateEnum.TEMPLATE_1.getDesc()); -// }catch (Exception e){ -// log.error("导出错误：{}", e.getMessage()); -// throw new RenException("导出错误"); -// } + } /** @@ -168,14 +135,6 @@ public class ExcelServiceImpl implements ExcelService { */ @Override public void excelSheetTemplate(HttpServletResponse response) throws Exception { -// 准备数据 -// JSONObject obj = new JSONObject(); -// obj.put("date","2022年"); -// obj.put("season","秋季"); -// obj.put("user","王远"); -// obj.put("userDate",new Date()); -// List list = structureDate(20); -// excelHandler.exportSheetTemplateExcels(response,list,list,obj,obj, ExcelTemplateEnum.TEMPLATE_1.getDesc(),ExcelTemplateEnum.TEMPLATE_1.getDesc()); } /** diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoCodeLostServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/IoCodeLostServiceImpl.java index 11d286fe3..2f95c9f9c 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/IoCodeLostServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inout/impl/IoCodeLostServiceImpl.java @@ -42,9 +42,6 @@ public class IoCodeLostServiceImpl extends ServiceImpl data = skSickerMapper.getSkSickerList(filterSkSiackerListRequest); return data; } diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailBizServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailBizServiceImpl.java index 63d66f047..107d7dec2 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailBizServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailBizServiceImpl.java @@ -58,8 +58,6 @@ public class IoOrderDetailBizServiceImpl implements IoOrderDetailBizService { @Lazy IoOrderDetailBizDao ioOrderDetailBizDao; @Resource - SystemParamConfigService systemParamConfigService; - @Resource CustomerService customerService; @Resource private IBasicBussinessTypeService basicBussinessTypeService; @@ -68,8 +66,6 @@ public class IoOrderDetailBizServiceImpl implements IoOrderDetailBizService { @Resource GennerOrderUtils gennerOrderUtils; @Resource - BasicSkProjectService basicSkProjectService; - @Resource private UdiRelevanceService udiRelevanceService; @Resource IoOrderDetailBizService orderDetailBizService; @@ -171,17 +167,6 @@ public class IoOrderDetailBizServiceImpl implements IoOrderDetailBizService { return ioOrderDetailBizDao.filterList(orderDetailBizRequest); } - @Override - public List getfilterList(FilterOrderDetailCodeRequest OrderDetailCodeRequest) { - if (null == OrderDetailCodeRequest) { - return Collections.emptyList(); - } - if (null != OrderDetailCodeRequest.getPage() && null != OrderDetailCodeRequest.getLimit()) { - PageHelper.offsetPage((OrderDetailCodeRequest.getPage() - 1) * OrderDetailCodeRequest.getLimit(), OrderDetailCodeRequest.getLimit()); - } - return ioOrderDetailBizDao.getfilterList(OrderDetailCodeRequest); - } - @Override public List getInvoicResultDetail(FilterOrderDetailCodeRequest OrderDetailCodeRequest) { if (null == OrderDetailCodeRequest) { @@ -200,8 +185,6 @@ public class IoOrderDetailBizServiceImpl implements IoOrderDetailBizService { @Override public IoOrderEntity addWarlockBagProduct(AddWarlockBagProductReqeust addWarlockBagProductReqeust) { - SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey("vail_product_cert"); -// boolean isVailCert = systemParamConfigEntity.getParamValue().equals("1") ? true : false; AuthAdmin authAdmin = customerService.getUserBean(); if (addWarlockBagProductReqeust.getId() == null) throw new JsonException("未选择术式组套信息"); @@ -289,18 +272,6 @@ public class IoOrderDetailBizServiceImpl implements IoOrderDetailBizService { } } -// if (bussinessTypeEntity.getCheckVailDate() != 4) { -// if (bussinessTypeEntity.getRequireScanCode() == 1) { -// if (udiRelevanceResponse.getRequireScanCode() != 1){ -// throw new JsonException("单据只允许录入需要扫码耗材" + ",请检查后重试！"); -// } -// }else if (bussinessTypeEntity.getRequireScanCode() == 0){ -// if (udiRelevanceResponse.getRequireScanCode() != 0){ -// throw new JsonException("单据只允许录入不需要扫码耗材" + ",请检查后重试！"); -// } -// } -// } - if (bussinessTypeEntity != null && udiRelevanceResponse != null) { //是否校验耗材材质 1：高值耗材；2.普通耗材 if (IntUtil.value(bussinessTypeEntity.getVailHcType()) == 1) { @@ -375,19 +346,6 @@ public class IoOrderDetailBizServiceImpl implements IoOrderDetailBizService { return ioOrderDetailBizDao.orderOutRecordPage(orderDetailBizRequest); } - @Override - public IoOrderDetailBizEntity selectByBatchNoAndBindRlFk(String batchNo, String bindRlFk) { - QueryWrapper ew = new QueryWrapper<>(); - if (StrUtil.isNotEmpty(batchNo)) { - ew.eq("batchNo", batchNo); - } - if (StrUtil.isNotEmpty(bindRlFk)) { - ew.eq("bindRlFk", bindRlFk); - } - IoOrderDetailBizEntity ioOrderDetailBizEntity = ioOrderDetailBizDao.selectOne(ew.last("limit 1")); - return ioOrderDetailBizEntity; - } - @Override public BaseResponse addBizProduct(AddBizProductReqeust addBizProductReqeust) { // SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey("vail_product_cert"); diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailCodeServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailCodeServiceImpl.java index abc1b708d..480060e9c 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailCodeServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailCodeServiceImpl.java @@ -169,10 +169,7 @@ public class IoOrderDetailCodeServiceImpl implements IoOrderDetailCodeService { @Override public List finishBizDetail(List orders ) { LambdaQueryWrapper lw = new LambdaQueryWrapper<>(); -// String keyWords = finishBizRequest.getKeyWords(); -// lw.apply(StrUtil.isNotBlank(keyWords),"( coName LIKE concat('%', {0}, '%') or spec LIKE concat('%', {0}, '%') or batchNo LIKE concat('%', {0}, '%')) ",keyWords); lw.in(IoOrderDetailCodeEntity::getOrderIdFk,orders); - return ioOrderDetailCodeDao.selectList(lw); } diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoOrderInvoiceService.java b/src/main/java/com/glxp/api/service/inout/impl/IoOrderInvoiceService.java index f72f4ef6a..46186ca45 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/IoOrderInvoiceService.java +++ b/src/main/java/com/glxp/api/service/inout/impl/IoOrderInvoiceService.java @@ -55,20 +55,6 @@ public class IoOrderInvoiceService extends ServiceImpl orderInvoiceEntities = selectOrderInvoice(orderInvoiceRequest); - if (CollUtil.isNotEmpty(orderInvoiceEntities)) { - orderDetailCodeEntity.setRegStatus(true); - } else { - orderDetailCodeEntity.setRegStatus(false); - } - orderDetailCodeDao.updateById(orderDetailCodeEntity); - return true; - } - public IoOrderResponse findRegStausByBillNo(IoOrderResponse orderResponse) { List orderInvoiceEntities = ioOrderInvoiceMapper.selectList(new QueryWrapper().eq("orderIdFk", orderResponse.getBillNo())); List orderDetailCodeEntities = orderDetailCodeDao.selectList(new QueryWrapper().eq("orderIdFk", orderResponse.getBillNo())); @@ -107,10 +93,6 @@ public class IoOrderInvoiceService extends ServiceImpl filterGroupBy(IoOrderInvoiceRequest orderInvoiceRequest) { if (orderInvoiceRequest.getPage() != null) { int offset = (orderInvoiceRequest.getPage() - 1) * orderInvoiceRequest.getLimit(); diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java index 39b14ca44..bd191d5c2 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java @@ -303,8 +303,6 @@ public class IoOrderServiceImpl implements IoOrderService { invProductService.update(invProductEntity); } } -// //删除库存详情 -// invProductServiceNew.deleteByOrderId(billNo); } } } @@ -448,16 +446,6 @@ public class IoOrderServiceImpl implements IoOrderService { InvProductNewVo invProductDetailEntity = invProductServiceNew.selectByCode(codeEntity.getOrderId(), codeEntity.getCode(), codeEntity.getPrice()); if (invProductDetailEntity != null) { - // (20241017===关于库存详情的删除修改进行注释) -// int count = invProductDetailEntity.getCount() - remainCount; -// if (count == 0) { -// invProductServiceNew.deleteById(invProductDetailEntity.getId()); -// } else { -// //更新详情表 -// invProductDetailEntity.setCount(count); -// invProductDetailEntity.setReCount(invProductDetailEntity.getReCount() - remainScanCount); -// invProductServiceNew.update(invProductDetailEntity); -// } //更新产品表 InvProductEntity invProductEntity = invProductService.selectByUnique(invProductDetailEntity.getRelIdFk(), invProductDetailEntity.getBatchNo(), invProductDetailEntity.getSupId(), invProductDetailEntity.getDeptCode(), invProductDetailEntity.getInvCode(), invProductDetailEntity.getPrice()); @@ -579,7 +567,6 @@ public class IoOrderServiceImpl implements IoOrderService { invProductEntity.setReCount(invProductEntity.getInCount() - invProductEntity.getOutCount()); invProductService.update(invProductEntity); } -// invProductServiceNew.deleteByOrderId(billNo); } } @@ -632,17 +619,6 @@ public class IoOrderServiceImpl implements IoOrderService { return orderDao.filterList(filterOrderRequest); } - @Override - public List getfilterList(FilterOrderRequest filterOrderRequest) { - if (null == filterOrderRequest) { - return Collections.emptyList(); - } - if (null != filterOrderRequest.getPage() && null != filterOrderRequest.getLimit()) { - PageHelper.offsetPage((filterOrderRequest.getPage() - 1) * filterOrderRequest.getLimit(), filterOrderRequest.getLimit()); - } - return orderDao.getfilterList(filterOrderRequest); - } - @Override public List filterOrderList(FilterOrderRequest filterOrderRequest) { @@ -964,12 +940,6 @@ public class IoOrderServiceImpl implements IoOrderService { } } - @Override - public boolean isExitByAction(String action) { - return orderDao.exists(new QueryWrapper().eq("action", action)); - } - - @Override public List findAllByAction(String action) { return orderDao.selectList(new QueryWrapper().eq("action", action)); @@ -1039,12 +1009,6 @@ public class IoOrderServiceImpl implements IoOrderService { List ioOrderEntities = orderDao.selectList(new QueryWrapper().eq("createUser", userId)); return ioOrderEntities; } - - @Override - public List selectOrderIdList(String data) { - return orderDao.selectOrderIdList(data); - } - @Override public void updateOrderInventory(String billNo, Integer status) { //查询单据表 @@ -1078,13 +1042,8 @@ public class IoOrderServiceImpl implements IoOrderService { FilterOrderRequest filterOrderRequest = new FilterOrderRequest(); filterOrderRequest.setWorkPlaceCode(workPlaceCode); filterOrderRequest.setStatus(1);//处理中的订单 -// filterOrderRequest.setUpdateUser(userId + ""); filterOrderRequest.setWorkPlaceQueueCode(getWorkPlaceQueueCode); List ioOrderResponses = orderDao.filterList(filterOrderRequest); -// QueryWrapper ew = new QueryWrapper<>(); -// ew.eq("workPlaceCode", workPlaceCode); -// ew.eq("status", 9); -// ew.eq("updateUser", userId); if (ioOrderResponses.size() > 0){ IoOrderResponse ioOrderResponse = ioOrderResponses.get(0); return ioOrderResponse; @@ -1092,11 +1051,6 @@ public class IoOrderServiceImpl implements IoOrderService { return null; } - @Override - public String selectAliYljgSearchbillByAliBillNo(String key) { - return orderDao.selectAliYljgSearchbillByAliBillNo(key); - } - /** * 查询此单据关联的所有单据 @@ -1105,56 +1059,14 @@ public class IoOrderServiceImpl implements IoOrderService { * @return */ private List getAllOrder(IoOrderEntity order) { -// Set billNos = new HashSet<>(); -// billNos.add(order.getBillNo()); - List orderEntities = orderDao.selectList(new QueryWrapper().eq("relKey", order.getRelKey())); -// getLinkedBillNo(order.getBillNo(), billNos); -// -// //去除本单的单据号 -// Iterator iterator = billNos.iterator(); -// while (iterator.hasNext()) { -// if (iterator.next().equals(order.getBillNo())) { -// iterator.remove(); -// break; -// } -// } -// -// ArrayList orders = new ArrayList<>(); -// if (CollUtil.isNotEmpty(billNos)) { -// List list = orderDao.selectList(new QueryWrapper().in("billNo", billNos).orderByDesc("id")); -// orders.addAll(list); -// } //将查询入口单据放在第一位的顺序 // orders.add(0, order); return orderEntities; } - /** - * 查询关联的单据号 - * - * @param billNo - * @param billNos - */ - private void getLinkedBillNo(String billNo, Set billNos) { - List list = getOneBillNosByOrderId(billNo); - if (!billNos.containsAll(list)) { - //找出不包含在原有集合中的单号，回调方法 - String orderId = null; - for (String item : list) { - if (!billNos.contains(item)) { - orderId = item; - break; - } - } - billNos.addAll(list); - //递归，继续查询未包含的单据号关联的单据 - getLinkedBillNo(orderId, billNos); - } - } - /** * 查询一条单据上关联的所有单据号 * diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoStatMonthServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/IoStatMonthServiceImpl.java index abe852b7e..eb905a1cb 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/IoStatMonthServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inout/impl/IoStatMonthServiceImpl.java @@ -51,8 +51,6 @@ public class IoStatMonthServiceImpl implements IoStatMonthService { private IoOrderDao orderDao; @Resource private IoOrderDetailResultDao ioOrderDetailResultDao; - @Resource - private SystemParamConfigDao systemParamConfigDao; @Override public void statData(Date date) { @@ -272,12 +270,6 @@ public class IoStatMonthServiceImpl implements IoStatMonthService { private List getNewOrOldDate(List newIoStatDayEntity, List oldIoStatDayEntity, DateTime lastMonth) { - // 计算出两个集合之间产品批次号组成的差异 -// List ioStatMonthEntityList = oldIoStatDayEntity.stream().filter(notComment -> { -// List filtered = newIoStatDayEntity.stream().filter(all -> all.getBatchNo().equals(notComment.getBatchNo()) && all.getRelIdFk().equals(notComment.getRelIdFk())).collect(Collectors.toList()); -// return filtered.isEmpty(); -// }).collect(Collectors.toList()); - List ioStatMonthEntityList = oldIoStatDayEntity.stream() .filter(notComment -> { List filtered = newIoStatDayEntity.stream().filter(all -> diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoStatQuarterServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/IoStatQuarterServiceImpl.java index 8198cf114..7afc84269 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/IoStatQuarterServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inout/impl/IoStatQuarterServiceImpl.java @@ -72,9 +72,6 @@ public class IoStatQuarterServiceImpl implements IoStatQuarterService { orderDetailResultEntities.forEach(orderDetailResultEntity -> { //获取新的汇总数据 IoStatQuarterEntity statData = getStatData(dataList, orderDetailResultEntity, yesterday); - - //查询此单是出库还是入库 -// IoOrderEntity order = orderDao.selectOne(new QueryWrapper().select("mainAction").eq("billNo", orderDetailResultEntity.getOrderIdFk()).eq("deptCode", orderDetailResultEntity.getDeptCode())); if (orderDetailResultEntity.getMainAction().equals(ConstantType.TYPE_PUT)) { //入库 statData.setInCount(orderDetailResultEntity.getReCount() + statData.getInCount()); @@ -323,12 +320,6 @@ public class IoStatQuarterServiceImpl implements IoStatQuarterService { private List getNewOrOldDate(List newIoStatDayEntity, List oldIoStatDayEntity, DateTime lastMonth) { - // 计算出两个集合之间产品批次号组成的差异 -// List ioStatMonthEntityList = oldIoStatDayEntity.stream().filter(notComment -> { -// List filtered = newIoStatDayEntity.stream().filter(all -> all.getBatchNo().equals(notComment.getBatchNo()) && all.getRelIdFk().equals(notComment.getRelIdFk())).collect(Collectors.toList()); -// return filtered.isEmpty(); -// }).collect(Collectors.toList()); - List ioStatMonthEntityList = oldIoStatDayEntity.stream() .filter(notComment -> { List filtered = newIoStatDayEntity.stream().filter(all -> diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoStatYearServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/IoStatYearServiceImpl.java index aa50e0553..27d255e12 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/IoStatYearServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inout/impl/IoStatYearServiceImpl.java @@ -69,7 +69,6 @@ public class IoStatYearServiceImpl implements IoStatYearService { IoStatYearEntity statData = getStatData(dataList, orderDetailResultEntity, yesterday); //查询此单是出库还是入库 -// IoOrderEntity order = orderDao.selectOne(new QueryWrapper().select("mainAction").eq("billNo", orderDetailResultEntity.getOrderIdFk()).eq("deptCode", orderDetailResultEntity.getDeptCode())); if (orderDetailResultEntity.getMainAction().equals(ConstantType.TYPE_PUT)) { //入库 statData.setInCount(orderDetailResultEntity.getReCount() + statData.getInCount()); @@ -266,12 +265,6 @@ public class IoStatYearServiceImpl implements IoStatYearService { private List getNewOrOldDate(List newIoStatDayEntity, List oldIoStatDayEntity, DateTime lastMonth) { - // 计算出两个集合之间产品批次号组成的差异 -// List ioStatMonthEntityList = oldIoStatDayEntity.stream().filter(notComment -> { -// List filtered = newIoStatDayEntity.stream().filter(all -> all.getBatchNo().equals(notComment.getBatchNo()) && all.getRelIdFk().equals(notComment.getRelIdFk())).collect(Collectors.toList()); -// return filtered.isEmpty(); -// }).collect(Collectors.toList()); - List ioStatMonthEntityList = oldIoStatDayEntity.stream() .filter(notComment -> { List filtered = newIoStatDayEntity.stream().filter(all -> diff --git a/src/main/java/com/glxp/api/service/inv/InvCountOrderService.java b/src/main/java/com/glxp/api/service/inv/InvCountOrderService.java index 5210e2749..67c3033ce 100644 --- a/src/main/java/com/glxp/api/service/inv/InvCountOrderService.java +++ b/src/main/java/com/glxp/api/service/inv/InvCountOrderService.java @@ -65,24 +65,12 @@ public class InvCountOrderService extends ServiceImpl list = invCountSettingDao.selectList(null); -// if (CollUtil.isEmpty(list)) { -// log.error("未配置盘点单据设置参数，无法转单"); -// return; -// } -// -// //出入库码明细列表 -// List inOrderCodes = new ArrayList<>(); -// List outOrderCodes = new ArrayList<>(); -// -// -// /** -// * 生成盘盈和盘亏单据逻辑 -// * 盘盈单据：1、找出盘点单据码详情比库存码详情多的产品 -// * 2、判断条码是否包含批次号和序列号，如果不包含，根据 盘盈数量 / 实际数量 = 多出的条码数量 ，计算出盘盈单据此条码的扫码数量 -// * 3、生成条码，保存单据 -// * -// * 盘亏单据：1、找出库存有，而盘点不存在的条码 -// * 2、判断此库存详情是否包含批次号，如果不包含，盘亏数量 / 实际数量 = 少的条码数量，计算出盘亏单据扫码数量 -// * 3、生成条码，保存单据 -// */ -// -// //构造库存详情查询参数 -// FilterInvProductDetailRequest invProductDetailRequest = new FilterInvProductDetailRequest(); -// invProductDetailRequest.setInvCode(invCountOrder.getInvStorageCode()); -// invProductDetailRequest.setInvSpaceCode(invCountOrder.getInvWarehouseCode()); -// //库存早于或等于盘点时间的库存数据，锁库存 -// invProductDetailRequest.setUpdateTime(invCountOrder.getCreateTime()); -// -// if (invCountOrder.getCountType() == 1) { -// //按照货位盘点，查询库存详情添加货位条件 -// invProductDetailRequest.setInvSpaceCode(invCountOrder.getInvWarehouseCode()); -// } -// -// FilterInvCountOrderDetailRequest detailRequest = new FilterInvCountOrderDetailRequest(); -// detailRequest.setOrderIdFk(invCountOrder.getOrderId()); -// //查询亏损单据详情 -// detailRequest.setStatus(0); -// List lossDetailList = invCountOrderDetailDao.selectDetailList(detailRequest); -// if (CollUtil.isNotEmpty(lossDetailList)) { -// log.info("开始生成盘亏单据码明细"); -// log.info("查询盘亏产品码详情"); -// -// for (InvCountOrderDetailEntity invCountOrderDetail : lossDetailList) { -// //查询库存详情 -// invProductDetailRequest.setRelId(invCountOrderDetail.getProductId()); -// invProductDetailRequest.setBatchNo(invCountOrderDetail.getBatchNo()); -// List invProductDetailEntities = invProductNewDao.filterInvProductDetailList(invProductDetailRequest); -// //查询盘点码明细 -// FilterInvCountCodesRequest codesRequest = new FilterInvCountCodesRequest(); -// codesRequest.setOrderIdFk(invCountOrder.getOrderId()); -// codesRequest.setProductId(invCountOrderDetail.getProductId()); -// codesRequest.setBatchNo(invCountOrderDetail.getBatchNo()); -// List countCodesList = invCountCodesDao.selectCodes(codesRequest); -// List invProductCodes = invProductDetailEntities.stream().map(InvProductNewVo::getCode).collect(Collectors.toList()); -// List lossCodes = CollUtil.subtractToList(invProductCodes, countCodesList); -// if (CollUtil.isNotEmpty(countCodesList) && CollUtil.isEmpty(lossCodes)) { -// //盘点的码不为空，但是盘点数量和库存数量不一样，比对差集结果为空，说明是同一个条码，数量不同，直接根据盘亏数量计算生成一个扫码单据的码明细 -// //生成码详情 -// IoCodeTempEntity warehouseEntity = buildWarehouse(invCountOrder, invProductDetailEntities.get(0).getCode(), invProductDetailEntities.get(0).getRelId()); -// //判断此条码，是否有批次号和序列号 -// UdiEntity udi = FilterUdiUtils.getUdi(invProductDetailEntities.get(0).getCode()); -// //修改码数量 -// int actCount = invCountCodesService.getActCount(udi.getUdi()); -// //使用此盘点单据详情的盘亏数量 / 实际数量，计算得出扫码数量 -// int codeNum = invCountOrderDetail.getLossNum() / actCount; -// warehouseEntity.setCount(codeNum); -// warehouseEntity.setReCount(codeNum); -// -// //设置供应商信息 -// setSupInfo(warehouseEntity, "loss"); -// outOrderCodes.add(warehouseEntity); -// } else { -// for (InvProductNewVo invProductDetailEntity : invProductDetailEntities) { -// if (!countCodesList.contains(invProductDetailEntity.getCode()) && !verifyCodeExist(outOrderCodes, invProductDetailEntity.getCode())) { -// //生成码详情 -// IoCodeTempEntity warehouseEntity = buildWarehouse(invCountOrder, invProductDetailEntity.getCode(), invProductDetailEntity.getRelId()); -// //判断此条码，是否有批次号和序列号 -// UdiEntity udi = FilterUdiUtils.getUdi(invProductDetailEntity.getCode()); -// if ((StrUtil.isBlank(udi.getBatchNo()) && StrUtil.isBlank(udi.getSerialNo())) || (StrUtil.isBlank(udi.getSerialNo()) && StrUtil.isNotBlank(udi.getBatchNo()))) { -// //修改码数量 -// int actCount = invCountCodesService.getActCount(udi.getUdi()); -// //使用此盘点单据详情的盘亏数量 / 实际数量，计算得出扫码数量 -// int codeNum = invCountOrderDetail.getLossNum() / actCount; -// warehouseEntity.setCount(codeNum); -// warehouseEntity.setReCount(codeNum); -// } else { -// //修改实际数量 -// int actCount = invCountCodesService.getActCount(udi.getUdi()); -// warehouseEntity.setCount(actCount); -// warehouseEntity.setReCount(actCount); -// } -// -// //设置供应商信息 -// setSupInfo(warehouseEntity, "loss"); -// outOrderCodes.add(warehouseEntity); -// } -// } -// } -// } -// log.info("盘亏单据码明细生成完毕"); -// } -// -// //生成盘盈单据的条码 -// //查询盘盈的单据详情 -// detailRequest.setStatus(1); -// List profitDetailList = invCountOrderDetailDao.selectDetailList(detailRequest); -// if (CollUtil.isNotEmpty(profitDetailList)) { -// log.info("开始生成盘盈单据码.明细"); -// //查询盘盈产品的库存详情 -// for (InvCountOrderDetailEntity invCountOrderDetail : profitDetailList) { -// //查询库存详情 -// invProductDetailRequest.setRelId(invCountOrderDetail.getProductId()); -// invProductDetailRequest.setBatchNo(invCountOrderDetail.getBatchNo()); -// List invProductDetailEntities = invProductNewDao.filterInvProductDetailList(invProductDetailRequest); -// //查询盘点码明细 -// FilterInvCountCodesRequest codesRequest = new FilterInvCountCodesRequest(); -// codesRequest.setOrderIdFk(invCountOrder.getOrderId()); -// codesRequest.setProductId(invCountOrderDetail.getProductId()); -// codesRequest.setBatchNo(invCountOrderDetail.getBatchNo()); -// List countCodesList = invCountCodesDao.selectCodes(codesRequest); -// List invProductCodeList = invProductDetailEntities.stream().map(InvProductNewVo::getCode).collect(Collectors.toList()); -// List profitCodes = CollUtil.subtractToList(countCodesList, invProductCodeList); //计算盘盈的条码 -// log.info("查询盘盈产品的库存详情"); -// if (CollUtil.isNotEmpty(invProductCodeList) && CollUtil.isEmpty(profitCodes)) { -// /** -// * 盘点条码不为空，且库存条码也不为空，但是计算的条码差集为空 -// * 说明盘点的条码和库存的条码是相同的条码，直接根据盘盈数量计算出扫码数量，生成一个条码即可 -// */ -// String code = null; -// if (CollUtil.isNotEmpty(countCodesList)) { -// code = countCodesList.get(0); -// } else { -// code = invProductCodeList.get(0); -// } -// IoCodeTempEntity warehouseEntity = buildWarehouse(invCountOrder, code, Long.parseLong(invCountOrderDetail.getProductId())); -// //判断此条码，是否有批次号和序列号 -// UdiEntity udi = FilterUdiUtils.getUdi(code); -// //修改码数量 -// int actCount = invCountCodesService.getActCount(udi.getUdi()); -// //使用此盘点单据详情的盘盈数量 / 实际数量，计算得出扫码数量 -// int codeNum = invCountOrderDetail.getProfitNum() / actCount; -// warehouseEntity.setCount(codeNum); -// warehouseEntity.setReCount(codeNum); -// setSupInfo(warehouseEntity, "profit"); -// inOrderCodes.add(warehouseEntity); -// log.info("添加库存条码"); -// } else { -// -// for (String code : profitCodes) { -// log.info("添加盘盈入库条码"); -// if (!verifyCodeExist(inOrderCodes, code)) { -// //生成码详情 -// IoCodeTempEntity warehouseEntity = buildWarehouse(invCountOrder, code, Long.parseLong(invCountOrderDetail.getProductId())); -// //判断此条码，是否有批次号和序列号 -// UdiEntity udi = FilterUdiUtils.getUdi(code); -// if ((StrUtil.isBlank(udi.getBatchNo()) && StrUtil.isBlank(udi.getSerialNo())) || (StrUtil.isBlank(udi.getSerialNo()) && StrUtil.isNotBlank(udi.getBatchNo()))) { -// //修改码数量 -// int actCount = invCountCodesService.getActCount(udi.getUdi()); -// //使用此盘点单据详情的盘盈数量 / 实际数量，计算得出扫码数量 -// int codeNum = invCountOrderDetail.getProfitNum() / actCount; -// warehouseEntity.setCount(codeNum); -// warehouseEntity.setReCount(codeNum); -// } else { -// //修改实际数量 -// int actCount = invCountCodesService.getActCount(udi.getUdi()); -// warehouseEntity.setCount(actCount); -// warehouseEntity.setReCount(actCount); -// } -// setSupInfo(warehouseEntity, "profit"); -// inOrderCodes.add(warehouseEntity); -// } -// } -// } -// } -// log.info("盘盈单据码详情生成完毕"); -// } -// -// InvCountSettingEntity invCountSettingEntity = list.get(0); -// -// if (CollUtil.isNotEmpty(inOrderCodes)) { -// log.info("盘点单据：{} 生成盘盈入库单据", invCountOrder.getOrderId()); -// IoOrderEntity order = createOrder(invCountSettingEntity, invCountOrder, ConstantType.TYPE_PUT); -// log.info("盘盈入库单据号：{}", order.getBillNo()); -// inOrderCodes.forEach(warehouseEntity -> { -// warehouseEntity.setOrderId(order.getBillNo()); -// warehouseEntity.setAction(order.getAction()); -// warehouseEntity.setCorpOrderId(order.getCorpOrderId()); -// }); -// -// invCountOrder.setInOrderIds(order.getBillNo()); -// orderService.insertOrder(order); -// codesTempDao.insertBatch(inOrderCodes); -// log.info("盘盈入库单据生成成功"); -// } -// -// if (CollUtil.isNotEmpty(outOrderCodes)) { -// log.info("盘点单据：{} 生成盘亏入库单据", invCountOrder.getOrderId()); -// IoOrderEntity order = createOrder(invCountSettingEntity, invCountOrder, ConstantType.TYPE_OUT); -// log.info("盘亏入库单据号：{}", order.getBillNo()); -// outOrderCodes.forEach(warehouseEntity -> { -// warehouseEntity.setOrderId(order.getBillNo()); -// warehouseEntity.setAction(order.getAction()); -// warehouseEntity.setCorpOrderId(order.getCorpOrderId()); -// String supId = codesDao.selectSupIdByCode(warehouseEntity.getCode()); -// warehouseEntity.setSupId(supId); -// }); -// -// invCountOrder.setOutOrderIds(order.getBillNo()); -// orderService.insertOrder(order); -// codesTempDao.insertBatch(outOrderCodes); -// log.info("盘亏入库单据生成成功"); -// } -// -// //更新盘点单据生成的扫码单据号 -// invCountOrderDao.updateByOrderId(invCountOrder); -// } - - /** * 新版盘点单据转换 */ @@ -577,76 +342,6 @@ public class InvCountOrderService extends ServiceImpl supIds = invProductNewDao.selectSupIdByCode(warehouseEntity.getCode()); -// if (CollUtil.isNotEmpty(supIds)) { -// if (supIds.size() == 1) { -// //此产品只绑定了一个供应商，若绑定了多个供应商，则不填供应商ID字段，生成单据之后会进入异常单据页面，手动指定供应商 -// warehouseEntity.setSupId(supIds.get(0)); -// } -// } -// } else { -// log.info("生成盘盈单据条码供应商详情，条码信息：{}", warehouseEntity.getCode()); -// List unitFkList = companyProductRelevanceDao.selectUnitFkByUdiRlIdFk(warehouseEntity.getRelId() + ""); -// if (CollUtil.isNotEmpty(unitFkList)) { -// if (unitFkList.size() == 1) { -// //此产品只绑定了一个供应商，若绑定了多个供应商，则不填供应商ID字段，生成单据之后会进入异常单据页面，手动指定供应商 -// warehouseEntity.setSupId(unitFkList.get(0)); -// } -// } -// } -// } - - /** - * 校验码重复 - * - * @param codes - * @param code - * @return - */ - private boolean verifyCodeExist(List codes, String code) { - for (IoCodeTempEntity warehouseEntity : codes) { - if (warehouseEntity.getCode().equals(code)) { - return true; - } - } - return false; - } - - private static IoCodeTempEntity buildWarehouse(InvCountOrderEntity invCountOrder, String code, Long productId) { - IoCodeTempEntity warehouseEntity = new IoCodeTempEntity(); - warehouseEntity.setOrderId(invCountOrder.getOrderId()); - warehouseEntity.setCode(code); - warehouseEntity.setRelId(productId); - warehouseEntity.setMainAction(ConstantType.TYPE_PUT); - warehouseEntity.setInvCode(invCountOrder.getInvStorageCode()); - warehouseEntity.setWarehouseCode(invCountOrder.getInvWarehouseCode()); - UdiEntity udi = FilterUdiUtils.getUdi(code); - warehouseEntity.setBatchNo(udi.getBatchNo()); - warehouseEntity.setProduceDate(udi.getProduceDate()); - warehouseEntity.setExpireDate(udi.getExpireDate()); - warehouseEntity.setSerialNo(udi.getSerialNo()); - warehouseEntity.setNameCode(udi.getUdi()); - warehouseEntity.setCount(1); - warehouseEntity.setReCount(1); - return warehouseEntity; - } - /** * 生成单据和条码数据 * @@ -694,15 +389,6 @@ public class InvCountOrderService extends ServiceImpl supIds = companyProductRelevanceDao.selectUnitFkByUdiRlIdFk(warehouseEntity.getRelId() + ""); -// if (CollUtil.isNotEmpty(supIds) && supIds.size() == 1) { -// return supIds.get(0); -// } -// return null; -// } - public InvCountOrderEntity selectByOrderId(String orderId) { return invCountOrderDao.selectByOrderId(orderId); } diff --git a/src/main/java/com/glxp/api/service/inv/InvInnerOrderPrintService.java b/src/main/java/com/glxp/api/service/inv/InvInnerOrderPrintService.java index 6a659030a..9e7a58cad 100644 --- a/src/main/java/com/glxp/api/service/inv/InvInnerOrderPrintService.java +++ b/src/main/java/com/glxp/api/service/inv/InvInnerOrderPrintService.java @@ -11,7 +11,6 @@ import java.util.List; public interface InvInnerOrderPrintService { - List filterOrderPrintList(FilterinnerOrderprintRequest filterinnerOrderprintRequest); Boolean addOrderList(String orderIdFk); diff --git a/src/main/java/com/glxp/api/service/inv/InvPlaceOrderService.java b/src/main/java/com/glxp/api/service/inv/InvPlaceOrderService.java index 690d4d7c3..cba729bb3 100644 --- a/src/main/java/com/glxp/api/service/inv/InvPlaceOrderService.java +++ b/src/main/java/com/glxp/api/service/inv/InvPlaceOrderService.java @@ -20,8 +20,6 @@ public interface InvPlaceOrderService { List filterList(FilterInvPlaceOrderRequest filterInvPlaceOrderRequest); - BaseResponse addInvPlaceOrder(AddInvPlaceOrderRequest addInvPlaceOrderRequest); - //单条绑定货位 BaseResponse bindInvSpaceOne(BindInvSpaceRequest bindInvSpaceRequest); diff --git a/src/main/java/com/glxp/api/service/inv/InvPlaceService.java b/src/main/java/com/glxp/api/service/inv/InvPlaceService.java index 4a39da1f7..ffc6f6f77 100644 --- a/src/main/java/com/glxp/api/service/inv/InvPlaceService.java +++ b/src/main/java/com/glxp/api/service/inv/InvPlaceService.java @@ -43,15 +43,6 @@ public interface InvPlaceService { */ BaseResponse unbindInvOrderSpace(BindInvSpaceRequest bindInvSpaceRequest); - -// /** -// * 更换货位(20241017===没用到注释了) -// * -// * @param bindInvSpaceRequest -// */ -// BaseResponse changeInvSpace(BindInvSpaceRequest bindInvSpaceRequest); - - /** * 校验库存详情绑定货位信息 * @@ -60,12 +51,6 @@ public interface InvPlaceService { */ BaseResponse checkCodeSpace(BindInvSpaceRequest bindInvSpaceRequest); - /** - * @param bindInvSpaceRequest - * @return - */ - List getInvProductInfo(BindInvSpaceRequest bindInvSpaceRequest); - /** * 从库存详情查询单据列表 * diff --git a/src/main/java/com/glxp/api/service/inv/InvPreProductDetailService.java b/src/main/java/com/glxp/api/service/inv/InvPreProductDetailService.java index ac5868298..7d87f00e9 100644 --- a/src/main/java/com/glxp/api/service/inv/InvPreProductDetailService.java +++ b/src/main/java/com/glxp/api/service/inv/InvPreProductDetailService.java @@ -50,13 +50,7 @@ public interface InvPreProductDetailService { */ boolean deleteInvPreProductDetail(FilterInvProductDetailRequest detailRequest); - int findCountByCode(String code); - - InvPreProductDetailEntity findUseOneByCode(String code); - int vailStockCount(Long relId, String batchNo, String supId, String deptCode, String invCode, String invSpaceCode); - int vailStockCountByCode(String deptCode, String invCode, String invSpaceCode, String code); - List findByGroupCode(String invCode, String code); } diff --git a/src/main/java/com/glxp/api/service/inv/InvPreProductService.java b/src/main/java/com/glxp/api/service/inv/InvPreProductService.java index c6886d8c7..cce3d3ea4 100644 --- a/src/main/java/com/glxp/api/service/inv/InvPreProductService.java +++ b/src/main/java/com/glxp/api/service/inv/InvPreProductService.java @@ -31,16 +31,8 @@ public interface InvPreProductService { List filterListStock(FilterInvPreProductRequest invPreProductRequest); - List findGroupBySpace(FilterInvPreProductRequest invPreProductRequest); - /** - * 查询寄售库存列表 - * - * @param invPreProductRequest - * @return - */ - List filterPreProductList(FilterInvPreProductRequest invPreProductRequest); /** * 根据ID查询寄售库存信息 diff --git a/src/main/java/com/glxp/api/service/inv/InvPreinDetailService.java b/src/main/java/com/glxp/api/service/inv/InvPreinDetailService.java index 2ded2a0cb..cd9a5c4a6 100644 --- a/src/main/java/com/glxp/api/service/inv/InvPreinDetailService.java +++ b/src/main/java/com/glxp/api/service/inv/InvPreinDetailService.java @@ -17,13 +17,6 @@ public interface InvPreinDetailService { List findByCode(String code); -// InvPreinDetailEntity findOneByCode(String code); - - - List findUseByCode(String code); - - InvPreinDetailEntity findUseOneByCode(String code); - int deleteByOrderId(String orderId); int deleteById(Integer id); @@ -34,6 +27,4 @@ public interface InvPreinDetailService { int update(InvPreinDetailEntity invPreinDetailEntity); - int updateBack(String orderId); - } diff --git a/src/main/java/com/glxp/api/service/inv/InvPreinOrderService.java b/src/main/java/com/glxp/api/service/inv/InvPreinOrderService.java index 2ec9116a8..5c955e71b 100644 --- a/src/main/java/com/glxp/api/service/inv/InvPreinOrderService.java +++ b/src/main/java/com/glxp/api/service/inv/InvPreinOrderService.java @@ -13,7 +13,7 @@ public interface InvPreinOrderService { List filterList(FilterInvPreinRequest filterInvPreinRequest); - public void insert(InvPreinOrderEntity invPreinOrderEntity); + void insert(InvPreinOrderEntity invPreinOrderEntity); int deleteByOrderId(String orderId); diff --git a/src/main/java/com/glxp/api/service/inv/InvPreinProductDetailService.java b/src/main/java/com/glxp/api/service/inv/InvPreinProductDetailService.java index cb750b26a..f9f65670d 100644 --- a/src/main/java/com/glxp/api/service/inv/InvPreinProductDetailService.java +++ b/src/main/java/com/glxp/api/service/inv/InvPreinProductDetailService.java @@ -48,19 +48,8 @@ public interface InvPreinProductDetailService { */ void setOrderInfo(InvPreProductDetailResponse response); - /** - * 删除寄售库存详情 - * - * @param detailRequest - */ - boolean deleteInvPreProductDetail(FilterInvProductDetailRequest detailRequest); - int findCountByCode(String code); - int findCountBySpaceCode(String spaceCode, String code); - - InvPreInProductDetailEntity findUseOneByCode(String code); - int vailStockCount(Long relId, String batchNo, String supId, String deptCode, String invCode, String invSpaceCode); int vailStockCountByCode(String deptCode, String invCode, String invSpaceCode, String code); diff --git a/src/main/java/com/glxp/api/service/inv/InvPreinProductService.java b/src/main/java/com/glxp/api/service/inv/InvPreinProductService.java index 309b3f19e..5533c70c5 100644 --- a/src/main/java/com/glxp/api/service/inv/InvPreinProductService.java +++ b/src/main/java/com/glxp/api/service/inv/InvPreinProductService.java @@ -31,20 +31,9 @@ public interface InvPreinProductService { */ List filterList(FilterInvPreinProductRequest filterInvPreinDetailRequest); - List filterListStock(FilterInvPreinProductRequest filterInvPreinDetailRequest); - - /** - * 查询寄售库存列表 - * - * @param invPreProductRequest - * @return - */ - List filterPreinProductList(FilterInvPreinProductRequest invPreProductRequest); - List findGroupBySpace(FilterInvPreinProductRequest filterInvPreinDetailRequest); - /** * 根据ID查询寄售库存信息 * @@ -53,5 +42,4 @@ public interface InvPreinProductService { */ InvPreinProductEntity findById(String id); - boolean isExitByRelId(String relId); } diff --git a/src/main/java/com/glxp/api/service/inv/InvUserProductDetailService.java b/src/main/java/com/glxp/api/service/inv/InvUserProductDetailService.java index a1f59a3d6..30e61c005 100644 --- a/src/main/java/com/glxp/api/service/inv/InvUserProductDetailService.java +++ b/src/main/java/com/glxp/api/service/inv/InvUserProductDetailService.java @@ -13,14 +13,7 @@ import java.util.List; */ public interface InvUserProductDetailService{ - List filterInvUserProductDetailList(InvUserProductDetailEntity invUserProductDetailEntity); - - Boolean addInvUserProductDetail(InvUserProductDetailEntity invUserProductDetailEntity); - Boolean addInvUserProductDetailList(List invUserProductDetailEntityList); - Boolean updateInvUserProductDetail(InvUserProductDetailEntity invUserProductDetailEntity); - - Boolean delectInvUserProductDetail(InvUserProductDetailEntity invUserProductDetailEntity); } diff --git a/src/main/java/com/glxp/api/service/inv/InvUserProductService.java b/src/main/java/com/glxp/api/service/inv/InvUserProductService.java index c7989b3b6..27cda7b8b 100644 --- a/src/main/java/com/glxp/api/service/inv/InvUserProductService.java +++ b/src/main/java/com/glxp/api/service/inv/InvUserProductService.java @@ -14,14 +14,10 @@ import java.util.List; */ public interface InvUserProductService{ - List filterInvUserProductList(InvUserProductEntity invUserProductEntity); - Boolean addInvUserProduct(InvUserProductEntity invUserProductEntity); Boolean updateInvUserProduct(InvUserProductEntity invUserProductEntity); - Boolean delectInvUserProduct(InvUserProductEntity invUserProductEntity); - InvUserProductEntity selectByUnique(Long relId, String batchNo, String supId, String deptCode, String invCode,String userId,Integer type); diff --git a/src/main/java/com/glxp/api/service/inv/StockCompareDetailService.java b/src/main/java/com/glxp/api/service/inv/StockCompareDetailService.java index 146ef80e6..0874faf8a 100644 --- a/src/main/java/com/glxp/api/service/inv/StockCompareDetailService.java +++ b/src/main/java/com/glxp/api/service/inv/StockCompareDetailService.java @@ -18,9 +18,6 @@ public interface StockCompareDetailService extends CustomService invProductDetailSelectPage(InvProductDetailSelectQuery query); - - List filterCompareDetail(InvProductDetailSelectRequest invProductDetailSelectRequest); - } diff --git a/src/main/java/com/glxp/api/service/inv/impl/InvInnerOrderPrintServiceImpl.java b/src/main/java/com/glxp/api/service/inv/impl/InvInnerOrderPrintServiceImpl.java index cb43900d2..fefc76a18 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/InvInnerOrderPrintServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inv/impl/InvInnerOrderPrintServiceImpl.java @@ -77,17 +77,6 @@ public class InvInnerOrderPrintServiceImpl implements InvInnerOrderPrintService @Resource IoOrderDetailBizService ioOrderDetailBizService; - @Override - public List filterOrderPrintList(FilterinnerOrderprintRequest filterinnerOrderprintRequest) { - if (filterinnerOrderprintRequest == null) { - return Collections.emptyList(); - } - int offset = (filterinnerOrderprintRequest.getPage() - 1) * filterinnerOrderprintRequest.getLimit(); - PageHelper.offsetPage(offset, filterinnerOrderprintRequest.getLimit()); - List data = invInnerOrderPrintDao.filterOrderPrintList(filterinnerOrderprintRequest); - return data; - } - @Override public Boolean addOrderList(String orderIdFk) { //先删除数据 @@ -126,7 +115,6 @@ public class InvInnerOrderPrintServiceImpl implements InvInnerOrderPrintService a = Integer.parseInt(filterUdiRelRequest.getPackLevel()) - 1; } UdiProductEntity udiProductEntity1 = udiProductService.selectUdiByName(obj.getNameCode()); -// UdiRelevanceResponse filterUdiRelevance = udiRelevanceDao.filterUdiRelevance(filterUdiRelRequest).get(0); filterUdiRelRequest.setProductsType(udiProductEntity1.getProductsType()); UdiRelevanceResponse filterUdiRelevance = udiRelevanceDao.filterUdiRelevance(filterUdiRelRequest).get(a); //查询产品信息 @@ -274,8 +262,6 @@ public class InvInnerOrderPrintServiceImpl implements InvInnerOrderPrintService @Resource IoOrderService orderService; - @Resource - UdiCalCountUtil udiCalCountUtil; //-----------------------------------------------------------业务单据打印-----------------------------// @Override @@ -310,11 +296,6 @@ public class InvInnerOrderPrintServiceImpl implements InvInnerOrderPrintService innerOrderPrintEntity.setUpdateUser(customerService.getUserId() + ""); FilterUdiRelRequest filterUdiRelRequest = new FilterUdiRelRequest(); filterUdiRelRequest.setId(Long.valueOf(obj.getBindRlFk())); - //查询耗材字典信息 -// UdiRelevanceResponse filterUdiRelevance = udiRelevanceDao.filterUdiRelevance(filterUdiRelRequest).get(0); - //查询产品信息 -// UdiProductEntity udiProductEntity = udiProductService.findByNameCode(filterUdiRelevance.getNameCode()); - String udiCode = "#" + obj.getNameCode() + "#" + obj.getProductDate() + "#" + obj.getExpireDate() + "#" + obj.getBatchNo() + "#" + "#" + "#"; udiCode = udiCode.replaceAll("#null", "#"); diff --git a/src/main/java/com/glxp/api/service/inv/impl/InvPlaceOrderServiceImpl.java b/src/main/java/com/glxp/api/service/inv/impl/InvPlaceOrderServiceImpl.java index f8a67414f..0ee39b7e5 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/InvPlaceOrderServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inv/impl/InvPlaceOrderServiceImpl.java @@ -73,55 +73,8 @@ public class InvPlaceOrderServiceImpl implements InvPlaceOrderService { return invPlaceOrderDao.filterList(filterInvPlaceOrderRequest); } - @Override - public BaseResponse addInvPlaceOrder(AddInvPlaceOrderRequest addInvPlaceOrderRequest) { - if (StrUtil.isBlank(addInvPlaceOrderRequest.getInvCode()) || StrUtil.isBlank(addInvPlaceOrderRequest.getInvSpaceCode()) || CollUtil.isEmpty(addInvPlaceOrderRequest.getCodeList()) || null == addInvPlaceOrderRequest.getType()) { - return ResultVOUtils.error(500, "参数错误"); - } - if (addInvPlaceOrderRequest.getType().equals(2)) { - if (StrUtil.isBlank(addInvPlaceOrderRequest.getOrderId())) { - return ResultVOUtils.error(500, "参数错误"); - } - } - - //操作人ID - String userId = customerService.getUserIdStr(); - //获取记录号 - String recordId = gennerOrderUtils.createInvPlaceOrderNo(new OrderNoTypeBean(Constant.INV_PLACE_ORDER, "yyyyMMdd")); - - InvPlaceOrderEntity orderEntity = new InvPlaceOrderEntity(); - orderEntity.setRecordId(recordId); - orderEntity.setType(addInvPlaceOrderRequest.getType()); - orderEntity.setOrderId(addInvPlaceOrderRequest.getOrderId()); - orderEntity.setCreateUser(userId); - orderEntity.setCreateTime(new Date()); - orderEntity.setUpdateTime(new Date()); - - //生成物资上架详情 - addInvPlaceOrderRequest.getCodeList().forEach(invProductDetailEntity -> { - InvPlaceOrderDetailEntity orderDetailEntity = new InvPlaceOrderDetailEntity(); - orderDetailEntity.setInvCode(addInvPlaceOrderRequest.getInvCode()); - orderDetailEntity.setInvSpaceCode(addInvPlaceOrderRequest.getInvSpaceCode()); - orderDetailEntity.setRelId(String.valueOf(invProductDetailEntity.getRelIdFk())); -// orderDetailEntity.setCode(invProductDetailEntity.getCode()); - orderDetailEntity.setBatchNo(invProductDetailEntity.getBatchNo()); - orderDetailEntity.setRecordId(recordId); - invPlaceOrderDetailDao.insert(orderDetailEntity); - }); - - invPlaceOrderDao.insert(orderEntity); - return ResultVOUtils.success(); - } - - @Override public BaseResponse bindInvSpaceOne(BindInvSpaceRequest bindInvSpaceRequest) { - -// QueryWrapper ew=new QueryWrapper(); -// ew.eq("code",filterInvPlaceRequest.getCode()); -// ew.isNull("invSpaceCode"); -// ew. -// invPreInProductDetailDao.selectOne() Long relId = null; String batchNo = null; String nameCode = null; @@ -175,7 +128,6 @@ public class InvPlaceOrderServiceImpl implements InvPlaceOrderService { supId = invProductNewVo.getSupId(); produceDate = invProductNewVo.getProductionDate(); expireDate = invProductNewVo.getExpireDate(); -// serialNo = invProductEntity.getSerialNo(); } @@ -317,10 +269,8 @@ public class InvPlaceOrderServiceImpl implements InvPlaceOrderService { filterInvPlaceOrderRequest.setRelId(invProductNewVo.getRelIdFk()); filterInvPlaceOrderRequest.setNameCode(invProductNewVo.getNameCode()); filterInvPlaceOrderRequest.setCount(invProductNewVo.getReCount()); -// filterInvPlaceOrderRequest.setSerialNo(invProductEntity.getSerialNo()); filterInvPlaceOrderRequest.setProduceDate(invProductNewVo.getProductionDate()); filterInvPlaceOrderRequest.setSupId(invProductNewVo.getSupId()); -// filterInvPlaceOrderRequest.setCode(invProductEntity.getCode()); filterInvPlaceOrderRequestList.add(filterInvPlaceOrderRequest); } } @@ -436,7 +386,6 @@ public class InvPlaceOrderServiceImpl implements InvPlaceOrderService { supId = invProductNewVo.getSupId(); produceDate = invProductNewVo.getProductionDate(); expireDate = invProductNewVo.getExpireDate(); -// serialNo = invProductEntity.getSerialNo(); } diff --git a/src/main/java/com/glxp/api/service/inv/impl/InvPlaceServiceImpl.java b/src/main/java/com/glxp/api/service/inv/impl/InvPlaceServiceImpl.java index cc50151ce..1097a182b 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/InvPlaceServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inv/impl/InvPlaceServiceImpl.java @@ -57,17 +57,9 @@ public class InvPlaceServiceImpl implements InvPlaceService { @Resource private InvSpaceDao invSpaceDao; @Resource - private InvPlaceOrderService invPlaceOrderService; - @Resource private InvPlaceOrderDao invPlaceOrderDao; @Resource private InvPlaceOrderDetailDao invPlaceOrderDetailDao; - @Resource - private UdiRelevanceService udiRelevanceService; - @Resource - private CustomerService customerService; - @Resource - private GennerOrderUtils gennerOrderUtils; @Override @@ -82,261 +74,17 @@ public class InvPlaceServiceImpl implements InvPlaceService { } //TODO 20241017 绑定货位先注释 confirm + // 后面要重写可能所以把注释去了 @Override public BaseResponse bindInvSpace(BindInvSpaceRequest bindInvSpaceRequest) { return null; -// //查询仓库的部门ID -// String deptCode = invWarehouseDao.selectParentIdByCode(bindInvSpaceRequest.getInvCode()); -// InvWarehouseEntity invWarehouseEntity = invWarehouseDao.filterGroupInvSubAndcode(bindInvSpaceRequest.getInvCode()); -// List invPlaceOrderDetailEntityList = new ArrayList<>(); -// if (invWarehouseEntity.getAdvanceType() == ConstantStatus.ACTION_TYPE_PREIN) { -// invPlaceOrderDetailEntityList = invPlaceOrderDetailDao.selectList(new QueryWrapper().eq("recordId", bindInvSpaceRequest.getOrderId())); -// for (InvPlaceOrderDetailEntity invPlaceOrderDetailEntity : invPlaceOrderDetailEntityList) { -// -// for (Integer i = 0; i < invPlaceOrderDetailEntity.getCount(); i++) { -// //拆解库存表 -// QueryWrapper ew = new QueryWrapper<>(); -// InvPreInProductDetailEntity invPreInProductDetailEntity = new InvPreInProductDetailEntity(); -// if (bindInvSpaceRequest.getType() == 3) { -// ew.eq("code", invPlaceOrderDetailEntity.getCode()); -// ew.eq("invSpaceCode", bindInvSpaceRequest.getInvSpaceCode()); -// ew.last("limit 1"); -// invPreInProductDetailEntity = invPreInProductDetailDao.selectOne(ew); -// } else { -// ew.eq("code", invPlaceOrderDetailEntity.getCode()); -// ew.and(o -> o.isNull("invSpaceCode").or().eq("invSpaceCode", "")); -// ew.gt("inCount", 0); -// ew.last("limit 1"); -// invPreInProductDetailEntity = invPreInProductDetailDao.selectOne(ew); -// } -// -// -// if (invPreInProductDetailEntity.getInCount() > 0) { -// String nameCode = invPreInProductDetailEntity.getNameCode(); -// int reCount = getActCount(nameCode); -// invPreInProductDetailEntity.setInCount(invPreInProductDetailEntity.getInCount() - 1); -// invPreInProductDetailEntity.setCount(invPreInProductDetailEntity.getCount() - 1); -// invPreInProductDetailEntity.setReCount(invPreInProductDetailEntity.getReCount() - reCount); -// invPreInProductDetailDao.updateById(invPreInProductDetailEntity); -// -// -// //如果库存为空就删了该数据 -// if (invPreInProductDetailEntity != null && invPreInProductDetailEntity.getInCount() == 0 && (invPreInProductDetailEntity.getOutCount() == null || invPreInProductDetailEntity.getOutCount() == 0) -// && invPreInProductDetailEntity.getCount() == 0 && invPreInProductDetailEntity.getReCount() == 0) { -// invPreInProductDetailDao.deleteById(invPreInProductDetailEntity); -// } -// -// -// ew.clear(); -// ew.eq("code", invPlaceOrderDetailEntity.getCode()).eq("mainAction", ConstantType.TYPE_PUT); -// if (bindInvSpaceRequest.getType() == 3) { -// ew.eq("invSpaceCode", bindInvSpaceRequest.getChangeSpaceCode()); -// } else { -// ew.eq("invSpaceCode", invPlaceOrderDetailEntity.getInvSpaceCode()); -// } -// -// //拆解出来的明细有就更新没有就添加 -// InvPreInProductDetailEntity invPreInProductDetailEntity1 = invPreInProductDetailDao.selectOne(ew); -// if (invPreInProductDetailEntity1 != null) { -// invPreInProductDetailEntity1.setCount(invPreInProductDetailEntity1.getCount() + 1); -// invPreInProductDetailEntity1.setInCount(invPreInProductDetailEntity1.getInCount() + 1); -// invPreInProductDetailEntity1.setReCount(invPreInProductDetailEntity1.getReCount() + reCount); -// invPreInProductDetailDao.updateById(invPreInProductDetailEntity1); -// } else { -// invPreInProductDetailEntity.setId(null); -// invPreInProductDetailEntity.setInCount(1); -// invPreInProductDetailEntity.setCount(1); -// invPreInProductDetailEntity.setReCount(reCount); -// invPreInProductDetailEntity.setOutCount(0); -// if (bindInvSpaceRequest.getType() == 3) { -// invPreInProductDetailEntity.setInvSpaceCode(bindInvSpaceRequest.getChangeSpaceCode()); -// } else { -// invPreInProductDetailEntity.setInvSpaceCode(invPlaceOrderDetailEntity.getInvSpaceCode()); -// } -// invPreInProductDetailDao.insert(invPreInProductDetailEntity); -// } -// } -// } -// } -// -// -// } else if (invWarehouseEntity.getAdvanceType() == ConstantStatus.ACTION_TYPE_ADVANCE) { -// -// invPlaceOrderDetailEntityList = invPlaceOrderDetailDao.selectList(new QueryWrapper().eq("recordId", bindInvSpaceRequest.getOrderId())); -// for (InvPlaceOrderDetailEntity invPlaceOrderDetailEntity : invPlaceOrderDetailEntityList) { -// -// for (Integer i = 0; i < invPlaceOrderDetailEntity.getCount(); i++) { -// //拆解库存表 -// InvPreProductDetailEntity invPreInProductDetailEntity = new InvPreProductDetailEntity(); -// QueryWrapper ew = new QueryWrapper<>(); -// if (bindInvSpaceRequest.getType() == 3) { -// ew.eq("code", invPlaceOrderDetailEntity.getCode()); -// ew.eq("invSpaceCode", bindInvSpaceRequest.getInvSpaceCode()); -// ew.last("limit 1"); -// invPreInProductDetailEntity = invPreProductDetailDao.selectOne(ew); -// } else { -// ew.eq("code", invPlaceOrderDetailEntity.getCode()); -// ew.and(o -> o.isNull("invSpaceCode").or().eq("invSpaceCode", "")); -// ew.gt("inCount", 0); -// ew.last("limit 1"); -// invPreInProductDetailEntity = invPreProductDetailDao.selectOne(ew); -// } -// -// if (invPreInProductDetailEntity.getInCount() > 0) { -// String nameCode = invPreInProductDetailEntity.getNameCode(); -// int reCount = getActCount(nameCode); -// invPreInProductDetailEntity.setInCount(invPreInProductDetailEntity.getInCount() - 1); -// invPreInProductDetailEntity.setCount(invPreInProductDetailEntity.getCount() - 1); -// invPreInProductDetailEntity.setReCount(invPreInProductDetailEntity.getReCount() - reCount); -// invPreProductDetailDao.updateById(invPreInProductDetailEntity); -// -// //如果库存为空就删了该数据 -// if (invPreInProductDetailEntity != null && invPreInProductDetailEntity.getInCount() == 0 && (invPreInProductDetailEntity.getOutCount() == null || invPreInProductDetailEntity.getOutCount() == 0) -// && invPreInProductDetailEntity.getCount() == 0 && invPreInProductDetailEntity.getReCount() == 0) { -// invPreProductDetailDao.deleteById(invPreInProductDetailEntity); -// } -// -// ew.clear(); -// ew.eq("code", invPlaceOrderDetailEntity.getCode()).eq("mainAction", ConstantType.TYPE_PUT); -// ; -// if (bindInvSpaceRequest.getType() == 3) { -// ew.eq("invSpaceCode", bindInvSpaceRequest.getChangeSpaceCode()); -// } else { -// ew.eq("invSpaceCode", invPlaceOrderDetailEntity.getInvSpaceCode()); -// } -// -// InvPreProductDetailEntity invPreInProductDetailEntity1 = invPreProductDetailDao.selectOne(ew); -// if (invPreInProductDetailEntity1 != null) { -// invPreInProductDetailEntity1.setCount(invPreInProductDetailEntity1.getCount() + 1); -// invPreInProductDetailEntity1.setInCount(invPreInProductDetailEntity1.getInCount() + 1); -// invPreInProductDetailEntity1.setReCount(invPreInProductDetailEntity1.getReCount() + reCount); -// invPreProductDetailDao.updateById(invPreInProductDetailEntity1); -// } else { -// invPreInProductDetailEntity.setId(null); -// invPreInProductDetailEntity.setInCount(1); -// invPreInProductDetailEntity.setCount(1); -// invPreInProductDetailEntity.setOutCount(0); -// invPreInProductDetailEntity.setReCount(reCount); -// if (bindInvSpaceRequest.getType() == 3) { -// invPreInProductDetailEntity.setInvSpaceCode(bindInvSpaceRequest.getChangeSpaceCode()); -// } else { -// invPreInProductDetailEntity.setInvSpaceCode(invPlaceOrderDetailEntity.getInvSpaceCode()); -// } -// invPreProductDetailDao.insert(invPreInProductDetailEntity); -// } -// } -// } -// } -// -// } else { -// invPlaceOrderDetailEntityList = invPlaceOrderDetailDao.selectList(new QueryWrapper().eq("recordId", bindInvSpaceRequest.getOrderId())); -// for (InvPlaceOrderDetailEntity invPlaceOrderDetailEntity : invPlaceOrderDetailEntityList) { -// -// for (Integer i = 0; i < invPlaceOrderDetailEntity.getCount(); i++) { -// //拆解库存表 -// InvProductDetailEntity invPreInProductDetailEntity = new InvProductDetailEntity(); -// QueryWrapper ew = new QueryWrapper<>(); -// if (bindInvSpaceRequest.getType() == 3) { -// ew.eq("code", invPlaceOrderDetailEntity.getCode()); -// ew.eq("invSpaceCode", bindInvSpaceRequest.getInvSpaceCode()); -// ew.last("limit 1"); -// invPreInProductDetailEntity = invProductDetailDao.selectOne(ew); -// } else { -// ew.eq("code", invPlaceOrderDetailEntity.getCode()); -// ew.and(o -> o.isNull("invSpaceCode").or().eq("invSpaceCode", "")); -// ew.gt("inCount", 0); -// ew.last("limit 1"); -// invPreInProductDetailEntity = invProductDetailDao.selectOne(ew); -// } -// if (invPreInProductDetailEntity.getInCount() > 0) { -// String nameCode = invPreInProductDetailEntity.getNameCode(); -// int reCount = getActCount(nameCode); -// invPreInProductDetailEntity.setInCount(invPreInProductDetailEntity.getInCount() - 1); -// invPreInProductDetailEntity.setCount(invPreInProductDetailEntity.getCount() - 1); -// invPreInProductDetailEntity.setReCount(invPreInProductDetailEntity.getReCount() - reCount); -// invProductDetailDao.updateById(invPreInProductDetailEntity); -// -// //如果库存为空就删了该数据 -// if (invPreInProductDetailEntity != null && invPreInProductDetailEntity.getInCount() == 0 && (invPreInProductDetailEntity.getOutCount() == null || invPreInProductDetailEntity.getOutCount() == 0) -// && invPreInProductDetailEntity.getCount() == 0 && invPreInProductDetailEntity.getReCount() == 0) { -// invProductDetailDao.deleteById(invPreInProductDetailEntity); -// } -// -// ew.clear(); -// ew.eq("code", invPlaceOrderDetailEntity.getCode()).eq("mainAction", ConstantType.TYPE_PUT); -// if (bindInvSpaceRequest.getType() == 3) { -// ew.eq("invSpaceCode", bindInvSpaceRequest.getChangeSpaceCode()); -// } else { -// ew.eq("invSpaceCode", invPlaceOrderDetailEntity.getInvSpaceCode()); -// } -// -// InvProductDetailEntity invPreInProductDetailEntity1 = invProductDetailDao.selectOne(ew); -// if (invPreInProductDetailEntity1 != null) { -// invPreInProductDetailEntity1.setCount(invPreInProductDetailEntity1.getCount() + 1); -// invPreInProductDetailEntity1.setInCount(invPreInProductDetailEntity1.getInCount() + 1); -// invPreInProductDetailEntity1.setReCount(invPreInProductDetailEntity1.getReCount() + reCount); -// invProductDetailDao.updateById(invPreInProductDetailEntity1); -// } else { -// invPreInProductDetailEntity.setId(null); -// invPreInProductDetailEntity.setInCount(1); -// invPreInProductDetailEntity.setCount(1); -// invPreInProductDetailEntity.setOutCount(0); -// invPreInProductDetailEntity.setReCount(reCount); -// if (bindInvSpaceRequest.getType() == 3) { -// invPreInProductDetailEntity.setInvSpaceCode(bindInvSpaceRequest.getChangeSpaceCode()); -// } else { -// invPreInProductDetailEntity.setInvSpaceCode(invPlaceOrderDetailEntity.getInvSpaceCode()); -// } -// invProductDetailDao.insert(invPreInProductDetailEntity); -// } -// } -// } -// } -// -// } -// int total = invPlaceOrderDetailEntityList.stream().mapToInt(InvPlaceOrderDetailEntity::getCount).sum(); -// QueryWrapper ew = new QueryWrapper<>(); -// ew.eq("recordId", bindInvSpaceRequest.getOrderId()); -// InvPlaceOrderEntity invPlaceOrderEntity = new InvPlaceOrderEntity(); -// invPlaceOrderEntity.setRecordId(bindInvSpaceRequest.getOrderId()); -// invPlaceOrderEntity.setCount(total); -// invPlaceOrderDao.update(invPlaceOrderEntity, ew); -// -//// if (CollUtil.isNotEmpty(list)) { -//// List ids = list.stream().map(InvProductDetailEntity::getId).collect(Collectors.toList()); -//// log.info("本次绑定货位的库存详情数量为：{} 条", ids.size()); -//// -//// -//// if (invWarehouseEntity.getAdvanceType() == ConstantStatus.ACTION_TYPE_PREIN) { -//// invPreInProductDetailDao.batchBindSpace(ids, bindInvSpaceRequest.getInvSpaceCode()); -//// } else if (invWarehouseEntity.getAdvanceType() == ConstantStatus.ACTION_TYPE_ADVANCE) { -//// invPreProductDetailDao.batchBindSpace(ids, bindInvSpaceRequest.getInvSpaceCode()); -//// } else { -//// invProductDetailDao.batchBindSpace(ids, bindInvSpaceRequest.getInvSpaceCode()); -//// } -//// -//// -//// //添加物资上架记录 -//// AddInvPlaceOrderRequest addInvPlaceOrderRequest = new AddInvPlaceOrderRequest(); -//// addInvPlaceOrderRequest.setType(bindInvSpaceRequest.getType()); -//// addInvPlaceOrderRequest.setOrderId(bindInvSpaceRequest.getOrderId()); -//// addInvPlaceOrderRequest.setCodeList(list); -//// addInvPlaceOrderRequest.setInvCode(bindInvSpaceRequest.getInvCode()); -//// addInvPlaceOrderRequest.setInvSpaceCode(bindInvSpaceRequest.getInvSpaceCode()); -//// invPlaceOrderService.addInvPlaceOrder(addInvPlaceOrderRequest); -//// return ResultVOUtils.success("绑定成功！本次绑定货位的库存详情数量为：" + ids.size() + "条"); -//// } else { -//// log.info("绑定货位列表查询无数据"); -//// return ResultVOUtils.error(500, "绑定货位列表查询无数据"); -//// } -// return ResultVOUtils.success(); + } @Override public BaseResponse bindInvOrderSpace(BindInvSpaceRequest bindInvSpaceRequest) { //查询仓库的部门ID -// String deptCode = invWarehouseDao.selectParentIdByCode(bindInvSpaceRequest.getInvCode()); InvWarehouseEntity invWarehouseEntity = invWarehouseDao.filterGroupInvSubAndcode(bindInvSpaceRequest.getInvCode()); List invPlaceOrderDetailEntityList = new ArrayList<>(); @@ -378,78 +126,6 @@ public class InvPlaceServiceImpl implements InvPlaceService { return ResultVOUtils.success(); } -// @Override -// public BaseResponse changeInvSpace(BindInvSpaceRequest bindInvSpaceRequest) { -// //查询仓库的部门ID -// String deptCode = invWarehouseDao.selectParentIdByCode(bindInvSpaceRequest.getInvCode()); -// InvWarehouseEntity invWarehouseEntity = invWarehouseDao.filterGroupInvSubAndcode(bindInvSpaceRequest.getInvCode()); -// -// List list = new ArrayList<>(); -// if (invWarehouseEntity.getAdvanceType() == ConstantStatus.ACTION_TYPE_PREIN) { -// List invPreInProductDetailEntities = invPreInProductDetailDao.selectList(new QueryWrapper() -// .select("id", "code", "relId", "batchNo") -// .eq("deptCode", deptCode) -// .eq("invCode", bindInvSpaceRequest.getInvCode()) -// .eq("invSpaceCode", bindInvSpaceRequest.getInvSpaceCode()) -// .in("code", bindInvSpaceRequest.getCodeArray()) -// ); -// for (InvPreInProductDetailEntity invPreInProductDetailEntity : invPreInProductDetailEntities) { -// InvProductDetailEntity invProductDetailEntity = new InvProductDetailEntity(); -// BeanCopyUtils.copy(invPreInProductDetailEntity, invProductDetailEntity); -// list.add(invProductDetailEntity); -// } -// } else if (invWarehouseEntity.getAdvanceType() == ConstantStatus.ACTION_TYPE_ADVANCE) { -// -// List invPreProductDetailEntities = invPreProductDetailDao.selectList(new QueryWrapper() -// .select("id", "code", "relId", "batchNo") -// .eq("deptCode", deptCode) -// .eq("invCode", bindInvSpaceRequest.getInvCode()) -// .eq("invSpaceCode", bindInvSpaceRequest.getInvSpaceCode()) -// .in("code", bindInvSpaceRequest.getCodeArray()) -// ); -// for (InvPreProductDetailEntity invPreInProductDetailEntity : invPreProductDetailEntities) { -// InvProductDetailEntity invProductDetailEntity = new InvProductDetailEntity(); -// BeanCopyUtils.copy(invPreInProductDetailEntity, invProductDetailEntity); -// list.add(invProductDetailEntity); -// } -// -// } else { -// list = invProductDetailDao.selectList(new QueryWrapper() -// .select("id", "code", "relId", "batchNo") -// .eq("deptCode", deptCode) -// .eq("invCode", bindInvSpaceRequest.getInvCode()) -// .eq("invSpaceCode", bindInvSpaceRequest.getInvSpaceCode()) -// .in("code", bindInvSpaceRequest.getCodeArray()) -// ); -// } -// -// if (CollUtil.isNotEmpty(list)) { -// List ids = list.stream().map(InvProductDetailEntity::getId).collect(Collectors.toList()); -// log.info("本次更换货位的库存详情数量为：{} 条", ids.size()); -// -// if (invWarehouseEntity.getAdvanceType() == ConstantStatus.ACTION_TYPE_PREIN) { -// invPreInProductDetailDao.batchBindSpace(ids, bindInvSpaceRequest.getChangeSpaceCode()); -// } else if (invWarehouseEntity.getAdvanceType() == ConstantStatus.ACTION_TYPE_ADVANCE) { -// invPreProductDetailDao.batchBindSpace(ids, bindInvSpaceRequest.getChangeSpaceCode()); -// } else { -// invProductDetailDao.batchBindSpace(ids, bindInvSpaceRequest.getChangeSpaceCode()); -// } -// -// -// //添加物资上架记录 -// AddInvPlaceOrderRequest addInvPlaceOrderRequest = new AddInvPlaceOrderRequest(); -// addInvPlaceOrderRequest.setType(bindInvSpaceRequest.getType()); -// addInvPlaceOrderRequest.setOrderId(bindInvSpaceRequest.getOrderId()); -// addInvPlaceOrderRequest.setCodeList(list); -// addInvPlaceOrderRequest.setInvCode(bindInvSpaceRequest.getInvCode()); -// addInvPlaceOrderRequest.setInvSpaceCode(bindInvSpaceRequest.getInvSpaceCode()); -// invPlaceOrderService.addInvPlaceOrder(addInvPlaceOrderRequest); -// return ResultVOUtils.success("绑定成功！本次绑定货位的库存详情数量为：" + ids.size() + "条"); -// } else { -// log.info("绑定货位列表查询无数据"); -// return ResultVOUtils.error(500, "绑定货位列表查询无数据"); -// } -// } @Override public BaseResponse checkCodeSpace(BindInvSpaceRequest bindInvSpaceRequest) { @@ -468,18 +144,6 @@ public class InvPlaceServiceImpl implements InvPlaceService { return ResultVOUtils.success(); } - @Override - public List getInvProductInfo(BindInvSpaceRequest bindInvSpaceRequest) { - return null; -// -// InvWarehouseEntity invWarehouseEntity = invWarehouseDao.selectOne(new QueryWrapper().eq("code", filterInvPlaceRequest.getInvCode())); -// if (invWarehouseEntity.getAdvanceType() == ConstantStatus.ACTION_TYPE_PREIN) { -// return invPreInProductDetailDao.getInvProductInfo(filterInvPlaceRequest); -// } else if (invWarehouseEntity.getAdvanceType() == ConstantStatus.ACTION_TYPE_ADVANCE) { -// return invPreProductDetailDao.getInvProductInfo(filterInvPlaceRequest); -// } else -// return invProductDetailDao.getInvProductInfo(filterInvPlaceRequest); - } @Override public List getInvPlaceOrderList(FilterInvPlaceRequest filterInvPlaceRequest) { @@ -600,500 +264,17 @@ public class InvPlaceServiceImpl implements InvPlaceService { return ""; } - //TODO 20241017 下架货物先注释 + //TODO 20241017 下架货物先注释（后面可能要重新） @Override public String checkOutCount(BindInvSpaceRequest bindInvSpaceRequest) { return null; -// InvWarehouseEntity invWarehouseEntity = invWarehouseDao.selectOne(new QueryWrapper().eq("code", bindInvSpaceRequest.getInvCode())); -// if (invWarehouseEntity.getAdvanceType() == ConstantStatus.ACTION_TYPE_PREIN) { -// QueryWrapper ew = new QueryWrapper<>(); -// ew.eq("invSpaceCode", bindInvSpaceRequest.getInvSpaceCode()); -// ew.eq("code", bindInvSpaceRequest.getCode()); -// ew.select("count"); -// ew.last("limit 1"); -// InvPreInProductDetailEntity invPreInProductDetailEntity = invPreInProductDetailDao.selectOne(ew); -// if (invPreInProductDetailEntity==null || invPreInProductDetailEntity.getCount() <= 0) { -// return "该产品没存在该货架上！"; -// } -// if (StrUtil.isNotBlank(bindInvSpaceRequest.getOrderId())) { -// QueryWrapper ew1 = new QueryWrapper(); -// ew1.eq("recordId", bindInvSpaceRequest.getOrderId()); -// ew1.eq("code", bindInvSpaceRequest.getCode()); -// InvPlaceOrderDetailEntity invPlaceOrderDetailEntity = invPlaceOrderDetailDao.selectOne(ew1); -// if (invPlaceOrderDetailEntity == null) { -// invPlaceOrderDetailEntity = new InvPlaceOrderDetailEntity(); -// invPlaceOrderDetailEntity.setCount(0); -// } -// if (invPlaceOrderDetailEntity.getCount() >= invPreInProductDetailEntity.getCount()) { -// return "该产品库存不足！"; -// } -// } -// } else if (invWarehouseEntity.getAdvanceType() == ConstantStatus.ACTION_TYPE_ADVANCE) { -// QueryWrapper ew = new QueryWrapper<>(); -// ew.eq("invSpaceCode", bindInvSpaceRequest.getInvSpaceCode()); -// ew.eq("code", bindInvSpaceRequest.getCode()); -// ew.select("count"); -// ew.last("limit 1"); -// InvPreProductDetailEntity invPreProductDetailEntity = invPreProductDetailDao.selectOne(ew); -// if (invPreProductDetailEntity==null || invPreProductDetailEntity.getCount() <= 0) { -// return "该产品没存在该货架上！"; -// } -// if (StrUtil.isNotBlank(bindInvSpaceRequest.getOrderId())) { -// QueryWrapper ew1 = new QueryWrapper(); -// ew1.eq("recordId", bindInvSpaceRequest.getOrderId()); -// ew1.eq("code", bindInvSpaceRequest.getCode()); -// InvPlaceOrderDetailEntity invPlaceOrderDetailEntity = invPlaceOrderDetailDao.selectOne(ew1); -// if (invPlaceOrderDetailEntity == null) { -// invPlaceOrderDetailEntity = new InvPlaceOrderDetailEntity(); -// invPlaceOrderDetailEntity.setCount(0); -// } -// if (invPlaceOrderDetailEntity.getCount() >= invPreProductDetailEntity.getCount()) { -// return "该产品库存不足！"; -// } -// } -// } else if (invWarehouseEntity.getAdvanceType() == ConstantStatus.ACTION_TYPE_NORMAL) { -// QueryWrapper ew = new QueryWrapper<>(); -// ew.eq("invSpaceCode", bindInvSpaceRequest.getInvSpaceCode()); -// ew.eq("code", bindInvSpaceRequest.getCode()); -// ew.select("count"); -// ew.last("limit 1"); -// InvProductDetailEntity invProductDetailEntity = invProductDetailDao.selectOne(ew); -// if (invProductDetailEntity==null || invProductDetailEntity.getCount() <= 0) { -// return "该产品没存在该货架上！"; -// } -// if (StrUtil.isNotBlank(bindInvSpaceRequest.getOrderId())) { -// QueryWrapper ew1 = new QueryWrapper(); -// ew1.eq("recordId", bindInvSpaceRequest.getOrderId()); -// ew1.eq("code", bindInvSpaceRequest.getCode()); -// InvPlaceOrderDetailEntity invPlaceOrderDetailEntity = invPlaceOrderDetailDao.selectOne(ew1); -// if (invPlaceOrderDetailEntity == null) { -// invPlaceOrderDetailEntity = new InvPlaceOrderDetailEntity(); -// invPlaceOrderDetailEntity.setCount(0); -// } -// if (invPlaceOrderDetailEntity.getCount() >= invProductDetailEntity.getCount()) { -// return "该产品库存不足！"; -// } -// } -// } -// return ""; - } - - - public int getActCount(String nameCode) { - UdiRelevanceResponse udiRelevanceResponse = udiRelevanceService.selectByNameCode(nameCode); - int count = getActCount(udiRelevanceResponse); - return count; - } - - public int getActCount(UdiRelevanceResponse udiRelevanceResponse) { - int actCount; - if (!udiRelevanceResponse.getUseDy() && (udiRelevanceResponse.getDiType() == null || udiRelevanceResponse.getDiType() != 2)) { - if (udiRelevanceResponse.getBhzxxsbzsl() == 0) { - actCount = udiRelevanceResponse.getZxxsbzbhsydysl(); - } else { - if (udiRelevanceResponse.getBhzxxsbzsl() == 0) { - udiRelevanceResponse.setBhzxxsbzsl(1); - } - if (udiRelevanceResponse.getZxxsbzbhsydysl() == null || udiRelevanceResponse.getZxxsbzbhsydysl() == 0) { - udiRelevanceResponse.setZxxsbzbhsydysl(1); - } - actCount = udiRelevanceResponse.getBhzxxsbzsl() * udiRelevanceResponse.getZxxsbzbhsydysl(); - } - } else { - actCount = udiRelevanceResponse.getBhzxxsbzsl(); - } - - return actCount; } - //TODO 20241017 下架货位接口先注释 + //TODO 20241017 下架货位接口先注释（后面可能要重新） @Override public BaseResponse unbindInvOrderSpace(BindInvSpaceRequest bindInvSpaceRequest) { return null; -// //查询仓库的部门ID -//// String deptCode = invWarehouseDao.selectParentIdByCode(bindInvSpaceRequest.getInvCode()); -// InvWarehouseEntity invWarehouseEntity = invWarehouseDao.filterGroupInvSubAndcode(bindInvSpaceRequest.getInvCode()); -// List invPlaceOrderDetailEntityList = new ArrayList<>(); -// int total = 0; -// if (bindInvSpaceRequest.getOutCount() > 0) { -// if (invWarehouseEntity.getAdvanceType() == ConstantStatus.ACTION_TYPE_PREIN) { -// invPlaceOrderDetailEntityList = invPlaceOrderDetailDao.selectList(new QueryWrapper().eq("recordId", bindInvSpaceRequest.getOrderId())); -// for (InvPlaceOrderDetailEntity invPlaceOrderDetailEntity : invPlaceOrderDetailEntityList) { -// -// for (Integer i = 0; i < invPlaceOrderDetailEntity.getCount(); i++) { -// //去掉库存 -// QueryWrapper ew = new QueryWrapper<>(); -// InvPreInProductDetailEntity invPreInProductDetailEntity = new InvPreInProductDetailEntity(); -// ew.eq("code", invPlaceOrderDetailEntity.getCode()); -// ew.eq("invSpaceCode", bindInvSpaceRequest.getInvSpaceCode()); -// ew.gt("inCount", 0); -// ew.last("limit 1"); -// invPreInProductDetailEntity = invPreInProductDetailDao.selectOne(ew); -// -// -// if (invPreInProductDetailEntity.getInCount() > 0) { -// String nameCode = invPreInProductDetailEntity.getNameCode(); -// int reCount = getActCount(nameCode); -// invPreInProductDetailEntity.setInCount(invPreInProductDetailEntity.getInCount() - 1); -// invPreInProductDetailEntity.setCount(invPreInProductDetailEntity.getCount() - 1); -// invPreInProductDetailEntity.setReCount(invPreInProductDetailEntity.getReCount() - reCount); -// invPreInProductDetailDao.updateById(invPreInProductDetailEntity); -// -// //如果库存为空就删了该数据 -// ew.clear(); -// ew.eq("code", invPlaceOrderDetailEntity.getCode()); -// ew.eq("invSpaceCode", bindInvSpaceRequest.getInvSpaceCode()); -// ew.last("limit 1"); -// invPreInProductDetailEntity = invPreInProductDetailDao.selectOne(ew); -// if (invPreInProductDetailEntity != null && invPreInProductDetailEntity.getInCount() == 0 && (invPreInProductDetailEntity.getOutCount() == null || invPreInProductDetailEntity.getOutCount() == 0) -// && invPreInProductDetailEntity.getCount() == 0 && invPreInProductDetailEntity.getReCount() == 0) { -// invPreInProductDetailDao.deleteById(invPreInProductDetailEntity); -// } -// -// -// //如果有存在数据就加没有就新建 -// ew.clear(); -// ew.eq("code", invPlaceOrderDetailEntity.getCode()); -// ew.and(o -> o.isNull("invSpaceCode").or().eq("invSpaceCode", "")); -// ew.last("limit 1"); -// invPreInProductDetailEntity = invPreInProductDetailDao.selectOne(ew); -// if (invPreInProductDetailEntity != null) { -// nameCode = invPreInProductDetailEntity.getNameCode(); -// reCount = getActCount(nameCode); -// invPreInProductDetailEntity.setInCount(invPreInProductDetailEntity.getInCount() + 1); -// invPreInProductDetailEntity.setCount(invPreInProductDetailEntity.getCount() + 1); -// invPreInProductDetailEntity.setReCount(invPreInProductDetailEntity.getReCount() + reCount); -// invPreInProductDetailDao.updateById(invPreInProductDetailEntity); -// } else { -// ew.clear(); -// ew.eq("code", invPlaceOrderDetailEntity.getCode()); -// ew.last("limit 1"); -// invPreInProductDetailEntity = invPreInProductDetailDao.selectOne(ew); -// invPreInProductDetailEntity.setId(null); -// invPreInProductDetailEntity.setInvSpaceCode(""); -// invPreInProductDetailEntity.setInCount(1); -// invPreInProductDetailEntity.setCount(1); -// invPreInProductDetailEntity.setReCount(reCount); -// invPreInProductDetailEntity.setOutCount(0); -// invPreInProductDetailDao.insert(invPreInProductDetailEntity); -// } -// //如果库存为空就删了该数据 -// ew.clear(); -// ew.eq("code", invPlaceOrderDetailEntity.getCode()); -// ew.eq("invSpaceCode", bindInvSpaceRequest.getInvSpaceCode()); -// ew.last("limit 1"); -// invPreInProductDetailEntity = invPreInProductDetailDao.selectOne(ew); -// if (invPreInProductDetailEntity != null && invPreInProductDetailEntity.getInCount() == 0 && (invPreInProductDetailEntity.getOutCount() == null || invPreInProductDetailEntity.getOutCount() == 0) -// && invPreInProductDetailEntity.getCount() == 0 && invPreInProductDetailEntity.getReCount() == 0) { -// invPreInProductDetailDao.deleteById(invPreInProductDetailEntity); -// } -// } -// } -// } -// } else if (invWarehouseEntity.getAdvanceType() == ConstantStatus.ACTION_TYPE_ADVANCE) { -// -// invPlaceOrderDetailEntityList = invPlaceOrderDetailDao.selectList(new QueryWrapper().eq("recordId", bindInvSpaceRequest.getOrderId())); -// for (InvPlaceOrderDetailEntity invPlaceOrderDetailEntity : invPlaceOrderDetailEntityList) { -// -// for (Integer i = 0; i < invPlaceOrderDetailEntity.getCount(); i++) { -// //去掉库存 -// QueryWrapper ew = new QueryWrapper<>(); -// InvPreProductDetailEntity invPreProductDetailEntity = new InvPreProductDetailEntity(); -// ew.eq("code", invPlaceOrderDetailEntity.getCode()); -// ew.eq("invSpaceCode", bindInvSpaceRequest.getInvSpaceCode()); -// ew.gt("inCount", 0); -// ew.last("limit 1"); -// invPreProductDetailEntity = invPreProductDetailDao.selectOne(ew); -// -// -// if (invPreProductDetailEntity.getInCount() > 0) { -// String nameCode = invPlaceOrderDetailEntity.getNameCode(); -// int reCount = getActCount(nameCode); -// invPreProductDetailEntity.setInCount(invPreProductDetailEntity.getInCount() - 1); -// invPreProductDetailEntity.setCount(invPreProductDetailEntity.getCount() - 1); -// invPreProductDetailEntity.setReCount(invPreProductDetailEntity.getReCount() - reCount); -// invPreProductDetailDao.updateById(invPreProductDetailEntity); -// -// -// -// //如果有存在数据就加没有就新建 -// ew.clear(); -// ew.eq("code", invPlaceOrderDetailEntity.getCode()); -// ew.and(o -> o.isNull("invSpaceCode").or().eq("invSpaceCode", "")); -// ew.last("limit 1"); -// invPreProductDetailEntity = invPreProductDetailDao.selectOne(ew); -// if (invPreProductDetailEntity != null) { -// nameCode = invPreProductDetailEntity.getNameCode(); -// reCount = getActCount(nameCode); -// invPreProductDetailEntity.setInCount(invPreProductDetailEntity.getInCount() + 1); -// invPreProductDetailEntity.setCount(invPreProductDetailEntity.getCount() + 1); -// invPreProductDetailEntity.setReCount(invPreProductDetailEntity.getReCount() + reCount); -// invPreProductDetailDao.updateById(invPreProductDetailEntity); -// } else { -// ew.clear(); -// ew.eq("code", invPlaceOrderDetailEntity.getCode()); -// ew.last("limit 1"); -// invPreProductDetailEntity = invPreProductDetailDao.selectOne(ew); -// invPreProductDetailEntity.setId(null); -// invPreProductDetailEntity.setInvSpaceCode(""); -// invPreProductDetailEntity.setInCount(1); -// invPreProductDetailEntity.setCount(1); -// invPreProductDetailEntity.setReCount(reCount); -// invPreProductDetailEntity.setOutCount(0); -// invPreProductDetailDao.insert(invPreProductDetailEntity); -// } -// //如果库存为空就删了该数据 -// ew.clear(); -// ew.eq("code", invPlaceOrderDetailEntity.getCode()); -// ew.eq("invSpaceCode", bindInvSpaceRequest.getInvSpaceCode()); -// ew.last("limit 1"); -// invPreProductDetailEntity = invPreProductDetailDao.selectOne(ew); -// if (invPreProductDetailEntity != null && invPreProductDetailEntity.getInCount() == 0 && (invPreProductDetailEntity.getOutCount() == null || invPreProductDetailEntity.getOutCount() == 0) -// && invPreProductDetailEntity.getCount() == 0 && invPreProductDetailEntity.getReCount() == 0) { -// invPreProductDetailDao.deleteById(invPreProductDetailEntity); -// } -// } -// } -// } -// -// -// } else { -// invPlaceOrderDetailEntityList = invPlaceOrderDetailDao.selectList(new QueryWrapper().eq("recordId", bindInvSpaceRequest.getOrderId())); -// for (InvPlaceOrderDetailEntity invPlaceOrderDetailEntity : invPlaceOrderDetailEntityList) { -// -// for (Integer i = 0; i < invPlaceOrderDetailEntity.getCount(); i++) { -// //去掉库存 -// QueryWrapper ew = new QueryWrapper<>(); -// InvProductDetailEntity invProductDetailEntity = new InvProductDetailEntity(); -// ew.eq("code", invPlaceOrderDetailEntity.getCode()); -// ew.eq("invSpaceCode", bindInvSpaceRequest.getInvSpaceCode()); -// ew.gt("inCount", 0); -// ew.last("limit 1"); -// invProductDetailEntity = invProductDetailDao.selectOne(ew); -// -// -// if (invProductDetailEntity.getInCount() > 0) { -// String nameCode = invProductDetailEntity.getNameCode(); -// int reCount = getActCount(nameCode); -// invProductDetailEntity.setInCount(invProductDetailEntity.getInCount() - 1); -// invProductDetailEntity.setCount(invProductDetailEntity.getCount() - 1); -// invProductDetailEntity.setReCount(invProductDetailEntity.getReCount() - reCount); -// invProductDetailDao.updateById(invProductDetailEntity); -// -// -// -// //如果有存在数据就加没有就新建 -// ew.clear(); -// ew.eq("code", invPlaceOrderDetailEntity.getCode()); -// ew.and(o -> o.isNull("invSpaceCode").or().eq("invSpaceCode", "")); -// ew.last("limit 1"); -// invProductDetailEntity = invProductDetailDao.selectOne(ew); -// if (invProductDetailEntity != null) { -// nameCode = invProductDetailEntity.getNameCode(); -// reCount = getActCount(nameCode); -// invProductDetailEntity.setInCount(invProductDetailEntity.getInCount() + 1); -// invProductDetailEntity.setCount(invProductDetailEntity.getCount() + 1); -// invProductDetailEntity.setReCount(invProductDetailEntity.getReCount() + reCount); -// invProductDetailDao.updateById(invProductDetailEntity); -// } else { -// ew.clear(); -// ew.eq("code", invPlaceOrderDetailEntity.getCode()); -// ew.last("limit 1"); -// invProductDetailEntity = invProductDetailDao.selectOne(ew); -// invProductDetailEntity.setId(null); -// invProductDetailEntity.setInvSpaceCode(""); -// invProductDetailEntity.setInCount(1); -// invProductDetailEntity.setCount(1); -// invProductDetailEntity.setReCount(reCount); -// invProductDetailEntity.setOutCount(0); -// invProductDetailDao.insert(invProductDetailEntity); -// } -// -// -// //如果库存为空就删了该数据 -// ew.clear(); -// ew.eq("code", invPlaceOrderDetailEntity.getCode()); -// ew.eq("invSpaceCode", bindInvSpaceRequest.getInvSpaceCode()); -// ew.last("limit 1"); -// invProductDetailEntity = invProductDetailDao.selectOne(ew); -// if (invProductDetailEntity != null && invProductDetailEntity.getInCount() == 0 && (invProductDetailEntity.getOutCount() == null || invProductDetailEntity.getOutCount() == 0) -// && invProductDetailEntity.getCount() == 0 && invProductDetailEntity.getReCount() == 0) { -// invProductDetailDao.deleteById(invProductDetailEntity); -// } -// } -// } -// } -// } -// total = invPlaceOrderDetailEntityList.stream().mapToInt(InvPlaceOrderDetailEntity::getCount).sum(); -// } else { -// if (invWarehouseEntity.getAdvanceType() == ConstantStatus.ACTION_TYPE_PREIN) { -// -// QueryWrapper ew = new QueryWrapper<>(); -// ew.eq("invSpaceCode", bindInvSpaceRequest.getInvSpaceCode()); -// InvPreInProductDetailEntity invPreInProductDetailEntity = new InvPreInProductDetailEntity(); -// invPreInProductDetailEntity.setInvSpaceCode(""); -// List invProductDetailEntityList = invPreInProductDetailDao.selectList(ew); -// //操作人ID -// String userId = customerService.getUserIdStr(); -// String recordId = gennerOrderUtils.createInvPlaceOrderNo(new OrderNoTypeBean(Constant.INV_PLACE_ORDER, "yyyyMMdd")); -// //插入主表 -// InvPlaceOrderEntity orderEntity = new InvPlaceOrderEntity(); -// orderEntity.setId(IdUtil.getSnowflakeNextId()); -// orderEntity.setRecordId(recordId); -// orderEntity.setType(4); -// orderEntity.setCreateUser(userId); -// orderEntity.setCreateTime(new Date()); -// orderEntity.setUpdateTime(new Date()); -// invPlaceOrderDao.insert(orderEntity); -// for (InvPreInProductDetailEntity productDetailEntity : invProductDetailEntityList) { -// for (int i = 0; i < productDetailEntity.getCount(); i++) { -// //插入附表不存在就新增存在就更新 -// QueryWrapper ew1 = new QueryWrapper<>(); -// ew1.eq("recordId", recordId); -// ew1.eq("code", productDetailEntity.getCode()); -// InvPlaceOrderDetailEntity invPlaceOrderDetailEntity = invPlaceOrderDetailDao.selectOne(ew1); -// if (invPlaceOrderDetailEntity != null) { -// invPlaceOrderDetailEntity.setCount(invPlaceOrderDetailEntity.getCount() + 1); -// invPlaceOrderDetailDao.updateById(invPlaceOrderDetailEntity); -// } else { -// invPlaceOrderDetailEntity = new InvPlaceOrderDetailEntity(); -// invPlaceOrderDetailEntity.setId(IdUtil.getSnowflakeNextId()); -// invPlaceOrderDetailEntity.setRecordId(recordId); -// invPlaceOrderDetailEntity.setBatchNo(productDetailEntity.getBatchNo()); -// invPlaceOrderDetailEntity.setRelId(productDetailEntity.getRelId() + ""); -// invPlaceOrderDetailEntity.setNameCode(productDetailEntity.getNameCode()); -// invPlaceOrderDetailEntity.setExpireDate(productDetailEntity.getExpireDate()); -// invPlaceOrderDetailEntity.setProduceDate(productDetailEntity.getProduceDate()); -// invPlaceOrderDetailEntity.setSupId(productDetailEntity.getSupId()); -// invPlaceOrderDetailEntity.setInvCode(bindInvSpaceRequest.getInvCode()); -// invPlaceOrderDetailEntity.setInvSpaceCode(bindInvSpaceRequest.getInvSpaceCode()); -// invPlaceOrderDetailEntity.setCode(productDetailEntity.getCode()); -// invPlaceOrderDetailEntity.setSerialNo(productDetailEntity.getSerialNo()); -// invPlaceOrderDetailEntity.setCount(1); -// invPlaceOrderDetailDao.insert(invPlaceOrderDetailEntity); -// } -// total++; -// } -// } -// invPreInProductDetailDao.update(invPreInProductDetailEntity, ew); -// bindInvSpaceRequest.setOrderId(recordId); -// } else if (invWarehouseEntity.getAdvanceType() == ConstantStatus.ACTION_TYPE_ADVANCE) { -// -// -// QueryWrapper ew = new QueryWrapper<>(); -// ew.eq("invSpaceCode", bindInvSpaceRequest.getInvSpaceCode()); -// InvPreProductDetailEntity invPreProductDetailEntity = new InvPreProductDetailEntity(); -// invPreProductDetailEntity.setInvSpaceCode(""); -// List invProductDetailEntityList = invPreProductDetailDao.selectList(ew); -// //操作人ID -// String userId = customerService.getUserIdStr(); -// String recordId = gennerOrderUtils.createInvPlaceOrderNo(new OrderNoTypeBean(Constant.INV_PLACE_ORDER, "yyyyMMdd")); -// //插入主表 -// InvPlaceOrderEntity orderEntity = new InvPlaceOrderEntity(); -// orderEntity.setId(IdUtil.getSnowflakeNextId()); -// orderEntity.setRecordId(recordId); -// orderEntity.setType(4); -// orderEntity.setCreateUser(userId); -// orderEntity.setCreateTime(new Date()); -// orderEntity.setUpdateTime(new Date()); -// invPlaceOrderDao.insert(orderEntity); -// for (InvPreProductDetailEntity productDetailEntity : invProductDetailEntityList) { -// for (int i = 0; i < productDetailEntity.getCount(); i++) { -// //插入附表不存在就新增存在就更新 -// QueryWrapper ew1 = new QueryWrapper<>(); -// ew1.eq("recordId", recordId); -// ew1.eq("code", productDetailEntity.getCode()); -// InvPlaceOrderDetailEntity invPlaceOrderDetailEntity = invPlaceOrderDetailDao.selectOne(ew1); -// if (invPlaceOrderDetailEntity != null) { -// invPlaceOrderDetailEntity.setCount(invPlaceOrderDetailEntity.getCount() + 1); -// invPlaceOrderDetailDao.updateById(invPlaceOrderDetailEntity); -// } else { -// invPlaceOrderDetailEntity = new InvPlaceOrderDetailEntity(); -// invPlaceOrderDetailEntity.setId(IdUtil.getSnowflakeNextId()); -// invPlaceOrderDetailEntity.setRecordId(recordId); -// invPlaceOrderDetailEntity.setBatchNo(productDetailEntity.getBatchNo()); -// invPlaceOrderDetailEntity.setRelId(productDetailEntity.getRelId() + ""); -// invPlaceOrderDetailEntity.setNameCode(productDetailEntity.getNameCode()); -// invPlaceOrderDetailEntity.setExpireDate(productDetailEntity.getExpireDate()); -// invPlaceOrderDetailEntity.setProduceDate(productDetailEntity.getProduceDate()); -// invPlaceOrderDetailEntity.setSupId(productDetailEntity.getSupId()); -// invPlaceOrderDetailEntity.setInvCode(bindInvSpaceRequest.getInvCode()); -// invPlaceOrderDetailEntity.setInvSpaceCode(bindInvSpaceRequest.getInvSpaceCode()); -// invPlaceOrderDetailEntity.setCode(productDetailEntity.getCode()); -// invPlaceOrderDetailEntity.setSerialNo(productDetailEntity.getSerialNo()); -// invPlaceOrderDetailEntity.setCount(1); -// invPlaceOrderDetailDao.insert(invPlaceOrderDetailEntity); -// } -// total++; -// } -// } -// invPreProductDetailDao.update(invPreProductDetailEntity, ew); -// bindInvSpaceRequest.setOrderId(recordId); -// } else { -// -// QueryWrapper ew = new QueryWrapper<>(); -// ew.eq("invSpaceCode", bindInvSpaceRequest.getInvSpaceCode()); -// InvProductDetailEntity invProductDetailEntity = new InvProductDetailEntity(); -// invProductDetailEntity.setInvSpaceCode(""); -// List invProductDetailEntityList = invProductDetailDao.selectList(ew); -// //操作人ID -// String userId = customerService.getUserIdStr(); -// String recordId = gennerOrderUtils.createInvPlaceOrderNo(new OrderNoTypeBean(Constant.INV_PLACE_ORDER, "yyyyMMdd")); -// //插入主表 -// InvPlaceOrderEntity orderEntity = new InvPlaceOrderEntity(); -// orderEntity.setId(IdUtil.getSnowflakeNextId()); -// orderEntity.setRecordId(recordId); -// orderEntity.setType(4); -// orderEntity.setCreateUser(userId); -// orderEntity.setCreateTime(new Date()); -// orderEntity.setUpdateTime(new Date()); -// invPlaceOrderDao.insert(orderEntity); -// for (InvProductDetailEntity productDetailEntity : invProductDetailEntityList) { -// for (int i = 0; i < productDetailEntity.getCount(); i++) { -// //插入附表不存在就新增存在就更新 -// QueryWrapper ew1 = new QueryWrapper<>(); -// ew1.eq("recordId", recordId); -// ew1.eq("code", productDetailEntity.getCode()); -// InvPlaceOrderDetailEntity invPlaceOrderDetailEntity = invPlaceOrderDetailDao.selectOne(ew1); -// if (invPlaceOrderDetailEntity != null) { -// invPlaceOrderDetailEntity.setCount(invPlaceOrderDetailEntity.getCount() + 1); -// invPlaceOrderDetailDao.updateById(invPlaceOrderDetailEntity); -// } else { -// invPlaceOrderDetailEntity = new InvPlaceOrderDetailEntity(); -// invPlaceOrderDetailEntity.setId(IdUtil.getSnowflakeNextId()); -// invPlaceOrderDetailEntity.setRecordId(recordId); -// invPlaceOrderDetailEntity.setBatchNo(productDetailEntity.getBatchNo()); -// invPlaceOrderDetailEntity.setRelId(productDetailEntity.getRelId() + ""); -// invPlaceOrderDetailEntity.setNameCode(productDetailEntity.getNameCode()); -// invPlaceOrderDetailEntity.setExpireDate(productDetailEntity.getExpireDate()); -// invPlaceOrderDetailEntity.setProduceDate(productDetailEntity.getProduceDate()); -// invPlaceOrderDetailEntity.setSupId(productDetailEntity.getSupId()); -// invPlaceOrderDetailEntity.setInvCode(bindInvSpaceRequest.getInvCode()); -// invPlaceOrderDetailEntity.setInvSpaceCode(bindInvSpaceRequest.getInvSpaceCode()); -// invPlaceOrderDetailEntity.setCode(productDetailEntity.getCode()); -// invPlaceOrderDetailEntity.setSerialNo(productDetailEntity.getSerialNo()); -// invPlaceOrderDetailEntity.setCount(1); -// invPlaceOrderDetailDao.insert(invPlaceOrderDetailEntity); -// } -// total++; -// } -// } -// invProductDetailDao.update(invProductDetailEntity, ew); -// bindInvSpaceRequest.setOrderId(recordId); -// -// -// } -// } -// -// -// QueryWrapper ew = new QueryWrapper<>(); -// ew.eq("recordId", bindInvSpaceRequest.getOrderId()); -// InvPlaceOrderEntity invPlaceOrderEntity = new InvPlaceOrderEntity(); -// invPlaceOrderEntity.setRecordId(bindInvSpaceRequest.getOrderId()); -// invPlaceOrderEntity.setCount(total); -// invPlaceOrderDao.update(invPlaceOrderEntity, ew); -// return ResultVOUtils.success(); } diff --git a/src/main/java/com/glxp/api/service/inv/impl/InvPreInProductDetailServiceImpl.java b/src/main/java/com/glxp/api/service/inv/impl/InvPreInProductDetailServiceImpl.java index 9efc3925b..750bf8f6c 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/InvPreInProductDetailServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inv/impl/InvPreInProductDetailServiceImpl.java @@ -156,11 +156,6 @@ public class InvPreInProductDetailServiceImpl implements InvPreinProductDetailSe response.setOrderTime(MsDateUtil.toDateStr(order.getCreateTime(), "yyyy-MM-dd HH:mm:ss")); } - @Override - public boolean deleteInvPreProductDetail(FilterInvProductDetailRequest detailRequest) { - return invPreInProductDetailDao.deleteInvPreProductDetail(detailRequest); - } - @Override public int findCountByCode(String code) { List invPreinDetailEntities = invPreInProductDetailDao.selectList(new QueryWrapper().eq("code", code)); @@ -177,35 +172,6 @@ public class InvPreInProductDetailServiceImpl implements InvPreinProductDetailSe return count; } - @Override - public int findCountBySpaceCode(String spaceCode, String code) { - - - List invPreinDetailEntities = invPreInProductDetailDao.selectList(new QueryWrapper().eq("code", code).eq("invSpaceCode", spaceCode)); - int count = 0; - if (CollUtil.isNotEmpty(invPreinDetailEntities)) { - for (InvPreInProductDetailEntity invProductDetailEntity : invPreinDetailEntities) { - if (invProductDetailEntity.getMainAction().equals(ConstantType.TYPE_PUT)) - count = count + invProductDetailEntity.getReCount(); - else { - count = count - invProductDetailEntity.getReCount(); - } - } - } - return count; - - } - - @Override - public InvPreInProductDetailEntity findUseOneByCode(String code) { - List invPreinDetailEntities = invPreInProductDetailDao.selectList(new QueryWrapper().eq("code", code) - .last("limit 1")); - if (CollUtil.isNotEmpty(invPreinDetailEntities)) { - return invPreinDetailEntities.get(0); - } - return null; - } - @Override public int vailStockCount(Long relId, String batchNo, String supId, String deptCode, String invCode, String invSpaceCode) { @@ -256,13 +222,12 @@ public class InvPreInProductDetailServiceImpl implements InvPreinProductDetailSe @Override public List findByGroupCode(String invCode, String code) { + List datas = null; if (StrUtil.isNotEmpty(invCode) && StrUtil.isNotEmpty(code)) { - List datas = - invPreInProductDetailDao.findByGroupCode(invCode, code); - return datas; + datas = invPreInProductDetailDao.findByGroupCode(invCode, code); } - return null; + return datas; } @Override diff --git a/src/main/java/com/glxp/api/service/inv/impl/InvPreProductDetailServiceImpl.java b/src/main/java/com/glxp/api/service/inv/impl/InvPreProductDetailServiceImpl.java index fcb4e3b65..2947ae8b3 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/InvPreProductDetailServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inv/impl/InvPreProductDetailServiceImpl.java @@ -158,31 +158,6 @@ public class InvPreProductDetailServiceImpl implements InvPreProductDetailServic } - @Override - public int findCountByCode(String code) { - List invPreinDetailEntities = invPreProductDetailDao.selectList(new QueryWrapper().eq("code", code)); - int count = 0; - if (CollUtil.isNotEmpty(invPreinDetailEntities)) { - for (InvPreProductDetailEntity invProductDetailEntity : invPreinDetailEntities) { - if (invProductDetailEntity.getMainAction().equals(ConstantType.TYPE_PUT)) - count = count + invProductDetailEntity.getReCount(); - else { - count = count - invProductDetailEntity.getReCount(); - } - } - } - return count; - } - - @Override - public InvPreProductDetailEntity findUseOneByCode(String code) { - List invPreinDetailEntities = invPreProductDetailDao.selectList(new QueryWrapper().eq("code", code) - .last("limit 1")); - if (CollUtil.isNotEmpty(invPreinDetailEntities)) { - return invPreinDetailEntities.get(0); - } - return null; - } @Override public int vailStockCount(Long relId, String batchNo, String supId, String deptCode, String invCode, String invSpaceCode) { @@ -209,36 +184,15 @@ public class InvPreProductDetailServiceImpl implements InvPreProductDetailServic return count; } - @Override - public int vailStockCountByCode(String deptCode, String invCode, String invSpaceCode, String code) { - List datas = - invPreProductDetailDao.selectList(new QueryWrapper().eq(StrUtil.isNotEmpty(deptCode), "deptCode", deptCode).eq("invCode", invCode) - .eq(StrUtil.isNotEmpty(invSpaceCode), "invSpaceCode", invSpaceCode) - .eq("code", code) - ); - - int count = 0; - if (CollUtil.isNotEmpty(datas)) { - for (InvPreProductDetailEntity invProductDetailEntity : datas) { - if (invProductDetailEntity.getMainAction().equals(ConstantType.TYPE_PUT)) - count = count + invProductDetailEntity.getReCount(); - else { - count = count - invProductDetailEntity.getReCount(); - } - } - } - return count; - } @Override public List findByGroupCode(String invCode, String code) { + List datas = null; if (StrUtil.isNotEmpty(invCode) && StrUtil.isNotEmpty(code)) { - List datas = - invPreProductDetailDao.findByGroupCode(invCode, code); - return datas; + datas = invPreProductDetailDao.findByGroupCode(invCode, code); } - return null; + return datas; } } diff --git a/src/main/java/com/glxp/api/service/inv/impl/InvPreinDetailServiceImpl.java b/src/main/java/com/glxp/api/service/inv/impl/InvPreinDetailServiceImpl.java index 633a4e662..2479e6217 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/InvPreinDetailServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inv/impl/InvPreinDetailServiceImpl.java @@ -41,34 +41,11 @@ public class InvPreinDetailServiceImpl implements InvPreinDetailService { invPreinDetailDao.insertBatch(invPreinDetailEntities); } - @Override - public List findUseByCode(String code) { - return invPreinDetailDao.selectList(new QueryWrapper().eq("code", code).eq("status", ConstantStatus.INVIN_IN)); - } - - @Override - public InvPreinDetailEntity findUseOneByCode(String code) { - List invPreinDetailEntities = invPreinDetailDao.selectList(new QueryWrapper().eq("code", code) - .eq("status", ConstantStatus.INVIN_IN).last("limit 1")); - if (CollUtil.isNotEmpty(invPreinDetailEntities)) { - return invPreinDetailEntities.get(0); - } - return null; - } @Override public List findByCode(String code) { return invPreinDetailDao.selectList(new QueryWrapper().eq("code", code)); } -// -// @Override -// public InvPreinDetailEntity findOneByCode(String code) { -// List invPreinDetailEntities = invPreinDetailDao.selectList(new QueryWrapper().eq("code", code).last("limit 1")); -// if (CollUtil.isNotEmpty(invPreinDetailEntities)) { -// return invPreinDetailEntities.get(0); -// } -// return null; -// } @Override public int deleteByOrderId(String orderId) { @@ -102,13 +79,5 @@ public class InvPreinDetailServiceImpl implements InvPreinDetailService { return invPreinDetailDao.updateById(invPreinDetailEntity); } - @Override - public int updateBack(String orderId) { - InvPreinDetailEntity invPreinDetailEntity = new InvPreinDetailEntity(); - invPreinDetailEntity.setStatus(ConstantStatus.INVIN_BACK); - invPreinDetailDao.update(invPreinDetailEntity, new QueryWrapper().eq("orderId", orderId).ne("status", ConstantStatus.INVIN_USE)); - return 1; - } - } diff --git a/src/main/java/com/glxp/api/service/inv/impl/InvPreinProductServiceImpl.java b/src/main/java/com/glxp/api/service/inv/impl/InvPreinProductServiceImpl.java index f1bb93b4a..2452ccc5e 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/InvPreinProductServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inv/impl/InvPreinProductServiceImpl.java @@ -77,16 +77,6 @@ public class InvPreinProductServiceImpl implements InvPreinProductService { return invPreinProductDao.filterListStock(invPreProductRequest); } - @Override - public List filterPreinProductList(FilterInvPreinProductRequest invPreProductRequest) { - if (null == invPreProductRequest) { - return Collections.emptyList(); - } - if (null != invPreProductRequest.getPage() && null != invPreProductRequest.getLimit()) { - PageHelper.offsetPage((invPreProductRequest.getPage() - 1) * invPreProductRequest.getLimit(), invPreProductRequest.getLimit()); - } - return invPreinProductDao.filterPreProductList(invPreProductRequest); - } @Override public List findGroupBySpace(FilterInvPreinProductRequest invPreProductRequest) { @@ -106,10 +96,5 @@ public class InvPreinProductServiceImpl implements InvPreinProductService { } - @Override - public boolean isExitByRelId(String relId) { - return invPreinProductDao.exists(new QueryWrapper().eq("relIdFk", relId)); - - } } diff --git a/src/main/java/com/glxp/api/service/inv/impl/InvProductService.java b/src/main/java/com/glxp/api/service/inv/impl/InvProductService.java index bf4033ada..c201e86bb 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/InvProductService.java +++ b/src/main/java/com/glxp/api/service/inv/impl/InvProductService.java @@ -39,11 +39,6 @@ public class InvProductService extends ServiceImpl invProductEntities) { - return invProductDao.updateBatchById(invProductEntities); - } - - public InvProductEntity selectByUnique(Long relId, String batchNo, String supId, String deptCode, String invCode, BigDecimal price) { return invProductDao.selectOne(new QueryWrapper().eq("relIdFk", relId) .eq(StrUtil.isNotBlank(batchNo), "batchNo", batchNo).isNull(StrUtil.isEmpty(batchNo), "batchNo") diff --git a/src/main/java/com/glxp/api/service/inv/impl/InvProductServiceNew.java b/src/main/java/com/glxp/api/service/inv/impl/InvProductServiceNew.java index 6df32710b..0c8ef40d0 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/InvProductServiceNew.java +++ b/src/main/java/com/glxp/api/service/inv/impl/InvProductServiceNew.java @@ -48,17 +48,6 @@ public class InvProductServiceNew extends ServiceImpl selectByOrderIdFk(String billNo) { if (StrUtil.isEmpty(billNo)) return null; @@ -80,28 +69,6 @@ public class InvProductServiceNew extends ServiceImpl().eq("orderId", billNo)); -// } - - -// public int deleteById(Integer id) { -// return invProductNewDao.deleteById(id); -// } -// -// -// public int update(InvProductNewVo InvProductNewVo) { -// -// if (InvProductNewVo.getMainAction().equals(ConstantType.TYPE_PUT)) { -// InvProductNewVo.setInCount(InvProductNewVo.getReCount()); -// } else if (InvProductNewVo.getMainAction().equals(ConstantType.TYPE_OUT)) { -// InvProductNewVo.setOutCount(InvProductNewVo.getReCount()); -// } -// -// return invProductNewDao.updateById(InvProductNewVo); -// } - public List selectByUnique(Long relId, String batchNo, String supId, String deptCode, String invCode) { return invProductNewDao.selectList(new QueryWrapper().eq("relId", relId).eq(StrUtil.isNotEmpty(batchNo), "batchNo", batchNo) @@ -109,20 +76,6 @@ public class InvProductServiceNew extends ServiceImpl invProductDetailEntities = invProductNewDao.selectList(new QueryWrapper().eq("code", code).orderByDesc("id")); -// if (CollUtil.isNotEmpty(invProductDetailEntities)) -// return invProductDetailEntities.get(0); -// else -// return null; -// } - - -// public boolean insertList(List invProductDetailEntities) { -// return invProductNewDao.insertBatch(invProductDetailEntities); -// } - - public List filterInvProductDetailList(FilterInvProductDetailRequest filterInvProductDetailRequest) { if (null == filterInvProductDetailRequest) { return Collections.emptyList(); @@ -134,10 +87,6 @@ public class InvProductServiceNew extends ServiceImpl datas = -// invProductNewDao.selectList(new QueryWrapper().eq("deptCode", deptCode).eq("invCode", invCode) -// .eq(StrUtil.isNotEmpty(invSpaceCode), "invSpaceCode", invSpaceCode) -// .eq("code", code) -// ); -// -// int count = 0; -// if (CollUtil.isNotEmpty(datas)) { -// for (InvProductNewVo InvProductNewVo : datas) { -// if (InvProductNewVo.getMainAction().equals(ConstantType.TYPE_PUT)) -// count = count + InvProductNewVo.getReCount(); -// else { -// count = count - InvProductNewVo.getReCount(); -// } -// } -// } -// return count; -// } - - public List findByGroupCode(String invCode, String code, Boolean isCheckSpace) { if (StrUtil.isNotEmpty(invCode) && StrUtil.isNotEmpty(code)) { List datas = diff --git a/src/main/java/com/glxp/api/service/inv/impl/InvUserProductDetailServiceImpl.java b/src/main/java/com/glxp/api/service/inv/impl/InvUserProductDetailServiceImpl.java index 750b9a40e..7700b6881 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/InvUserProductDetailServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inv/impl/InvUserProductDetailServiceImpl.java @@ -20,28 +20,9 @@ public class InvUserProductDetailServiceImpl implements InvUserProductDetailServ @Resource InvUserProductDetailDao invUserProductDetailDao; - @Override - public List filterInvUserProductDetailList(InvUserProductDetailEntity invUserProductDetailEntity) { - return null; - } - - @Override - public Boolean addInvUserProductDetail(InvUserProductDetailEntity invUserProductDetailEntity) { - return invUserProductDetailDao.insert(invUserProductDetailEntity) == 1 ? true : false; - } - @Override public Boolean addInvUserProductDetailList(List invUserProductDetailEntityList) { return invUserProductDetailDao.insertBatch(invUserProductDetailEntityList); } - @Override - public Boolean updateInvUserProductDetail(InvUserProductDetailEntity invUserProductDetailEntity) { - return invUserProductDetailDao.updateById(invUserProductDetailEntity) == 1 ? true : false; - } - - @Override - public Boolean delectInvUserProductDetail(InvUserProductDetailEntity invUserProductDetailEntity) { - return invUserProductDetailDao.deleteById(invUserProductDetailEntity) == 1 ? true : false; - } } diff --git a/src/main/java/com/glxp/api/service/inv/impl/InvUserProductServiceImpl.java b/src/main/java/com/glxp/api/service/inv/impl/InvUserProductServiceImpl.java index 248cf0a06..ba13b48bc 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/InvUserProductServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inv/impl/InvUserProductServiceImpl.java @@ -23,11 +23,6 @@ public class InvUserProductServiceImpl implements InvUserProductService { @Resource InvUserProductDao invUserProductDao; - @Override - public List filterInvUserProductList(InvUserProductEntity invUserProductEntity) { - return null; - } - @Override public Boolean addInvUserProduct(InvUserProductEntity invUserProductEntity) { return invUserProductDao.insert(invUserProductEntity) == 1 ? true : false; @@ -38,11 +33,6 @@ public class InvUserProductServiceImpl implements InvUserProductService { return invUserProductDao.updateById(invUserProductEntity) == 1 ? true : false; } - @Override - public Boolean delectInvUserProduct(InvUserProductEntity invUserProductEntity) { - return invUserProductDao.deleteById(invUserProductEntity) == 1 ? true : false; - } - @Override public InvUserProductEntity selectByUnique(Long relId, String batchNo, String supId, String deptCode, String invCode,String userId,Integer type) { return invUserProductDao.selectOne(new QueryWrapper().eq("relIdFk", relId).eq(StrUtil.isNotEmpty(batchNo), "batchNo", batchNo) diff --git a/src/main/java/com/glxp/api/service/inv/impl/StockCompareDetailServiceImpl.java b/src/main/java/com/glxp/api/service/inv/impl/StockCompareDetailServiceImpl.java index fb9bd51a8..f87089ab2 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/StockCompareDetailServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inv/impl/StockCompareDetailServiceImpl.java @@ -27,10 +27,6 @@ public class StockCompareDetailServiceImpl extends CustomServiceImpl filterCompareDetail(InvProductDetailSelectRequest invProductDetailSelectRequest) { - return super.baseMapper.filterCompareDetail(invProductDetailSelectRequest); - } } diff --git a/src/main/java/com/glxp/api/service/inv/impl/StockCompareServiceImpl.java b/src/main/java/com/glxp/api/service/inv/impl/StockCompareServiceImpl.java index f98d40499..b3ad9fff2 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/StockCompareServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inv/impl/StockCompareServiceImpl.java @@ -279,7 +279,6 @@ public class StockCompareServiceImpl extends CustomServiceImpl selectOperLogList(FilterOperLogRequest filterOperLogRequest); @@ -35,12 +35,5 @@ public interface ISysOperLogService { */ int deleteOperLogByIds(Long[] operIds); - /** - * 查询操作日志详细 - * - * @param operId 操作ID - * @return 操作日志对象 - */ - SysOperLog selectOperLogById(Long operId); } diff --git a/src/main/java/com/glxp/api/service/purchase/CustomerContactService.java b/src/main/java/com/glxp/api/service/purchase/CustomerContactService.java index d502f8d70..7e9fbc263 100644 --- a/src/main/java/com/glxp/api/service/purchase/CustomerContactService.java +++ b/src/main/java/com/glxp/api/service/purchase/CustomerContactService.java @@ -11,15 +11,11 @@ import java.util.List; public interface CustomerContactService { - List filterCustomerContact(CustomerContactFilterRequest userResisterFilterRequest); - boolean insertCustomerContact(CustomerContactEntity customerContactEntity); boolean updateCustomerContact(CustomerContactEntity customerContactEntity); boolean deleteById(String id); - boolean deleteContact(DeleteRequest deleteRequest); - CustomerContactEntity selectById(Long emailId); } diff --git a/src/main/java/com/glxp/api/service/purchase/SupCertService.java b/src/main/java/com/glxp/api/service/purchase/SupCertService.java index c74703c21..c6a23bc7f 100644 --- a/src/main/java/com/glxp/api/service/purchase/SupCertService.java +++ b/src/main/java/com/glxp/api/service/purchase/SupCertService.java @@ -15,8 +15,6 @@ public interface SupCertService extends IService { List filterCompanyCert(FilterSupCertRequest filterSupCertRequest); - SupCertEntity findCompanyCertByName(String name); - List findAll(String customerId); List findAll(String customerId, String manufacturerId); @@ -40,11 +38,6 @@ public interface SupCertService extends IService { boolean deleteById(String id); - boolean deleteByCustomerId(String customerId); - - boolean delManufacturerId(String customerId, String manufacturerId); - - boolean delProductId(String customerId, String manufacturerId, String productId); List selectSupCertList(purPlanPrintRequest purPlanPrintRequest); diff --git a/src/main/java/com/glxp/api/service/purchase/SupCompanyService.java b/src/main/java/com/glxp/api/service/purchase/SupCompanyService.java index a71f11f17..036abbca8 100644 --- a/src/main/java/com/glxp/api/service/purchase/SupCompanyService.java +++ b/src/main/java/com/glxp/api/service/purchase/SupCompanyService.java @@ -10,18 +10,10 @@ import java.util.List; public interface SupCompanyService extends IService { - SupCompanyEntity findCompanyByUnitFk(String unitFk); - List filterCompany(FilterSupCompanyRequest companyRequest); SupCompanyEntity findCompany(String CustomerId); - List getSubCompany(FilterSupCompanyRequest commitRequest); - - List getSubCompany2(FilterSupCompanyRequest commitRequest); - - SupCompanyEntity findCompanyByName(String companyName); - boolean modifyCompany(SupCompanyEntity companyEntity); boolean insertCompany(SupCompanyEntity companyEntity); diff --git a/src/main/java/com/glxp/api/service/purchase/SupManufacturerService.java b/src/main/java/com/glxp/api/service/purchase/SupManufacturerService.java index 92565da47..6c277e9c5 100644 --- a/src/main/java/com/glxp/api/service/purchase/SupManufacturerService.java +++ b/src/main/java/com/glxp/api/service/purchase/SupManufacturerService.java @@ -13,9 +13,6 @@ public interface SupManufacturerService extends IService SupManufacturerEntity findManufacturer(String manufacturerId); - - SupManufacturerEntity findCompanyByName(String companyName); - List getCompany(FilterSupManufacturerRequest filterSupManufacturerRequest); boolean modifyCompany(SupManufacturerEntity supManufacturerEntity); diff --git a/src/main/java/com/glxp/api/service/purchase/SupProductService.java b/src/main/java/com/glxp/api/service/purchase/SupProductService.java index 4abc2f8be..05fcaae62 100644 --- a/src/main/java/com/glxp/api/service/purchase/SupProductService.java +++ b/src/main/java/com/glxp/api/service/purchase/SupProductService.java @@ -15,21 +15,10 @@ public interface SupProductService extends IService { SupProductResponse findByProductId(String productId); - SupProductEntity findByRelIdFk(String relIdFk); - - SupProductEntity findByManufactury(String cpmctymc, String manufactory, String manufacturerIdFk); - SupProductResponse findByPassByReCert(String registerCert); - - SupProductResponse findJoinRegistration(Long id); - - SupProductEntity findRegistrationByName(String recordProductName); - List getRegistration(FilterPoductRequest filterPoductRequest); - List filterProducts(FilterPoductRequest filterPoductRequest); - boolean modifyRegistration(SupProductEntity supProductEntity); boolean insertRegistration(SupProductEntity supProductEntity); @@ -38,8 +27,6 @@ public interface SupProductService extends IService { boolean deleteById(@Param("id") String id); - boolean deleteByEnterpriseId(@Param("enterpriseId") String enterpriseId); - SupProductEntity findExitByManufactury(String cpmctymc, String manufactory, String customerId); } diff --git a/src/main/java/com/glxp/api/service/purchase/impl/CustomerContactServiceImpl.java b/src/main/java/com/glxp/api/service/purchase/impl/CustomerContactServiceImpl.java index 99889edb2..ad4d9424d 100644 --- a/src/main/java/com/glxp/api/service/purchase/impl/CustomerContactServiceImpl.java +++ b/src/main/java/com/glxp/api/service/purchase/impl/CustomerContactServiceImpl.java @@ -17,20 +17,8 @@ import java.util.List; @Transactional(rollbackFor = Exception.class) public class CustomerContactServiceImpl implements CustomerContactService { - @Resource private CustomerContacDao customerContacDao; - - @Override - public List filterCustomerContact(CustomerContactFilterRequest customerContactFilterRequest) { - if (customerContactFilterRequest == null) { - return Collections.emptyList(); - } - int offset = (customerContactFilterRequest.getPage() - 1) * customerContactFilterRequest.getLimit(); - PageHelper.offsetPage(offset, customerContactFilterRequest.getLimit()); - return customerContacDao.filterCustomerContact(customerContactFilterRequest); - } - @Override public boolean insertCustomerContact(CustomerContactEntity customerContactEntity) { return customerContacDao.insertCustomerContact(customerContactEntity); @@ -46,12 +34,6 @@ public class CustomerContactServiceImpl implements CustomerContactService { return customerContacDao.deleteById(id); } - @Override - public boolean deleteContact(DeleteRequest deleteRequest) { - return customerContacDao.deleteContact(deleteRequest); - } - - @Override public CustomerContactEntity selectById(Long emailId) { return customerContacDao.selectById(emailId); diff --git a/src/main/java/com/glxp/api/service/purchase/impl/PurContractService.java b/src/main/java/com/glxp/api/service/purchase/impl/PurContractService.java index 5bc639135..291871a18 100644 --- a/src/main/java/com/glxp/api/service/purchase/impl/PurContractService.java +++ b/src/main/java/com/glxp/api/service/purchase/impl/PurContractService.java @@ -60,24 +60,6 @@ public class PurContractService extends ServiceImpl data = purContractMapper.selectPage(purContractRequest); return data; } -// -// /** -// * 构造查询条件 -// * -// * @param purContractRequest -// * @return -// */ -// private QueryWrapper buildPurContractQueryWrapper(PurContractRequest purContractRequest) { -// QueryWrapper wrapper = new QueryWrapper<>(); -// wrapper.like(StrUtil.isNotBlank(purContractRequest.getCode()), "code", purContractRequest.getCode()) -// .like(StrUtil.isNotBlank(purContractRequest.getName()), "name", purContractRequest.getName()) -// .eq(ObjectUtil.isNotNull(purContractRequest.getStatus()), "status", purContractRequest.getStatus()) -// .ge(StrUtil.isNotBlank(purContractRequest.getStartDate()), "contractDate", purContractRequest.getStartDate()) -// .le(StrUtil.isNotBlank(purContractRequest.getEndDate()), "contractDate", purContractRequest.getEndDate()) -// .orderByDesc("id"); -// return wrapper; -// } - public int insert(PurContractEntity purContractEntity) { return purContractMapper.insert(purContractEntity); } diff --git a/src/main/java/com/glxp/api/service/purchase/impl/PurInquiryItemDetailService.java b/src/main/java/com/glxp/api/service/purchase/impl/PurInquiryItemDetailService.java index e313a9e23..62cc5bcb4 100644 --- a/src/main/java/com/glxp/api/service/purchase/impl/PurInquiryItemDetailService.java +++ b/src/main/java/com/glxp/api/service/purchase/impl/PurInquiryItemDetailService.java @@ -65,8 +65,6 @@ public class PurInquiryItemDetailService extends ServiceImpl i return supCertDao.deleteById(id); } - @Override - public boolean deleteByCustomerId(String customerId) { - - if (StrUtil.isNotEmpty(customerId)) { - FilterSupCertRequest filterSupCertRequest = new FilterSupCertRequest(); - filterSupCertRequest.setCustomerId(customerId); - return supCertDao.deleteCert(filterSupCertRequest); - } - return false; - } - - @Override - public boolean delManufacturerId(String customerId, String manufacturerId) { - if (StrUtil.isNotEmpty(customerId) && StrUtil.isNotEmpty(manufacturerId)) { - FilterSupCertRequest filterSupCertRequest = new FilterSupCertRequest(); - filterSupCertRequest.setCustomerId(customerId); - filterSupCertRequest.setManufacturerIdFk(manufacturerId); - return supCertDao.deleteCert(filterSupCertRequest); - } - return false; - } - - @Override - public boolean delProductId(String customerId, String manufacturerId, String productId) { - if (StrUtil.isNotEmpty(customerId) && StrUtil.isNotEmpty(manufacturerId) && StrUtil.isNotEmpty(productId)) { - FilterSupCertRequest filterSupCertRequest = new FilterSupCertRequest(); - filterSupCertRequest.setCustomerId(customerId); - filterSupCertRequest.setManufacturerIdFk(manufacturerId); - filterSupCertRequest.setProductIdFk(productId); - return supCertDao.deleteCert(filterSupCertRequest); - } - return false; - } @Override public List selectSupCertList(purPlanPrintRequest purPlanPrintRequest) { diff --git a/src/main/java/com/glxp/api/service/purchase/impl/SupCompanyServiceImpl.java b/src/main/java/com/glxp/api/service/purchase/impl/SupCompanyServiceImpl.java index d9554d6b1..6d8e2fadb 100644 --- a/src/main/java/com/glxp/api/service/purchase/impl/SupCompanyServiceImpl.java +++ b/src/main/java/com/glxp/api/service/purchase/impl/SupCompanyServiceImpl.java @@ -20,16 +20,6 @@ public class SupCompanyServiceImpl extends ServiceImpl companyEntities = supCompanyDao.filterCompany(filterSupCompanyRequest); - if (companyEntities != null && companyEntities.size() > 0) { - return companyEntities.get(0); - } - return null; - } @Override public List filterCompany(FilterSupCompanyRequest companyRequest) { @@ -48,35 +38,6 @@ public class SupCompanyServiceImpl extends ServiceImpl getSubCompany(FilterSupCompanyRequest commitRequest) { - if (commitRequest == null) { - return Collections.emptyList(); - } - if (commitRequest.getPage() != null) { - int offset = (commitRequest.getPage() - 1) * commitRequest.getLimit(); - PageHelper.offsetPage(offset, commitRequest.getLimit()); - } - - List companyEntities = supCompanyDao.getSubCompany(commitRequest); - return companyEntities; - } - - @Override - public List getSubCompany2(FilterSupCompanyRequest commitRequest) { - if (commitRequest == null) { - return Collections.emptyList(); - } - int offset = (commitRequest.getPage() - 1) * commitRequest.getLimit(); - PageHelper.offsetPage(offset, commitRequest.getLimit()); - List companyEntities = supCompanyDao.getSubCompany2(commitRequest); - return companyEntities; - } - - @Override - public SupCompanyEntity findCompanyByName(String companyName) { - return supCompanyDao.findCompanyByName(companyName); - } @Override public boolean modifyCompany(SupCompanyEntity companyEntity) { diff --git a/src/main/java/com/glxp/api/service/purchase/impl/SupManufacturerServiceImpl.java b/src/main/java/com/glxp/api/service/purchase/impl/SupManufacturerServiceImpl.java index e770a6d63..1c184b3c5 100644 --- a/src/main/java/com/glxp/api/service/purchase/impl/SupManufacturerServiceImpl.java +++ b/src/main/java/com/glxp/api/service/purchase/impl/SupManufacturerServiceImpl.java @@ -27,11 +27,6 @@ public class SupManufacturerServiceImpl extends ServiceImpl companyEntities = supProductDao.getRegistration(filterPoductRequest); - if (CollUtil.isNotEmpty(companyEntities)) - return companyEntities.get(0); - - return null; - } - - @Override - public SupProductResponse findByPassByReCert(String registerCert) { - if (StrUtil.isEmpty(registerCert)) - return null; - FilterPoductRequest filterPoductRequest = new FilterPoductRequest(); - filterPoductRequest.setRecordCode(registerCert); - filterPoductRequest.setAuditStatus(ConstantStatus.AUDIT_PASS); - List supProductEntities = supProductDao.getRegistration(filterPoductRequest); - if (CollUtil.isNotEmpty(supProductEntities)) - return supProductEntities.get(0); - - return null; - } - @Override public SupProductResponse findByProductId(String productId) { @@ -71,16 +44,6 @@ public class SupProductServiceImpl extends ServiceImpl supProductEntities = supProductDao.selectList(new QueryWrapper().eq("relIdFk", relIdFk) - .and(tmp -> tmp.eq("auditStatus", ConstantStatus.AUDIT_PASS).or().eq("auditStatus", ConstantStatus.AUDIT_PASS)) - .last("LIMIT 1")); - if (CollUtil.isNotEmpty(supProductEntities)) - return supProductEntities.get(0); - else return null; - } @Override public SupProductEntity findByManufactury(String cpmctymc, String manufactory, String manufacturerIdFk) { @@ -102,10 +65,6 @@ public class SupProductServiceImpl extends ServiceImpl getRegistration(FilterPoductRequest filterPoductRequest) { @@ -120,18 +79,6 @@ public class SupProductServiceImpl extends ServiceImpl filterProducts(FilterPoductRequest filterPoductRequest) { - if (filterPoductRequest == null) { - return Collections.emptyList(); - } - if (filterPoductRequest.getPage() != null) { - int offset = (filterPoductRequest.getPage() - 1) * filterPoductRequest.getLimit(); - PageHelper.offsetPage(offset, filterPoductRequest.getLimit()); - } - List supProductEntities = supProductDao.filterProducts(filterPoductRequest); - return supProductEntities; - } @Override public boolean modifyRegistration(SupProductEntity companyEntity) { @@ -152,11 +99,6 @@ public class SupProductServiceImpl extends ServiceImpl { - BasicDownloadStatusEntity findByData(String idDatas, Integer status); - List filterDownloadStatus(BasicDownloadRequest basicDownloadRequest); boolean insertDownloadStatus(BasicDownloadStatusEntity basicDownloadStatusEntity); diff --git a/src/main/java/com/glxp/api/service/sync/BasicExportTimeService.java b/src/main/java/com/glxp/api/service/sync/BasicExportTimeService.java index a9cbac902..4421351e9 100644 --- a/src/main/java/com/glxp/api/service/sync/BasicExportTimeService.java +++ b/src/main/java/com/glxp/api/service/sync/BasicExportTimeService.java @@ -18,6 +18,4 @@ public interface BasicExportTimeService extends IService x.getDeviceInfoData(info, taskId, now, syncTime)); } break; -// case DEVICE_CHECK_DATA: -// if (needExec(info.getDeviceCheck(),info.getDeviceCheckDetail(),info.getDeviceCheckDetailItem())) { -// uploadData(exportType, taskId, x -> x.getDeviceCheckData(info, taskId, now, syncTime)); -// } -// break; -// case DEVICE_REPAIR_DATA: -// if (needExec(info.getDeviceRepairApply(),info.getDeviceRepairDetail(),info.getDeviceRepair())) { -// uploadData(exportType, taskId, x -> x.getDeviceRepair(info, taskId, now, syncTime)); -// } -// break; case PRODUCE_BUSINESS_DATA: if (needExec(info.getProduceBusiness())) { uploadData(exportType, taskId, x -> x.getProBusinessData(info, taskId, now, syncTime)); } break; -// case DEVICE_UPKEEP_DATA: -// if (needExec(info.getDeviceUpkeep())) { -// uploadData(exportType, taskId, x -> x.getDeviceUpkeepData(info, taskId, now, syncTime)); -// } -// break; case DEVICE_TASK: -// if (needExec(info.getDeviceTask())) { //默认开启 uploadData(exportType, taskId, x -> x.getDeviceTaskData(info, taskId, now, syncTime)); -// } break; case DRUG_DATA_TASK: -// if (needExec(info.getDeviceTask())) { //默认开启 uploadData(exportType, taskId, x -> x.getDrugDataTaskData(info, taskId, now, syncTime)); -// } break; } } @@ -498,73 +470,6 @@ public class HeartService { return dataResponse; } - - - /** - * 获取其他数据模块数据 - * - * @param info 同步设置 - * @param now 当前时间 - * @param syncTime 同步时间 -- 传入时不操作exportTime表 - * @return - */ - public SpsSyncOtherDataResponse getOtherData(SyncDataSetEntity info, String taskId, Date now, Date syncTime) { - StringBuffer remark = new StringBuffer(); - SpsSyncOtherDataResponse dataResponse = null; - Map syncTimeMap = new WeakHashMap<>(3); - syncTimeMap.put("isNew", true); - //确认有开启udi码补齐同步 - if (needExec(info.getUdiCodeLost())) { - Map map; - if (syncTime == null) { - map = basicExportStatusTimeInfo(now, BasicExportStatusTimeEnum.IO_CODE_LOST); - } else { - map = syncTimeMap; - now = syncTime; - } - List ioCodeLostList = ioCodeLostMapper.selectList(Wrappers.lambdaQuery(IoCodeLostEntity.class) - .le((boolean) map.get("isNew"), IoCodeLostEntity::getUpdateTime, now) - .between(!(boolean) map.get("isNew"), IoCodeLostEntity::getUpdateTime - , map.get("oldDate"), now) - ); - if (CollectionUtil.isNotEmpty(ioCodeLostList)) { - dataResponse = new SpsSyncOtherDataResponse(); - dataResponse.setIoCodeLostList(ioCodeLostList); - remark.append("UDI码补齐信息：").append(ioCodeLostList.size()).append("条\n"); - } - } - //确认有开启udi关联关系同步 - if (needExec(info.getUdiCodeRel())) { - Map map; - if (syncTime == null) { - map = basicExportStatusTimeInfo(now, BasicExportStatusTimeEnum.IO_CODE_REL); - } else { - map = syncTimeMap; - now = syncTime; - } - List ioCodeRelList = ioCodeRelMapper.selectList(Wrappers.lambdaQuery(IoCodeRelEntity.class) - .le((boolean) map.get("isNew"), IoCodeRelEntity::getUpdateTime, now) - .between(!(boolean) map.get("isNew"), IoCodeRelEntity::getUpdateTime - , map.get("oldDate"), now) - ); - if (CollectionUtil.isNotEmpty(ioCodeRelList)) { - if (dataResponse == null) { - dataResponse = new SpsSyncOtherDataResponse(); - } - dataResponse.setIoCodeRelList(ioCodeRelList); - remark.append("UDI码关联关系：").append(ioCodeRelList.size()).append("条\n"); - } - } - if (dataResponse != null) { - dataResponse.setTaskId(taskId); - dataResponse.setType(BasicExportTypeEnum.OTHER_DATA.getRemark()); - dataResponse.setSyncRemark(remark.toString()); - } - - return dataResponse; - } - - private String writeFile(String filePath, String fileDesc, String content) throws IOException { filePath = String.format("%s/%s", filePath, MsDateUtil.getDate()); String fileFullPath = String.format("%s/%s-%s.udi", filePath, fileDesc, IdUtil.fastSimpleUUID()); @@ -1099,7 +1004,6 @@ public class HeartService { dataResponse.setType(BasicExportTypeEnum.SYS_SET_DATA.getRemark()); dataResponse.setSyncRemark(remark.toString()); if (CollUtil.isNotEmpty(dataResponse.getSystemPDFTemplateEntities())) { -// List> list = new ArrayList<>(spsSyncSysSettingResponse.getSystemPDFTemplateEntities().size() * 2); List list = new ArrayList<>(); dataResponse.getSystemPDFTemplateEntities().forEach(systemPDFTemplateEntity -> { list.add(systemPDFTemplateEntity.getPath()); @@ -1108,10 +1012,8 @@ public class HeartService { BaseResponse response = spGetHttp.postTemplateFile(list); if (response.getCode() == 20000) { log.info("模板文件列表上传成功"); -// uploadFileLog = "\n模板文件列表上传成功"; } else { log.info("模板文件上传失败，响应信息：{}", response.getMessage()); -// uploadFileLog = "\n模板文件列表上传失败，错误信息：" + response.getMessage(); } } } @@ -1330,142 +1232,6 @@ public class HeartService { return returnMap; } - //上传最近更新单据类型 - public BaseResponse uploadAllBus(String syncTime) { - Date startTime = new Date(); - SpsSyncDataRequest spsSyncDataRequest = new SpsSyncDataRequest(); - if (syncTime == null) { - BasicExportStatusTimeEntity basicExportStatusTimeEntity = basicExportTimeService.findByKey(ConstantStatus.SYNC_BUS_TYPE); - if (basicExportStatusTimeEntity == null) { - basicExportStatusTimeEntity = new BasicExportStatusTimeEntity(); - basicExportStatusTimeEntity.setLastUpdateTime("1949-10-01 09:00:00"); - } - spsSyncDataRequest.setLastUpdateTime(basicExportStatusTimeEntity.getLastUpdateTime()); - } else { - spsSyncDataRequest.setLastUpdateTime(syncTime); - } - SpsSyncBusResponse spsSyncBusResponse = upBasicService.upAllBus(spsSyncDataRequest); - if (CollUtil.isEmpty(spsSyncBusResponse.getBussinessTypeEntities()) && CollUtil.isEmpty(spsSyncBusResponse.getBusTypeChangeEntities()) && CollUtil.isEmpty(spsSyncBusResponse.getThrBusTypeOriginEntities())) { - return ResultVOUtils.success("无数据"); - } - BasicExportStatusEntity basicExportStatusEntity2 = basicExportService.findByData(ConstantStatus.SYNC_BUS_TYPE, 0); - if (basicExportStatusEntity2 == null) { - BasicExportStatusEntity busTypetatusEntity = new BasicExportStatusEntity(); - busTypetatusEntity.setId(CustomUtil.getId()); - busTypetatusEntity.setIdDatas(ConstantStatus.SYNC_BUS_TYPE); - busTypetatusEntity.setType(BasicProcessStatus.NEW_ALL_BUS); - busTypetatusEntity.setUpdateTime(startTime); - busTypetatusEntity.setStartTime(new Date()); - busTypetatusEntity.setStatus(0); - busTypetatusEntity.setScheduleType(BasicProcessStatus.SCHEDULE_NORMAL); - basicExportService.insertExportStatus(busTypetatusEntity); - basicExportStatusEntity2 = busTypetatusEntity; - } - BasicExportStatusTimeEntity basicExportStatusTimeEntity = new BasicExportStatusTimeEntity(); - basicExportStatusTimeEntity.setLastUpdateTime(MsDateUtil.formatDate(System.currentTimeMillis(), "yyyy-MM-dd HH:mm:ss")); - basicExportStatusTimeEntity.setKey(ConstantStatus.SYNC_BUS_TYPE); - spsSyncBusResponse.setTaskId(basicExportStatusEntity2.getId()); - BaseResponse baseResponse2 = spGetHttp.postAllBusType(spsSyncBusResponse); - if (baseResponse2.getCode() == 20000) { - basicExportStatusEntity2.setStatus(1); - } else { - basicExportStatusEntity2.setStatus(ConstantStatus.SYNC_STATUS_FAIL); - } - basicExportStatusEntity2.setEndTime(new Date()); - basicExportTimeService.insertExportStatus(basicExportStatusTimeEntity); - //拼接日志 - String logs = ""; - if (CollUtil.isNotEmpty(spsSyncBusResponse.getBussinessTypeEntities())) - logs = logs + "扫码单据类型：" + spsSyncBusResponse.getBussinessTypeEntities().size() + "条\n"; - if (CollUtil.isNotEmpty(spsSyncBusResponse.getBusTypeChangeEntities())) - logs = logs + "业务单据类型：" + spsSyncBusResponse.getBusTypeChangeEntities().size() + "条\n"; - if (CollUtil.isNotEmpty(spsSyncBusResponse.getThrBusTypeOriginEntities())) - logs = logs + "第三方单据类型：" + spsSyncBusResponse.getThrBusTypeOriginEntities().size() + "条\n"; - basicExportStatusEntity2.setRemark(logs); - basicExportStatusEntity2.setUpdateTime(new Date()); - basicExportService.updateExportStatus(basicExportStatusEntity2); - return ResultVOUtils.success(); - } - - //上传用户信息 - public BaseResponse uploadAllUserData(String syncTime) { - SpsSyncDataRequest spsSyncDataRequest = new SpsSyncDataRequest(); - if (syncTime == null) { - BasicExportStatusTimeEntity basicExportStatusTimeEntity = basicExportTimeService.findByKey(ConstantStatus.SYNC_BASIC_DATA); - if (basicExportStatusTimeEntity == null) { - basicExportStatusTimeEntity = new BasicExportStatusTimeEntity(); - basicExportStatusTimeEntity.setLastUpdateTime("1949-10-01 09:00:00"); - } - spsSyncDataRequest.setLastUpdateTime(basicExportStatusTimeEntity.getLastUpdateTime()); - - } else { - spsSyncDataRequest.setLastUpdateTime(syncTime); - } - - SpsSyncDataResponse syncDataResponse = upBasicService.uploadAllUserData(spsSyncDataRequest); - if (CollUtil.isEmpty(syncDataResponse.getInvWarehouseEntities()) && CollUtil.isEmpty(syncDataResponse.getAuthAdminList()) && CollUtil.isEmpty(syncDataResponse.getDeptEntityList()) && CollUtil.isEmpty(syncDataResponse.getWarehouseBussinessTypeEntities()) && CollUtil.isEmpty(syncDataResponse.getWarehouseUserEntities())) { - //数据不记录日志 - return ResultVOUtils.success("无数据"); - } - - BasicExportStatusEntity basicExportStatusEntity3 = basicExportService.findByData(ConstantStatus.SYNC_BASIC_DATA, 0); - if (basicExportStatusEntity3 == null) { - BasicExportStatusEntity basicExportStatusEntity = new BasicExportStatusEntity(); - basicExportStatusEntity.setId(CustomUtil.getId()); - basicExportStatusEntity.setIdDatas(ConstantStatus.SYNC_BASIC_DATA); - basicExportStatusEntity.setType(BasicProcessStatus.NEW_ALL_DATA); - basicExportStatusEntity.setUpdateTime(new Date()); - basicExportStatusEntity.setStartTime(new Date()); - basicExportStatusEntity.setStatus(0); - basicExportStatusEntity.setScheduleType(BasicProcessStatus.SCHEDULE_NORMAL); - basicExportService.insertExportStatus(basicExportStatusEntity); - basicExportStatusEntity3 = basicExportStatusEntity; - } - - BasicExportStatusTimeEntity basicExportStatusTimeEntity = new BasicExportStatusTimeEntity(); - basicExportStatusTimeEntity.setLastUpdateTime(MsDateUtil.formatDate(System.currentTimeMillis(), "yyyy-MM-dd HH:mm:ss")); - basicExportStatusTimeEntity.setKey(ConstantStatus.SYNC_BASIC_DATA); - syncDataResponse.setTaskId(basicExportStatusEntity3.getId()); - BaseResponse baseResponse = spGetHttp.postAllUser(syncDataResponse); - if (baseResponse.getCode() == 20000) { - basicExportStatusEntity3.setStatus(1); - } else { - basicExportStatusEntity3.setStatus(ConstantStatus.SYNC_STATUS_FAIL); - } - basicExportStatusEntity3.setEndTime(new Date()); - basicExportTimeService.insertExportStatus(basicExportStatusTimeEntity); - String logs = ""; - - if (CollUtil.isNotEmpty(syncDataResponse.getInvWarehouseEntities())) - logs = logs + "仓库字典：" + syncDataResponse.getInvWarehouseEntities().size() + "条\n"; - - if (CollUtil.isNotEmpty(syncDataResponse.getWarehouseUserEntities())) { - logs = logs + "仓库用户信息：" + syncDataResponse.getWarehouseUserEntities().size() + "条\n"; - } - if (CollUtil.isNotEmpty(syncDataResponse.getWarehouseBussinessTypeEntities())) { - logs = logs + "仓库单据类型：" + syncDataResponse.getWarehouseBussinessTypeEntities().size() + "条\n"; - } - - if (CollUtil.isNotEmpty(syncDataResponse.getAuthAdminList())) - logs = logs + "系统用户信息：" + syncDataResponse.getAuthAdminList().size() + "条\n"; - if (CollUtil.isNotEmpty(syncDataResponse.getInvBusUserEntities())) - logs = logs + "用户关联单据类型信息：" + syncDataResponse.getInvBusUserEntities().size() + "条\n"; - - - if (CollUtil.isNotEmpty(syncDataResponse.getDeptEntityList())) - logs = logs + "部门信息：" + syncDataResponse.getDeptEntityList().size() + "条\n"; - if (CollUtil.isNotEmpty(syncDataResponse.getDeptUserEntities())) - logs = logs + "部门用户信息：" + syncDataResponse.getDeptUserEntities().size() + "条\n"; - - if (CollUtil.isNotEmpty(syncDataResponse.getInvSpaces())) - logs = logs + "货位信息：" + syncDataResponse.getInvSpaces().size() + "条\n"; - - basicExportStatusEntity3.setRemark(logs); - basicExportStatusEntity3.setUpdateTime(new Date()); - basicExportService.updateExportStatus(basicExportStatusEntity3); - return ResultVOUtils.success(); - } - @Resource SyncDataBustypeService syncDataBustypeService; @@ -2140,11 +1906,7 @@ public class HeartService { } List syncFiles = JSONUtil.toList(jsonObject.getJSONArray("syncFiles"), String.class); -// if (CollUtil.isNotEmpty(syncFiles)) { -// fileService.download(syncFiles); -// } if (CollUtil.isNotEmpty(syncFiles)) { -// fileService.download(syncFiles); idcService.batchDownloadFile(spGetHttp.getIpUrl(), syncFiles.toArray(new String[syncFiles.size()])); } } @@ -2247,39 +2009,6 @@ public class HeartService { } } - /** - * 从UDI自助平台拉取基础数据 - */ - @Transactional(rollbackFor = Exception.class) - public void pullBasicData() { - String data = spGetHttp.pullBasicData(); - cn.hutool.json.JSONObject obj = JSONUtil.parseObj(data); - Integer code = obj.getInt("code"); - if (!code.equals(ResultVOUtils.success().getCode())) { - log.error("从UDI自助平台拉取基础数据错误，报文-----{}", data); - return; - } - SpsSyncBasicDataResponse bean = obj.get("data", SpsSyncBasicDataResponse.class); - this.insertBasicData(bean); - String taskId = bean.getTaskId(); - if (StrUtil.isNotBlank(taskId)) { - //插入下载记录 - BasicDownloadStatusEntity basicDownloadStatusEntity = new BasicDownloadStatusEntity(); - basicDownloadStatusEntity.setId(CustomUtil.getId()); - basicDownloadStatusEntity.setTaskId(taskId); - basicDownloadStatusEntity.setStartTime(new Date()); - basicDownloadStatusEntity.setUpdateTime(new Date()); - basicDownloadStatusEntity.setEndTime(new Date()); - basicDownloadStatusEntity.setIdDatas(ConstantStatus.SYNC_DOWNLOAD_BASIC_DATA); - basicDownloadStatusEntity.setStatus(ConstantStatus.SYNC_STATUS_SUCCESS); //下载完成 - basicDownloadStatusEntity.setType(BasicProcessStatus.BASIC_DATA); - basicDownloadStatusEntity.setScheduleType(1); - basicDownloadService.insertDownloadStatus(basicDownloadStatusEntity); - //通知自助平台任务已完成 - spGetHttp.finishTask(taskId); - } - } - /** * 从UDI自助平台拉取其他数据 */ @@ -2366,10 +2095,6 @@ public class HeartService { ioCodeRelMapper.insertOrUpdateBatch(bean.getIoCodeRelList()); } - -// if (CollectionUtil.isNotEmpty(bean.getI())) { -// ioCodeRelMapper.insertOrUpdateBatch(bean.getIoCodeRelList()); -// } } @Resource @@ -2480,221 +2205,8 @@ public class HeartService { } - /** - * 同步第三方基础数据 - * - * @param syncTime 同步时间 - */ - public BaseResponse uploadThrData(String syncTime) { - SpsSyncDataRequest spsSyncDataRequest = new SpsSyncDataRequest(); - if (syncTime == null) { - BasicExportStatusTimeEntity basicExportStatusTimeEntity = basicExportTimeService.findByKey(ConstantStatus.SYNC_THR_DATA); - if (basicExportStatusTimeEntity == null) { - basicExportStatusTimeEntity = new BasicExportStatusTimeEntity(); - basicExportStatusTimeEntity.setLastUpdateTime("1949-10-01 09:00:00"); - } - spsSyncDataRequest.setLastUpdateTime(basicExportStatusTimeEntity.getLastUpdateTime()); - } else { - spsSyncDataRequest.setLastUpdateTime(syncTime); - } - SpsSyncThrDataResponse spsSyncThrDataResponse = upThrDataService.upThrData(spsSyncDataRequest); - if (CollUtil.isEmpty(spsSyncThrDataResponse.getDeptEntities()) && CollUtil.isEmpty(spsSyncThrDataResponse.getInvWarehouseEntities()) && CollUtil.isEmpty(spsSyncThrDataResponse.getCorpEntities())) { - //无数据不记录 - log.info("无第三方基础数据需要同步"); - return ResultVOUtils.success("无数据"); - } - - BasicExportStatusEntity basicExportStatusEntity1 = basicExportService.findByData(ConstantStatus.SYNC_THR_DATA, 0); - if (basicExportStatusEntity1 == null) { - BasicExportStatusEntity thrDataStatusEntity = new BasicExportStatusEntity(); - thrDataStatusEntity.setId(CustomUtil.getId()); - thrDataStatusEntity.setIdDatas(ConstantStatus.SYNC_THR_DATA); - thrDataStatusEntity.setType(BasicProcessStatus.NEW_ALL_THR_DATA); - thrDataStatusEntity.setUpdateTime(new Date()); - thrDataStatusEntity.setStartTime(new Date()); - thrDataStatusEntity.setStatus(ConstantStatus.SYNC_STATUS_WAIT); - thrDataStatusEntity.setScheduleType(BasicProcessStatus.SCHEDULE_NORMAL); - basicExportService.insertExportStatus(thrDataStatusEntity); - basicExportStatusEntity1 = thrDataStatusEntity; - } - - BasicExportStatusTimeEntity basicExportStatusTimeEntity = new BasicExportStatusTimeEntity(); - basicExportStatusTimeEntity.setLastUpdateTime(MsDateUtil.formatDate(new Date(), "yyyy-MM-dd HH:mm:ss")); - basicExportStatusTimeEntity.setKey(ConstantStatus.SYNC_THR_DATA); - spsSyncThrDataResponse.setTaskId(basicExportStatusEntity1.getId()); - BaseResponse baseResponse = spGetHttp.postThrData(spsSyncThrDataResponse); - if (baseResponse.getCode() == 20000) { - basicExportStatusEntity1.setStatus(ConstantStatus.SYNC_STATUS_SUCCESS); - } else { - basicExportStatusEntity1.setStatus(ConstantStatus.SYNC_STATUS_FAIL); - } - basicExportStatusEntity1.setEndTime(new Date()); - basicExportTimeService.insertExportStatus(basicExportStatusTimeEntity); - - //拼接日志 - StringBuilder logs = new StringBuilder(); - if (CollUtil.isNotEmpty(spsSyncThrDataResponse.getDeptEntities())) { - logs.append("第三方部门信息：").append(spsSyncThrDataResponse.getDeptEntities().size()).append("条\n"); - } - if (CollUtil.isNotEmpty(spsSyncThrDataResponse.getInvWarehouseEntities())) { - logs.append("第三方仓库信息：").append(spsSyncThrDataResponse.getInvWarehouseEntities().size()).append("条\n"); - } - if (CollUtil.isNotEmpty(spsSyncThrDataResponse.getCorpEntities())) { - logs.append("第三方往来单位信息：").append(spsSyncThrDataResponse.getCorpEntities().size()).append("条\n"); - } - basicExportStatusEntity1.setRemark(logs.toString()); - basicExportStatusEntity1.setUpdateTime(new Date()); - basicExportService.updateExportStatus(basicExportStatusEntity1); - return ResultVOUtils.success(); - } - - /** - * 同步系统设置 - * - * @param syncTime 同步时间 - * @return - */ - public BaseResponse uploadSysSetting(String syncTime) { - SpsSyncDataRequest spsSyncDataRequest = new SpsSyncDataRequest(); - if (syncTime == null) { - BasicExportStatusTimeEntity basicExportStatusTimeEntity = basicExportTimeService.findByKey(ConstantStatus.SYNC_SYS_SETTING); - if (basicExportStatusTimeEntity == null) { - basicExportStatusTimeEntity = new BasicExportStatusTimeEntity(); - basicExportStatusTimeEntity.setLastUpdateTime("1949-10-01 09:00:00"); - } - spsSyncDataRequest.setLastUpdateTime(basicExportStatusTimeEntity.getLastUpdateTime()); - } else { - spsSyncDataRequest.setLastUpdateTime(syncTime); - } - SpsSyncSysSettingResponse spsSyncSysSettingResponse = upBasicService.upSysSetting(spsSyncDataRequest); - if (BeanUtil.isEmpty(spsSyncSysSettingResponse)) { - //无数据不记录 - log.info("无第系统设置需要同步"); - return ResultVOUtils.success("无数据"); - } - - BasicExportStatusEntity basicExportStatusEntity1 = basicExportService.findByData(ConstantStatus.SYNC_SYS_SETTING, 0); - if (basicExportStatusEntity1 == null) { - BasicExportStatusEntity thrDataStatusEntity = new BasicExportStatusEntity(); - thrDataStatusEntity.setId(CustomUtil.getId()); - thrDataStatusEntity.setIdDatas(ConstantStatus.SYNC_SYS_SETTING); - thrDataStatusEntity.setType(BasicProcessStatus.NEW_ALL_SYS_SETTING); - thrDataStatusEntity.setUpdateTime(new Date()); - thrDataStatusEntity.setStartTime(new Date()); - thrDataStatusEntity.setStatus(ConstantStatus.SYNC_STATUS_WAIT); - thrDataStatusEntity.setScheduleType(BasicProcessStatus.SCHEDULE_NORMAL); - basicExportService.insertExportStatus(thrDataStatusEntity); - basicExportStatusEntity1 = thrDataStatusEntity; - } - - BasicExportStatusTimeEntity basicExportStatusTimeEntity = new BasicExportStatusTimeEntity(); - basicExportStatusTimeEntity.setLastUpdateTime(MsDateUtil.formatDate(new Date(), "yyyy-MM-dd HH:mm:ss")); - basicExportStatusTimeEntity.setKey(ConstantStatus.SYNC_SYS_SETTING); - spsSyncSysSettingResponse.setTaskId(basicExportStatusEntity1.getId()); - spsSyncSysSettingResponse.setType(basicExportStatusEntity1.getType()); - spsSyncSysSettingResponse.setIdDatas(basicExportStatusEntity1.getIdDatas()); - BaseResponse baseResponse = spGetHttp.postSysSetting(spsSyncSysSettingResponse); - //若模板记录不为空，则将模板文件同步过去 - String uploadFileLog = ""; - if (CollUtil.isNotEmpty(spsSyncSysSettingResponse.getSystemPDFTemplateEntities())) { -// List> list = new ArrayList<>(spsSyncSysSettingResponse.getSystemPDFTemplateEntities().size() * 2); - List list = new ArrayList<>(); - spsSyncSysSettingResponse.getSystemPDFTemplateEntities().forEach(systemPDFTemplateEntity -> { - list.add(systemPDFTemplateEntity.getPath()); - }); - -// BaseResponse response = spGetHttp.postTemplateFile(list); -// if (response.getCode() == 20000) { -// log.info("模板文件列表上传成功"); -// uploadFileLog = "\n模板文件列表上传成功"; -// } else { -// log.info("模板文件上传失败，响应信息：{}", response.getMessage()); -// uploadFileLog = "\n模板文件列表上传失败，错误信息：" + response.getMessage(); -// } - } - if (baseResponse.getCode() == 20000) { - basicExportStatusEntity1.setStatus(ConstantStatus.SYNC_STATUS_SUCCESS); - } else { - basicExportStatusEntity1.setStatus(ConstantStatus.SYNC_STATUS_FAIL); - } - basicExportStatusEntity1.setEndTime(new Date()); - basicExportTimeService.insertExportStatus(basicExportStatusTimeEntity); - - basicExportStatusEntity1.setRemark(spsSyncSysSettingResponse.logs() + uploadFileLog); - basicExportStatusEntity1.setUpdateTime(new Date()); - basicExportService.updateExportStatus(basicExportStatusEntity1); - return ResultVOUtils.success(); - } - - /** - * 同步第三方产品数据 - * - * @param syncTime - * @return - */ - public BaseResponse uploadThrProducts(String syncTime) { - SpsSyncDataRequest spsSyncDataRequest = new SpsSyncDataRequest(); - if (syncTime == null) { - BasicExportStatusTimeEntity basicExportStatusTimeEntity = basicExportTimeService.findByKey(ConstantStatus.SYNC_THR_PRODUCTS); - if (basicExportStatusTimeEntity == null) { - basicExportStatusTimeEntity = new BasicExportStatusTimeEntity(); - basicExportStatusTimeEntity.setLastUpdateTime("1949-10-01 09:00:00"); - } - spsSyncDataRequest.setLastUpdateTime(basicExportStatusTimeEntity.getLastUpdateTime()); - } else { - spsSyncDataRequest.setLastUpdateTime(syncTime); - } - SpsSyncThrProductsResponse spsSyncThrProductsResponse = upThrDataService.upThrProducts(spsSyncDataRequest); - if (CollUtil.isEmpty(spsSyncThrProductsResponse.getProductsEntities())) { - //无数据不记录 - log.info("无第三方产品数据需要同步"); - return ResultVOUtils.success("无数据"); - } - - BasicExportStatusEntity basicExportStatusEntity1 = basicExportService.findByData(ConstantStatus.SYNC_THR_PRODUCTS, 0); - if (basicExportStatusEntity1 == null) { - BasicExportStatusEntity thrDataStatusEntity = new BasicExportStatusEntity(); - thrDataStatusEntity.setId(CustomUtil.getId()); - thrDataStatusEntity.setIdDatas(ConstantStatus.SYNC_THR_PRODUCTS); - thrDataStatusEntity.setType(BasicProcessStatus.NEW_ALL_THR_PRODUCTS); - thrDataStatusEntity.setUpdateTime(new Date()); - thrDataStatusEntity.setStartTime(new Date()); - thrDataStatusEntity.setStatus(ConstantStatus.SYNC_STATUS_WAIT); - thrDataStatusEntity.setScheduleType(BasicProcessStatus.SCHEDULE_NORMAL); - basicExportService.insertExportStatus(thrDataStatusEntity); - basicExportStatusEntity1 = thrDataStatusEntity; - } - - BasicExportStatusTimeEntity basicExportStatusTimeEntity = new BasicExportStatusTimeEntity(); - basicExportStatusTimeEntity.setLastUpdateTime(MsDateUtil.formatDate(new Date(), "yyyy-MM-dd HH:mm:ss")); - basicExportStatusTimeEntity.setKey(ConstantStatus.SYNC_THR_PRODUCTS); - spsSyncThrProductsResponse.setTaskId(basicExportStatusEntity1.getId()); - BaseResponse baseResponse = spGetHttp.postThrProducts(spsSyncThrProductsResponse); - if (baseResponse.getCode() == 20000) { - basicExportStatusEntity1.setStatus(ConstantStatus.SYNC_STATUS_SUCCESS); - } else { - basicExportStatusEntity1.setStatus(ConstantStatus.SYNC_STATUS_FAIL); - } - basicExportStatusEntity1.setEndTime(new Date()); - basicExportTimeService.insertExportStatus(basicExportStatusTimeEntity); - - //拼接日志 - StringBuilder logs = new StringBuilder(); - if (CollUtil.isNotEmpty(spsSyncThrProductsResponse.getProductsEntities())) { - logs.append("第三方产品信息：").append(spsSyncThrProductsResponse.getProductsEntities().size()).append("条\n"); - } - basicExportStatusEntity1.setRemark(logs.toString()); - basicExportStatusEntity1.setUpdateTime(new Date()); - basicExportService.updateExportStatus(basicExportStatusEntity1); - return ResultVOUtils.success(); - } - - @Resource DeviceInfoService deviceInfoService; - - @Resource - DeviceChangeOrderService deviceChangeOrderService; @Resource DeviceCheckService deviceCheckService; @@ -2848,21 +2360,12 @@ public class HeartService { dataResponse.setType(BasicExportTypeEnum.SYS_SET_DATA.getRemark()); dataResponse.setSyncRemark(remark.toString()); if (CollUtil.isNotEmpty(dataResponse.getDeviceRepairApplyDetailEntities())) { -// List> list = new ArrayList<>(spsSyncSysSettingResponse.getSystemPDFTemplateEntities().size() * 2); dataResponse.getDeviceRepairApplyDetailEntities().forEach(deviceRepairApplyDetailEntity -> { list.add(deviceRepairApplyDetailEntity.getLivePath()); if (deviceRepairApplyDetailEntity.getDiagnosisLivePath() != null) { list.add(deviceRepairApplyDetailEntity.getDiagnosisLivePath()); } log.error("当前数据接受到的报修单明细list{}", list); -// BaseResponse response = spGetHttp.postTemplateFile(list); -// if (response.getCode() == 20000) { -// log.error("图片列表上传成功"); -//// uploadFileLog = "\n模板文件列表上传成功"; -// } else { -// log.info("模板文件上传失败，响应信息：{}", response.getMessage()); -//// uploadFileLog = "\n模板文件列表上传失败，错误信息：" + response.getMessage(); -// } }); } @@ -2894,10 +2397,8 @@ public class HeartService { BaseResponse response = spGetHttp.postTemplateFile(list); if (response.getCode() == 20000) { log.error("图片列表上传成功"); -// uploadFileLog = "\n模板文件列表上传成功"; } else { log.info("模板文件上传失败，响应信息：{}", response.getMessage()); -// uploadFileLog = "\n模板文件列表上传失败，错误信息：" + response.getMessage(); } }); @@ -2958,195 +2459,10 @@ public class HeartService { dataResponse.setSyncRemark(remark.toString()); } -// if (dataResponse != null) { -// dataResponse.setTaskId(taskId); -// dataResponse.setType(BasicExportTypeEnum.SYS_SET_DATA.getRemark()); -// dataResponse.setSyncRemark(remark.toString()); -// if (CollUtil.isNotEmpty(dataResponse.getSystemPDFTemplateEntities())) { -//// List> list = new ArrayList<>(spsSyncSysSettingResponse.getSystemPDFTemplateEntities().size() * 2); -// List list = new ArrayList<>(); -// dataResponse.getSystemPDFTemplateEntities().forEach(systemPDFTemplateEntity -> { -// list.add(systemPDFTemplateEntity.getPath()); -// }); -// -// BaseResponse response = spGetHttp.postTemplateFile(list); -// if (response.getCode() == 20000) { -// log.info("模板文件列表上传成功"); -//// uploadFileLog = "\n模板文件列表上传成功"; -// } else { -// log.info("模板文件上传失败，响应信息：{}", response.getMessage()); -//// uploadFileLog = "\n模板文件列表上传失败，错误信息：" + response.getMessage(); -// } -// } -// } log.error("这是设备管理数据{}", dataResponse); return dataResponse; } - -// public SpsSyncDeviceDataResponse getDeviceCheckData(SyncDataSetEntity info, String taskId, Date now, Date syncTime){ -// SpsSyncDeviceDataResponse dataResponse = null; -// Map syncTimeMap = new WeakHashMap<>(3); -// syncTimeMap.put("isNew", true); -// boolean ge = false; -// if (syncTime != null) { -// ge = true; -// } -// StringBuffer remark = new StringBuffer(); -// /** -// * 确认巡检任务管理开启 -// */ -// if (needExec(info.getDeviceCheck())) { -// Map map = basicExportStatusTimeInfo(now, BasicExportStatusTimeEnum.DEV_CHECK_DATA); -// List deviceCheckEntities = deviceCheckService.list(Wrappers.lambdaQuery(DeviceCheckEntity.class) -// .le(!ge && (boolean) map.get("isNew"), DeviceCheckEntity::getUpdateTime, now) -// .between(ge, DeviceCheckEntity::getUpdateTime, syncTime, now) -// .between(!ge && !(boolean) map.get("isNew"), DeviceCheckEntity::getUpdateTime -// , map.get("oldDate"), now) -// ); -// if (CollectionUtil.isNotEmpty(deviceCheckEntities)) { -// dataResponse = new SpsSyncDeviceDataResponse(); -// dataResponse.setDeviceCheckEntities(deviceCheckEntities); -// remark.append("巡检任务信息：").append(deviceCheckEntities.size()).append("条\n"); -// } -// -// List deviceCheckDetailEntities = deviceCheckDetailService.list(Wrappers.lambdaQuery(DeviceCheckDetailEntity.class) -// .le(!ge && (boolean) map.get("isNew"), DeviceCheckDetailEntity::getUpdateTime, now) -// .between(ge, DeviceCheckDetailEntity::getUpdateTime, syncTime, now) -// .between(!ge && !(boolean) map.get("isNew"), DeviceCheckDetailEntity::getUpdateTime -// , map.get("oldDate"), now) -// ); -// if (CollectionUtil.isNotEmpty(deviceCheckDetailEntities)) { -// if (dataResponse == null) { -// dataResponse = new SpsSyncDeviceDataResponse(); -// } -// dataResponse.setDeviceCheckDetailEntities(deviceCheckDetailEntities); -// remark.append("巡检设备具体信息：").append(deviceCheckDetailEntities.size()).append("条\n"); -// } -// } -// //巡检任务具体数据 deviceCheckDetail -// Map map = basicExportStatusTimeInfo(now, BasicExportStatusTimeEnum.DEV_CHECK_DETAIL); -// List deviceCheckDetailEntities = deviceCheckDetailService.list(Wrappers.lambdaQuery(DeviceCheckDetailEntity.class) -// .le(!ge && (boolean) map.get("isNew"), DeviceCheckDetailEntity::getUpdateTime, now) -// .between(ge, DeviceCheckDetailEntity::getUpdateTime, syncTime, now) -// .between(!ge && !(boolean) map.get("isNew"), DeviceCheckDetailEntity::getUpdateTime -// , map.get("oldDate"), now) -// ); -// if (CollectionUtil.isNotEmpty(deviceCheckDetailEntities)) { -// if (dataResponse == null) { -// dataResponse = new SpsSyncDeviceDataResponse(); -// } -// dataResponse.setDeviceCheckDetailEntities(deviceCheckDetailEntities); -// remark.append("巡检设备具体信息：").append(deviceCheckDetailEntities.size()).append("条\n"); -// } -// -// -// //巡检设备项目表 -// -//// Map map = basicExportStatusTimeInfo(now, BasicExportStatusTimeEnum.DEV_CHECK_DETAIL_ITEM); -// List deviceCheckDetailItemEntities = deviceCheckDetailItemService.list(Wrappers.lambdaQuery(DeviceCheckDetailItemEntity.class) -// .le(!ge && (boolean) map.get("isNew"), DeviceCheckDetailItemEntity::getUpdateTime, now) -// .between(ge, DeviceCheckDetailItemEntity::getUpdateTime, syncTime, now) -// .between(!ge && !(boolean) map.get("isNew"), DeviceCheckDetailItemEntity::getUpdateTime -// , map.get("oldDate"), now) -// ); -// if (CollectionUtil.isNotEmpty(deviceCheckDetailItemEntities)) { -// if (dataResponse == null) { -// dataResponse = new SpsSyncDeviceDataResponse(); -// } -// dataResponse.setDeviceCheckDetailItemEntities(deviceCheckDetailItemEntities); -// remark.append("巡检设备项目表：").append(deviceCheckDetailItemEntities.size()).append("条\n"); -// } -// -// -// if (dataResponse != null) { -// dataResponse.setTaskId(taskId); -// dataResponse.setType(BasicExportTypeEnum.DEVICE_CHECK_DATA.getRemark()); -// dataResponse.setSyncRemark(remark.toString()); -// } -// log.error("巡检任务管理的数据，zzhzzhzzh{}",dataResponse); -// return dataResponse; -// } - -// @Resource -// DeviceRepairApplyService deviceRepairApplyService; -// -// @Resource -// DeviceRepairApplyDetailService deviceRepairApplyDetailService; -// -// @Resource -// DeviceRepairService deviceRepairService; - // 报修表 -// public SpsSyncDeviceDataResponse getDeviceRepair(SyncDataSetEntity info, String taskId, Date now, Date syncTime){ -// SpsSyncDeviceDataResponse dataResponse = null; -// Map syncTimeMap = new WeakHashMap<>(3); -// syncTimeMap.put("isNew", true); -// boolean ge = false; -// if (syncTime != null) { -// ge = true; -// } -// StringBuffer remark = new StringBuffer(); -// //确认同步报修单开启 -// if (needExec(info.getDeviceRepairApply())) { -// Map map = basicExportStatusTimeInfo(now, BasicExportStatusTimeEnum.DEV_REPAIR_APPLY); -// List deviceRepairApplyEntities = deviceRepairApplyService.list(Wrappers.lambdaQuery(DeviceRepairApplyEntity.class) -// .le(!ge && (boolean) map.get("isNew"), DeviceRepairApplyEntity::getUpdateTime, now) -// .between(ge, DeviceRepairApplyEntity::getUpdateTime, syncTime, now) -// .between(!ge && !(boolean) map.get("isNew"), DeviceRepairApplyEntity::getUpdateTime -// , map.get("oldDate"), now) -// ); -// if (CollectionUtil.isNotEmpty(deviceRepairApplyEntities)) { -// dataResponse = new SpsSyncDeviceDataResponse(); -// dataResponse.setDeviceRepairApplyEntities(deviceRepairApplyEntities); -// remark.append("报修单数据：").append(deviceRepairApplyEntities.size()).append("条\n"); -// } -// } -// //确认开启报修单明细同步 -// if (needExec(info.getDeviceRepairDetail())) { -// Map map = basicExportStatusTimeInfo(now, BasicExportStatusTimeEnum.DEV_REPAIR_APPLY_DETAIL); -// List deviceRepairApplyDetailEntities = deviceRepairApplyDetailService.list(Wrappers.lambdaQuery(DeviceRepairApplyDetailEntity.class) -// .le(!ge && (boolean) map.get("isNew"), DeviceRepairApplyDetailEntity::getUpdateTime, now) -// .between(ge, DeviceRepairApplyDetailEntity::getUpdateTime, syncTime, now) -// .between(!ge && !(boolean) map.get("isNew"), DeviceRepairApplyDetailEntity::getUpdateTime -// , map.get("oldDate"), now) -// ); -// if (CollectionUtil.isNotEmpty(deviceRepairApplyDetailEntities)) { -// if (dataResponse == null) { -// dataResponse = new SpsSyncDeviceDataResponse(); -// } -// dataResponse.setDeviceRepairApplyDetailEntities(deviceRepairApplyDetailEntities); -// remark.append("报修单明细数据：").append(deviceRepairApplyDetailEntities.size()).append("条\n"); -// } -// } -// -// //确认开启维修单同步 -// if (needExec(info.getDeviceRepair())) { -// Map map = basicExportStatusTimeInfo(now, BasicExportStatusTimeEnum.DEV_REPAIR); -// List deviceRepairEntities = deviceRepairService.list(Wrappers.lambdaQuery(DeviceRepairEntity.class) -// .le(!ge && (boolean) map.get("isNew"), DeviceRepairEntity::getUpdateTime, now) -// .between(ge, DeviceRepairEntity::getUpdateTime, syncTime, now) -// .between(!ge && !(boolean) map.get("isNew"), DeviceRepairEntity::getUpdateTime -// , map.get("oldDate"), now) -// ); -// if (CollectionUtil.isNotEmpty(deviceRepairEntities)) { -// if (dataResponse == null) { -// dataResponse = new SpsSyncDeviceDataResponse(); -// } -// dataResponse.setDeviceRepairEntities(deviceRepairEntities); -// remark.append("维修单数据：").append(deviceRepairEntities.size()).append("条\n"); -// } -// } -// if (dataResponse != null) { -// dataResponse.setTaskId(taskId); -// dataResponse.setType(BasicExportTypeEnum.DEVICE_REPAIR_DATA.getRemark()); -// dataResponse.setSyncRemark(remark.toString()); -// } -// log.error("自主平台服务数据{}",dataResponse); -// return dataResponse; -// -// } - - @Resource ThrManufacturerService thrManufacturerService; diff --git a/src/main/java/com/glxp/api/service/sync/SocketMsgService.java b/src/main/java/com/glxp/api/service/sync/SocketMsgService.java index caea3ce81..2f1cd3780 100644 --- a/src/main/java/com/glxp/api/service/sync/SocketMsgService.java +++ b/src/main/java/com/glxp/api/service/sync/SocketMsgService.java @@ -190,9 +190,6 @@ public class SocketMsgService { public BaseResponse deleteBussinessType(DeleteRequest deleteRequest) { -// if (bindingResult.hasErrors()) { -// return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); -// } String id = deleteRequest.getId(); BasicBussinessTypeEntity bussinessTypeEntity = basicBussinessTypeService.selectById(id); diff --git a/src/main/java/com/glxp/api/service/sync/SyncDataBustypeService.java b/src/main/java/com/glxp/api/service/sync/SyncDataBustypeService.java index 7b564b5a6..f7c3bf1ec 100644 --- a/src/main/java/com/glxp/api/service/sync/SyncDataBustypeService.java +++ b/src/main/java/com/glxp/api/service/sync/SyncDataBustypeService.java @@ -18,8 +18,6 @@ public interface SyncDataBustypeService extends IService void inserts(List syncDataBustypeEntities); - boolean isExits(List syncDataBustypeEntities, Integer direct); - List filterSelected(SyncDataBustypeEntity syncDataBustypeEntity); } diff --git a/src/main/java/com/glxp/api/service/sync/UpBasicService.java b/src/main/java/com/glxp/api/service/sync/UpBasicService.java index 28a879f04..cfc8268c2 100644 --- a/src/main/java/com/glxp/api/service/sync/UpBasicService.java +++ b/src/main/java/com/glxp/api/service/sync/UpBasicService.java @@ -39,12 +39,9 @@ import java.util.List; @Service public class UpBasicService { - - @Resource SyncDataSetService syncDataSetService; - //已完成扫码单据 @Resource IoOrderService orderService; @@ -62,24 +59,6 @@ public class UpBasicService { PurOrderDetailService purOrderDetailService; @Resource IoOrderInvoiceService orderInvoiceService; - @Resource - private SystemParamConfigService systemParamConfigService; - @Resource - private EntrustReceService entrustReceService; - @Resource - private SystemPDFModuleService systemPDFModuleService; - @Resource - private SystemPDFTemplateService systemPDFTemplateService; - @Resource - private SystemPDFTemplateRelevanceCodeService systemPDFTemplateRelevanceCodeService; - @Resource - private SystemPDFTemplateRelevanceBizService systemPDFTemplateRelevanceBizService; - @Resource - private SystemPDFTemplateRelevanceLabelService systemPDFTemplateRelevanceLabelService; - @Resource - private SystemPDFTemplateRelevanceStatemenService systemPDFTemplateRelevanceStatemenService; - @Resource - private IBasicBusTypePreService basicBusTypePreService; //上传最近更新扫码单据 public SpsSyncOrderResponse upAllOrder(SpsSyncDataRequest spsSyncDataRequest) { @@ -210,147 +189,6 @@ public class UpBasicService { return spsSyncBusResponse; } - @Resource - InvWarehouseService invWarehouseService; - @Resource - WarehouseBussinessTypeService warehouseBussinessTypeService; - @Resource - WarehouseUserService warehouseUserService; - @Resource - InvBusUserService invBusUserService; - @Resource - AuthAdminService authAdminService; - @Resource - DeptService deptService; - @Resource - DeptUserService deptUserService; - - public SpsSyncDataResponse uploadAllUserData(SpsSyncDataRequest spsSyncDataRequest) { - SpsSyncDataResponse syncDataResponse = new SpsSyncDataResponse(); - SyncDataSetResponse syncDataSetEntity = syncDataSetService.selectSet(); - if (syncDataSetEntity.getBasicDept() == 1) { - //获取部门信息 - FilterInvWarehouseRequest filterDeptRequest = new FilterInvWarehouseRequest(); - BeanUtils.copyProperties(spsSyncDataRequest, filterDeptRequest); - List deptEntityList = deptService.filterGroupInvWarehouse(filterDeptRequest); - syncDataResponse.setDeptEntityList(deptEntityList); - - List allDeptUserEntities = new ArrayList<>(); - if (CollUtil.isNotEmpty(deptEntityList)) { - for (DeptEntity deptEntity : deptEntityList) { - FilterDeptUserReqeust filterDeptUserReqeust = new FilterDeptUserReqeust(); - filterDeptUserReqeust.setDeptId(deptEntity.getId().longValue()); - List deptUserEntities = deptUserService.selectDeptUser(filterDeptUserReqeust); - allDeptUserEntities.addAll(deptUserEntities); - } - syncDataResponse.setDeptUserEntities(allDeptUserEntities); - } - } - - - //仓库字典 - if (syncDataSetEntity.getBasicInv() == 1) { - - //仓库字典 - List invWarehouseEntities = invWarehouseService.findByLastTime(MsDateUtil.parseDate(spsSyncDataRequest.getLastUpdateTime())); - syncDataResponse.setInvWarehouseEntities(invWarehouseEntities); - if (CollUtil.isNotEmpty(invWarehouseEntities)) { - - List mWarehouseBussinessTypeEntities = new ArrayList<>(); - List mWarehouseUserEntities = new ArrayList<>(); - List mInvBusUserEntities = new ArrayList<>(); - for (InvWarehouseEntity invWarehouseEntity : invWarehouseEntities) { - //获取仓库关联单据类型 - FilterInvBusTypeRequest filterInvBusTypeRequest = new FilterInvBusTypeRequest(); - filterInvBusTypeRequest.setCode(invWarehouseEntity.getCode()); - List warehouseBussinessTypeEntities = warehouseBussinessTypeService.filterList(filterInvBusTypeRequest); - mWarehouseBussinessTypeEntities.addAll(warehouseBussinessTypeEntities); - - //获取仓库关联用户 - FilterInvUserRequest filterInvUserRequest = new FilterInvUserRequest(); - filterInvUserRequest.setCode(invWarehouseEntity.getCode()); - List warehouseUserEntities = warehouseUserService.filterWarehouseUsers(filterInvUserRequest); - mWarehouseUserEntities.addAll(warehouseUserEntities); - - if (CollUtil.isNotEmpty(warehouseUserEntities)) { - for (WarehouseUserEntity warehouseUserEntity : warehouseUserEntities) { - List invBusUserEntities = invBusUserService.selectByUnion(warehouseUserEntity.getUserid() + "", invWarehouseEntity.getCode()); - mInvBusUserEntities.addAll(invBusUserEntities); - } - } - } - syncDataResponse.setInvBusUserEntities(mInvBusUserEntities); - syncDataResponse.setWarehouseUserEntities(mWarehouseUserEntities); - syncDataResponse.setWarehouseBussinessTypeEntities(mWarehouseBussinessTypeEntities); - } - } - - //系统用户信息 - if (syncDataSetEntity.getSysUser() == 1) { - FilterAuthUserRequest authAdminQueryRequest = new FilterAuthUserRequest(); - BeanUtils.copyProperties(spsSyncDataRequest, authAdminQueryRequest); - List authAdminList = authAdminService.listAdminPage(authAdminQueryRequest); - syncDataResponse.setAuthAdminList(authAdminList); - } - - - return syncDataResponse; - } - - /** - * 上传最近更新的系统设置数据 - * - * @param spsSyncDataRequest - * @return - */ - public SpsSyncSysSettingResponse upSysSetting(SpsSyncDataRequest spsSyncDataRequest) { - SpsSyncSysSettingResponse spsSyncSysSettingResponse = new SpsSyncSysSettingResponse(); - //查询数据同步设置 - SyncDataSetResponse syncDataSet = syncDataSetService.selectSet(); - - //系统运行参数 - if (syncDataSet.getSystemConfig() == 1) { - List systemParamConfigEntities = systemParamConfigService.findByLastTime(MsDateUtil.parseDate(spsSyncDataRequest.getLastUpdateTime())); - spsSyncSysSettingResponse.setSystemParamConfigEntities(systemParamConfigEntities); - } - - //委托验收设置 - if (syncDataSet.getEntrustAction() == 1) { - List entrustReceEntities = entrustReceService.findByLastTime(MsDateUtil.parseDate(spsSyncDataRequest.getLastUpdateTime())); - spsSyncSysSettingResponse.setEntrustReceEntities(entrustReceEntities); - } - - //打印设置 - if (syncDataSet.getPrintConfig() == 1) { - List systemPDFModuleEntities = systemPDFModuleService.findByLastTime(MsDateUtil.parseDate(spsSyncDataRequest.getLastUpdateTime())); - List systemPDFTemplateEntities = systemPDFTemplateService.findByLastTime(MsDateUtil.parseDate(spsSyncDataRequest.getLastUpdateTime())); - List sysPdfTemplateRelevanceCodeEntities = systemPDFTemplateRelevanceCodeService.findByLastTime(MsDateUtil.parseDate(spsSyncDataRequest.getLastUpdateTime())); - List sysPdfTemplateRelevanceBizEntities = systemPDFTemplateRelevanceBizService.findByLastTime(MsDateUtil.parseDate(spsSyncDataRequest.getLastUpdateTime())); - List sysPdfTemplateRelevanceLabelEntities = systemPDFTemplateRelevanceLabelService.findByLastTime(MsDateUtil.parseDate(spsSyncDataRequest.getLastUpdateTime())); - List sysPdfTemplateRelevanceStatemenEntities = systemPDFTemplateRelevanceStatemenService.findByLastTime(MsDateUtil.parseDate(spsSyncDataRequest.getLastUpdateTime())); - - spsSyncSysSettingResponse.setSystemPDFModuleEntities(systemPDFModuleEntities); - spsSyncSysSettingResponse.setSystemPDFTemplateEntities(systemPDFTemplateEntities); - spsSyncSysSettingResponse.setSysPdfTemplateRelevanceCodeEntities(sysPdfTemplateRelevanceCodeEntities); - spsSyncSysSettingResponse.setSysPdfTemplateRelevanceBizEntities(sysPdfTemplateRelevanceBizEntities); - spsSyncSysSettingResponse.setSysPdfTemplateRelevanceLabelEntities(sysPdfTemplateRelevanceLabelEntities); - spsSyncSysSettingResponse.setSysPdfTemplateRelevanceStatemenEntities(sysPdfTemplateRelevanceStatemenEntities); - } - - //自动建出入库单 - if (syncDataSet.getScanChangeConfig() == 1) { - List basicBusTypePreEntities = basicBusTypePreService.findByLastTime(MsDateUtil.parseDate(spsSyncDataRequest.getLastUpdateTime())); - spsSyncSysSettingResponse.setBasicBusTypePreEntities(basicBusTypePreEntities); - } - - //自动建业务单设置 - if (syncDataSet.getBusChangeConfig() == 1) { - List basicBusTypeChangeEntities = basicBusTypeChangeService.findByLastTime(MsDateUtil.parseDate(spsSyncDataRequest.getLastUpdateTime())); - spsSyncSysSettingResponse.setBasicBusTypeChangeEntities(basicBusTypeChangeEntities); - } - - return spsSyncSysSettingResponse; - } } diff --git a/src/main/java/com/glxp/api/service/sync/UpThrDataService.java b/src/main/java/com/glxp/api/service/sync/UpThrDataService.java index d7b7658d4..7aefee12c 100644 --- a/src/main/java/com/glxp/api/service/sync/UpThrDataService.java +++ b/src/main/java/com/glxp/api/service/sync/UpThrDataService.java @@ -24,66 +24,5 @@ import java.util.List; @Service public class UpThrDataService { - @Resource - private SyncDataSetService syncDataSetService; - @Resource - private ThrDeptService thrDeptService; - @Resource - private ThrInvWarehouseService thrInvWarehouseService; - @Resource - private ThrProductsService thrProductsService; - @Resource - private ThrCorpService thrCorpService; - - /** - * 上传最近更新的第三方基础信息数据 - * - * @param spsSyncDataRequest - * @return - */ - public SpsSyncThrDataResponse upThrData(SpsSyncDataRequest spsSyncDataRequest) { - SpsSyncThrDataResponse spsSyncThrDataResponse = new SpsSyncThrDataResponse(); - //查询数据同步设置 - SyncDataSetResponse syncDataSet = syncDataSetService.selectSet(); - - //第三方部门信息 - if (syncDataSet.getBasicThirdDept() == 1) { - List deptEntities = thrDeptService.findByLastTime(MsDateUtil.parseDate(spsSyncDataRequest.getLastUpdateTime())); - spsSyncThrDataResponse.setDeptEntities(deptEntities); - } - - //第三方仓库信息 - if (syncDataSet.getBasicThirdInv() == 1) { - List invWarehouseEntities = thrInvWarehouseService.findByLastTime(MsDateUtil.parseDate(spsSyncDataRequest.getLastUpdateTime())); - spsSyncThrDataResponse.setInvWarehouseEntities(invWarehouseEntities); - } - - //第三方往来单位信息 - if (syncDataSet.getBasicThirdCorp() == 1) { - List corpEntities = thrCorpService.findByLastTime(MsDateUtil.parseDate(spsSyncDataRequest.getLastUpdateTime())); - spsSyncThrDataResponse.setCorpEntities(corpEntities); - } - return spsSyncThrDataResponse; - } - - /** - * 上传最近更新的第三方产品信息数据 - * - * @param spsSyncDataRequest - * @return - */ - public SpsSyncThrProductsResponse upThrProducts(SpsSyncDataRequest spsSyncDataRequest) { - SpsSyncThrProductsResponse spsSyncThrProductsResponse = new SpsSyncThrProductsResponse(); - //查询数据同步设置 - SyncDataSetResponse syncDataSet = syncDataSetService.selectSet(); - - //第三方产品信息 - if (syncDataSet.getBasicThirdProducts() == 1) { - List thrProductsEntities = thrProductsService.findByLastTime(MsDateUtil.parseDate(spsSyncDataRequest.getLastUpdateTime())); - spsSyncThrProductsResponse.setProductsEntities(thrProductsEntities); - } - - return spsSyncThrProductsResponse; - } } diff --git a/src/main/java/com/glxp/api/service/sync/WebSocketComponent.java b/src/main/java/com/glxp/api/service/sync/WebSocketComponent.java index b9cc2973f..eaadcd7b4 100644 --- a/src/main/java/com/glxp/api/service/sync/WebSocketComponent.java +++ b/src/main/java/com/glxp/api/service/sync/WebSocketComponent.java @@ -39,11 +39,6 @@ public class WebSocketComponent implements CommandLineRunner { @Resource SocketMsgService socketMsgService; - private Session session; - - @Resource - WebSocketServer webSocketServer; - @Resource diff --git a/src/main/java/com/glxp/api/service/sync/impl/BasicDownloadServiceImpl.java b/src/main/java/com/glxp/api/service/sync/impl/BasicDownloadServiceImpl.java index 26491783e..d381878f2 100644 --- a/src/main/java/com/glxp/api/service/sync/impl/BasicDownloadServiceImpl.java +++ b/src/main/java/com/glxp/api/service/sync/impl/BasicDownloadServiceImpl.java @@ -21,18 +21,6 @@ public class BasicDownloadServiceImpl extends ServiceImpl basicDownloadStatusEntities = basicDownloadDao.filterDownloadStatus(basicDownloadRequest); - if (CollUtil.isNotEmpty(basicDownloadStatusEntities)) { - return basicDownloadStatusEntities.get(0); - } - return null; - } - @Override public List filterDownloadStatus(BasicDownloadRequest basicDownloadRequest) { if (basicDownloadRequest == null) { diff --git a/src/main/java/com/glxp/api/service/sync/impl/BasicExportTimeServiceImpl.java b/src/main/java/com/glxp/api/service/sync/impl/BasicExportTimeServiceImpl.java index 2e1030de6..adb16da43 100644 --- a/src/main/java/com/glxp/api/service/sync/impl/BasicExportTimeServiceImpl.java +++ b/src/main/java/com/glxp/api/service/sync/impl/BasicExportTimeServiceImpl.java @@ -51,9 +51,4 @@ public class BasicExportTimeServiceImpl extends ServiceImpl syncDataBustypeEntities, Integer direct) { -// - return false; - } - @Override public List filterSelected(SyncDataBustypeEntity syncDataBustypeEntity) { return syncDataBustypeDao.filterSelected(syncDataBustypeEntity); diff --git a/src/main/java/com/glxp/api/service/sync/impl/SyncDataChangeBustypeServiceImpl.java b/src/main/java/com/glxp/api/service/sync/impl/SyncDataChangeBustypeServiceImpl.java index ab7b2639e..caad6489e 100644 --- a/src/main/java/com/glxp/api/service/sync/impl/SyncDataChangeBustypeServiceImpl.java +++ b/src/main/java/com/glxp/api/service/sync/impl/SyncDataChangeBustypeServiceImpl.java @@ -30,8 +30,7 @@ public class SyncDataChangeBustypeServiceImpl implements SyncDataChangeBustypeSe @Override public boolean deleteAll() { - syncDataChangeBustypesDao.delete(null); - return true; + return syncDataChangeBustypesDao.delete(null) > 0 ? true : false ; } @Override diff --git a/src/main/java/com/glxp/api/service/system/SyncUploadDataSetService.java b/src/main/java/com/glxp/api/service/system/SyncUploadDataSetService.java index 5e26cbf8e..c80cf9a40 100644 --- a/src/main/java/com/glxp/api/service/system/SyncUploadDataSetService.java +++ b/src/main/java/com/glxp/api/service/system/SyncUploadDataSetService.java @@ -4,7 +4,6 @@ import com.glxp.api.entity.system.SyncUploadDataSetEntity; public interface SyncUploadDataSetService { - SyncUploadDataSetEntity findSet(); SyncUploadDataSetEntity selectSet(); diff --git a/src/main/java/com/glxp/api/service/system/SystemPDFTemplateRelevanceBizService.java b/src/main/java/com/glxp/api/service/system/SystemPDFTemplateRelevanceBizService.java index 3f46809c7..50cc689a8 100644 --- a/src/main/java/com/glxp/api/service/system/SystemPDFTemplateRelevanceBizService.java +++ b/src/main/java/com/glxp/api/service/system/SystemPDFTemplateRelevanceBizService.java @@ -21,8 +21,6 @@ public interface SystemPDFTemplateRelevanceBizService extends IService findByLastTime(Date lastUpdateTime); - List findByModuleKey(String moduleKey); - SysPdfTemplateRelevanceBizEntity findByModuleKey(String moduleKey, String localAction); diff --git a/src/main/java/com/glxp/api/service/system/SystemPDFTemplateRelevanceService.java b/src/main/java/com/glxp/api/service/system/SystemPDFTemplateRelevanceService.java index 7d78dabad..25b162ae9 100644 --- a/src/main/java/com/glxp/api/service/system/SystemPDFTemplateRelevanceService.java +++ b/src/main/java/com/glxp/api/service/system/SystemPDFTemplateRelevanceService.java @@ -11,22 +11,10 @@ public interface SystemPDFTemplateRelevanceService { List filterList(FilterPdfTemplateRelevanceRequest systemPDFModuleRequest); - List listByCustomerId(Long customerId); - - List listByCustomerIdIn(List customerIds); - - List listByTemplateId(int templateId); - - SystemPDFTemplateRelevanceEntity selectModuleldAndAction(Integer moduleId,String localAction); - int insertSystemPDFTemplateRelevanceAll(List systemPDFTemplateRelevanceEntityList); boolean insert(SystemPDFTemplateRelevanceEntity systemPDFTemplateRelevanceEntity); - int insertRolesCustomerIdAll(List templates, Long customerId); - - boolean deleteByCustomerId(Integer customerId); - boolean udpateRl(SystemPDFTemplateRelevanceEntity systemPDFTemplateRelevanceEntity); } diff --git a/src/main/java/com/glxp/api/service/system/SystemPDFTemplateRelevanceStatemenService.java b/src/main/java/com/glxp/api/service/system/SystemPDFTemplateRelevanceStatemenService.java index 0a430a57e..c43582cb4 100644 --- a/src/main/java/com/glxp/api/service/system/SystemPDFTemplateRelevanceStatemenService.java +++ b/src/main/java/com/glxp/api/service/system/SystemPDFTemplateRelevanceStatemenService.java @@ -17,6 +17,5 @@ public interface SystemPDFTemplateRelevanceStatemenService extends IService findByLastTime(Date lastUpdateTime); } diff --git a/src/main/java/com/glxp/api/service/system/SystemPDFTemplateService.java b/src/main/java/com/glxp/api/service/system/SystemPDFTemplateService.java index 2b7a24b52..6defbf0b4 100644 --- a/src/main/java/com/glxp/api/service/system/SystemPDFTemplateService.java +++ b/src/main/java/com/glxp/api/service/system/SystemPDFTemplateService.java @@ -16,8 +16,6 @@ public interface SystemPDFTemplateService extends IService listPDFTemplates(Integer page, Integer limit); - SystemPDFTemplateEntity findSystemPDFTemplate(FilterPdfTemplateRequest filterPdfTemplateRequest); - SystemPDFTemplateEntity selectById(String id); boolean updateById(SysPdfTemplateSaveRequest sysPdfTemplateSaveRequest); diff --git a/src/main/java/com/glxp/api/service/system/SystemParamConfigService.java b/src/main/java/com/glxp/api/service/system/SystemParamConfigService.java index d0623305c..0041d48da 100644 --- a/src/main/java/com/glxp/api/service/system/SystemParamConfigService.java +++ b/src/main/java/com/glxp/api/service/system/SystemParamConfigService.java @@ -15,12 +15,6 @@ public interface SystemParamConfigService extends IService queryPage(FilterParamConfigRequest FilterParamConfigRequest); - SystemParamConfigEntity selectSystemParamConfig(); - - SystemParamConfigEntity findSystemParamConfig(FilterParamConfigRequest FilterParamConfigRequest); - - SystemParamConfigEntity selectByParamName(FilterParamConfigRequest filterParamConfigRequest); - SystemParamConfigEntity selectByParamKey(FilterParamConfigRequest filterParamConfigRequest); SystemParamConfigEntity selectByParamKey(String key); diff --git a/src/main/java/com/glxp/api/service/system/VersionService.java b/src/main/java/com/glxp/api/service/system/VersionService.java index 3d963543e..5de6cd7d2 100644 --- a/src/main/java/com/glxp/api/service/system/VersionService.java +++ b/src/main/java/com/glxp/api/service/system/VersionService.java @@ -9,11 +9,5 @@ import java.util.List; public interface VersionService { - boolean insertVersion(VersionEntity versionEntity); - - boolean insertVersionList(List versionEntities); - VersionEntity getVersion(FilterVersionRequest filterVersionRequest); - - boolean deleteVersion(DeleteRequest deleteVersionRequest); } diff --git a/src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateRelevanceBizServiceImpl.java b/src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateRelevanceBizServiceImpl.java index 2d4e506ba..679c6be02 100644 --- a/src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateRelevanceBizServiceImpl.java +++ b/src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateRelevanceBizServiceImpl.java @@ -61,10 +61,6 @@ public class SystemPDFTemplateRelevanceBizServiceImpl extends ServiceImpl().gt("updateTime", lastUpdateTime)); } - @Override - public List findByModuleKey(String moduleKey) { - return sysPdfTemplateRelevanceBizDao.selectList(new QueryWrapper().eq("modelKey", moduleKey)); - } @Override public SysPdfTemplateRelevanceBizEntity findByModuleKey(String moduleKey, String localAction) { diff --git a/src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateRelevanceLabelServiceImpl.java b/src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateRelevanceLabelServiceImpl.java index 1370129b3..357ccc241 100644 --- a/src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateRelevanceLabelServiceImpl.java +++ b/src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateRelevanceLabelServiceImpl.java @@ -40,13 +40,7 @@ public class SystemPDFTemplateRelevanceLabelServiceImpl extends ServiceImpl 0) { - return true; - } else { - return false; - } + return sysPdfTemplateRelevanceLabelDao.updateById(systemPDFTemplateRelevanceEntity) > 0 ? true : false; } @Override diff --git a/src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateRelevanceServiceImpl.java b/src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateRelevanceServiceImpl.java index 0b96e2e53..fabfdd000 100644 --- a/src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateRelevanceServiceImpl.java +++ b/src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateRelevanceServiceImpl.java @@ -30,46 +30,6 @@ public class SystemPDFTemplateRelevanceServiceImpl implements SystemPDFTemplateR return systemPDFTemplateRelevanceDao.filterList(systemPDFModuleRequest); } - /** - * 根据 customerId 获取模板id - * - * @param customerId - * @return - */ - @Override - public List listByCustomerId(Long customerId) { - return systemPDFTemplateRelevanceDao.listByCustomerId(customerId); - } - - /** - * 根据多个 customerId 查询角色列表 - * - * @param customerIds - * @return - */ - @Override - public List listByCustomerIdIn(List customerIds) { - if (customerIds.isEmpty()) { - return Collections.emptyList(); - } - return systemPDFTemplateRelevanceDao.listByCustomerIdIn(customerIds); - } - - /** - * 根据 roleId 获取 customerId - * - * @param templateId - * @return - */ - @Override - public List listByTemplateId(int templateId) { - return systemPDFTemplateRelevanceDao.listByTemplateId(templateId); - } - - @Override - public SystemPDFTemplateRelevanceEntity selectModuleldAndAction(Integer moduleId, String localAction) { - return systemPDFTemplateRelevanceDao.selectModuleldAndAction(moduleId,localAction); - } /** * 批量插入 @@ -92,40 +52,6 @@ public class SystemPDFTemplateRelevanceServiceImpl implements SystemPDFTemplateR return systemPDFTemplateRelevanceDao.insert(systemPDFTemplateRelevanceEntity); } - /** - * 根据 模板ids 和 customerId 批量插入 - * - * @param templates - * @param customerId - * @return - */ - @Override - public int insertRolesCustomerIdAll(List templates, Long customerId) { - - List systemPDFTemplateRelevanceEntityList = templates.stream().map(aLong -> { - SystemPDFTemplateRelevanceEntity systemPDFTemplateRelevanceEntity = new SystemPDFTemplateRelevanceEntity(); - systemPDFTemplateRelevanceEntity.setTemplateId(aLong); - systemPDFTemplateRelevanceEntity.setCustomerId(customerId); - return systemPDFTemplateRelevanceEntity; - }).collect(Collectors.toList()); - if (!systemPDFTemplateRelevanceEntityList.isEmpty()) { - return insertSystemPDFTemplateRelevanceAll(systemPDFTemplateRelevanceEntityList); - } - - return 0; - } - - /** - * 根据 customerId 删除对应的模板关联 - * - * @param customerId - * @return - */ - @Override - public boolean deleteByCustomerId(Integer customerId) { - - return systemPDFTemplateRelevanceDao.deleteById(customerId); - } @Override public boolean udpateRl(SystemPDFTemplateRelevanceEntity systemPDFTemplateRelevanceEntity) { diff --git a/src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateServiceImpl.java b/src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateServiceImpl.java index 321a8d6bf..e24584127 100644 --- a/src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateServiceImpl.java +++ b/src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateServiceImpl.java @@ -38,11 +38,6 @@ public class SystemPDFTemplateServiceImpl extends ServiceImpl list = systemParamConfigDao.queryPage(FilterParamConfigRequest); return list; } - - @Override - public SystemParamConfigEntity selectSystemParamConfig() { - FilterParamConfigRequest filterParamConfigRequest = new FilterParamConfigRequest(); - filterParamConfigRequest.setId(1); - return systemParamConfigDao.findSystemParamConfig(filterParamConfigRequest); - } - - @Override - public SystemParamConfigEntity findSystemParamConfig(FilterParamConfigRequest filterParamConfigRequest) { - return systemParamConfigDao.findSystemParamConfig(filterParamConfigRequest); - } - - @Override - public SystemParamConfigEntity selectByParamName(FilterParamConfigRequest filterParamConfigRequest) { - return systemParamConfigDao.selectByParamName(filterParamConfigRequest); - } - @Override public SystemParamConfigEntity selectByParamKey(FilterParamConfigRequest filterParamConfigRequest) { return systemParamConfigDao.selectByParamKey(filterParamConfigRequest); diff --git a/src/main/java/com/glxp/api/service/system/impl/VersionServiceImpl.java b/src/main/java/com/glxp/api/service/system/impl/VersionServiceImpl.java index 0b10d993c..54857679f 100644 --- a/src/main/java/com/glxp/api/service/system/impl/VersionServiceImpl.java +++ b/src/main/java/com/glxp/api/service/system/impl/VersionServiceImpl.java @@ -16,23 +16,9 @@ public class VersionServiceImpl implements VersionService { @Resource VersionDao versionDao; - @Override - public boolean insertVersion(VersionEntity versionEntity) { - return versionDao.insert(versionEntity) > 0; - } - - @Override - public boolean insertVersionList(List versionEntities) { - return versionDao.insertBatch(versionEntities); - } - @Override public VersionEntity getVersion(FilterVersionRequest filterVersionRequest) { return versionDao.getVersion(filterVersionRequest); } - @Override - public boolean deleteVersion(DeleteRequest deleteVersionRequest) { - return versionDao.deleteById(deleteVersionRequest.getId()) > 0; - } } diff --git a/src/main/java/com/glxp/api/service/thrsys/DeptMaterialCategoryService.java b/src/main/java/com/glxp/api/service/thrsys/DeptMaterialCategoryService.java index 098e2c9e5..6eb2a53d2 100644 --- a/src/main/java/com/glxp/api/service/thrsys/DeptMaterialCategoryService.java +++ b/src/main/java/com/glxp/api/service/thrsys/DeptMaterialCategoryService.java @@ -11,7 +11,4 @@ import org.springframework.transaction.annotation.Transactional; @Transactional(rollbackFor = Exception.class) public class DeptMaterialCategoryService extends ServiceImpl { - @Resource - private DeptMaterialCategoryMapper deptMaterialCategoryMapper; - } diff --git a/src/main/java/com/glxp/api/service/thrsys/IThrBusTypeOriginService.java b/src/main/java/com/glxp/api/service/thrsys/IThrBusTypeOriginService.java index d5c4a5abd..fec8114dd 100644 --- a/src/main/java/com/glxp/api/service/thrsys/IThrBusTypeOriginService.java +++ b/src/main/java/com/glxp/api/service/thrsys/IThrBusTypeOriginService.java @@ -82,30 +82,6 @@ public interface IThrBusTypeOriginService extends IService findByLastTime(Date lastUpdateTime); diff --git a/src/main/java/com/glxp/api/service/thrsys/ThrCorpImportDetailService.java b/src/main/java/com/glxp/api/service/thrsys/ThrCorpImportDetailService.java index 95f6d3114..7f0aeb591 100644 --- a/src/main/java/com/glxp/api/service/thrsys/ThrCorpImportDetailService.java +++ b/src/main/java/com/glxp/api/service/thrsys/ThrCorpImportDetailService.java @@ -12,9 +12,6 @@ public interface ThrCorpImportDetailService { List filterCorpDetailImport(FilterThrCorpImportLogRequest filterThrCorpImportLogRequest); - boolean insertCorpDetailImport(ThrCorpImportDetailEntity thrCorpImportDetailEntity); - - boolean updateCorpDetailImport(ThrCorpImportDetailEntity thrCorpImportDetailEntity); boolean insertCorpDetailImports( List thrCorpImportDetailEntities); diff --git a/src/main/java/com/glxp/api/service/thrsys/ThrCorpService.java b/src/main/java/com/glxp/api/service/thrsys/ThrCorpService.java index 40f445e35..e3d23cc2d 100644 --- a/src/main/java/com/glxp/api/service/thrsys/ThrCorpService.java +++ b/src/main/java/com/glxp/api/service/thrsys/ThrCorpService.java @@ -17,12 +17,8 @@ public interface ThrCorpService extends IService { List filterThrCorps(FilterThrCorpRequest filterThrCorpRequest); - boolean insertThrCorps(ThrCorpEntity thrCorpEntity); - boolean insertThrCorpss(List thrCorpEntitys); - boolean updateThrCorps(ThrCorpEntity thrCorpEntity); - boolean deleteById(String id); boolean deleteByUnitId(String id); @@ -43,5 +39,5 @@ public interface ThrCorpService extends IService { */ BaseResponse downloadThrCorp(ThrSystemDetailEntity thrSystemDetailEntity); - public BaseResponse downloadByRequest(ThrUnitMaintainFilterRequest request); + BaseResponse downloadByRequest(ThrUnitMaintainFilterRequest request); } diff --git a/src/main/java/com/glxp/api/service/thrsys/ThrCorpsDlService.java b/src/main/java/com/glxp/api/service/thrsys/ThrCorpsDlService.java index 30920c032..58c999835 100644 --- a/src/main/java/com/glxp/api/service/thrsys/ThrCorpsDlService.java +++ b/src/main/java/com/glxp/api/service/thrsys/ThrCorpsDlService.java @@ -46,8 +46,6 @@ public class ThrCorpsDlService { ThrCorpExportLogService thrCorpExportLogService; @Resource private ThrCorpImportDetailService thrCorpImportDetailService; - // @Value("${SPSYNC_IP}") -// private String spsSyncUrl; @Resource ErpBasicClient erpBasicClient; @Resource @@ -63,58 +61,6 @@ public class ThrCorpsDlService { return syncDataSetEntity.getSyncIp(); } - @Async - public void importSelectCorps(String genKey, List thrCorpsResponseList, String thirdSys) { - ThrSystemDetailEntity piDetailEntity = thrSystemDetailService.selectByKey("corpUrl", thirdSys); - if (piDetailEntity == null || piDetailEntity.getValue() == null) { - WebSocketServer.sendInfo("往来单位接口未设置！", "sid"); - return; - } - ThrCorpImportLogEntity thrProductsImportLogEntity = thrCorpImportLogService.selectByGenKey(genKey); - if (thrCorpsResponseList != null && thrCorpsResponseList.size() > 0) { - - List thrCorpImportDetailEntities; - String finalGenKey = genKey; - thrCorpImportDetailEntities = thrCorpsResponseList.stream().map( - item -> { - ThrCorpImportDetailEntity thrCorpEntity = new ThrCorpImportDetailEntity(); - BeanUtils.copyProperties(item, thrCorpEntity); - thrCorpEntity.setUnitId(item.getUnitId()); - thrCorpEntity.setUpdateTime(new Date()); - thrCorpEntity.setCreateTime(new Date()); - thrCorpEntity.setCreateUser(String.valueOf(customerService.getUserId())); - thrCorpEntity.setUpdateUser(String.valueOf(customerService.getUserId())); - thrCorpEntity.setGenKeyFk(finalGenKey); - thrCorpEntity.setThirdSysFk(thirdSys); - return thrCorpEntity; - } - ).collect(Collectors.toList()); - thrCorpImportDetailService.insertCorpDetailImports(thrCorpImportDetailEntities); - FilterThrCorpImportLogRequest filterThrCorpImportLogRequest = new FilterThrCorpImportLogRequest(); - filterThrCorpImportLogRequest.setGenKey(genKey); - List temps = thrCorpImportDetailService.filterCorpDetailImport(filterThrCorpImportLogRequest); - List thrCorpEntities = temps.stream().map( - item -> { - ThrCorpEntity thrProductsEntity = new ThrCorpEntity(); - BeanUtils.copyProperties(item, thrProductsEntity); - thrProductsEntity.setThirdSysFk(thirdSys); - thrProductsEntity.setUpdateTime(new Date()); - thrProductsEntity.setCreateTime(new Date()); - thrProductsEntity.setCreateUser(String.valueOf(customerService.getUserId())); - thrProductsEntity.setUpdateUser(String.valueOf(customerService.getUserId())); - return thrProductsEntity; - } - ).collect(Collectors.toList()); - - thrCorpService.insertThrCorpss(thrCorpEntities); - redisUtil.set(Constant.dlThrProducts, "false"); - WebSocketServer.sendInfo("往来单位信息下载已完成，请刷新查看！", "sid"); - thrProductsImportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_SUCCESS); - thrProductsImportLogEntity.setUpdateTime(new Date()); - thrCorpImportLogService.updateImportLog(thrProductsImportLogEntity); - } - } - //主动下载第三方系统往来单位信息 @Async public void importCorps(String genKey, ThrUnitMaintainFilterRequest thrUnitMaintainFilterRequest, String thirdSys) { @@ -154,74 +100,7 @@ public class ThrCorpsDlService { thrCorpImportLogService.updateImportLog(thrProductsImportLogEntity); } - //导出生成Excel文件 - @Async - public void genExcel(String genKey, ThrCorpExportRequest thrCorpExportRequest) { - ThrCorpExportLogEntity thrCorpExportLogEntity = thrCorpExportLogService.selectByGenKey(genKey); - List> excelData = new ArrayList<>(); - List head = new ArrayList<>(); - head.add("往来单位ID"); - head.add("往来单位名称"); - head.add("拼音简写"); - head.add("地址"); - head.add("社会信用号"); - head.add("联系人"); - head.add("联系电话"); - excelData.add(head); - //选中导出 - if (thrCorpExportRequest.getThrCorpEntities() != null && thrCorpExportRequest.getThrCorpEntities().size() > 0) { - List corpEntities = thrCorpExportRequest.getThrCorpEntities(); - for (ThrCorpEntity thrCorpEntity : corpEntities) { - List rows = new ArrayList<>(); - rows.add(thrCorpEntity.getUnitId()); - rows.add(thrCorpEntity.getName()); - rows.add(thrCorpEntity.getSpell()); - rows.add(thrCorpEntity.getAddr()); - rows.add(thrCorpEntity.getCreditNo()); - rows.add(thrCorpEntity.getContact()); - rows.add(thrCorpEntity.getMobile()); - excelData.add(rows); - } - } else {//一键导出 - - //判断是否启用实时获取 - ThrSystemDetailEntity thrSystemDetailEntity = thrSystemDetailService.selectByKey("corpUrl", thrCorpExportRequest.getThirdSys()); - if (thrSystemDetailEntity == null || thrSystemDetailEntity.getValue() == null) { - thrCorpExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_FAIL); - thrCorpExportLogEntity.setRemark("往来单位接口地址未定义"); - thrCorpExportLogService.updateThrCorpExportLog(thrCorpExportLogEntity); - return; - } - if (!thrSystemDetailEntity.getEnabled()) { - thrCorpExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_FAIL); - thrCorpExportLogEntity.setRemark("第三方接口往来单位服务接口未启用"); - thrCorpExportLogService.updateThrCorpExportLog(thrCorpExportLogEntity); - return; - } - - if (thrSystemDetailEntity.getFromType() == 0) { - //根据查询条件一键导出第三方系统往来单位 - List thrCorpEntities = exportCorps(thrCorpExportRequest); - excelData.addAll(getRows(thrCorpEntities)); - } else { - //根据查询条件一键导出数据库往来单位 - FilterThrCorpRequest filterThrCorpRequest = new FilterThrCorpRequest(); - BeanUtils.copyProperties(thrCorpExportRequest, filterThrCorpRequest); - filterThrCorpRequest.setPage(null); - List> genDatas = genExcelData(filterThrCorpRequest); - if (genDatas != null && genDatas.size() > 0) { - excelData.addAll(genDatas); - } - } - - } - String sheetName = "往来单位信息"; - new ExcelUtil().exportExcel(excelData, sheetName, thrCorpExportLogEntity.getFilePath(), 20); - thrCorpExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_SUCCESS); - thrCorpExportLogService.updateThrCorpExportLog(thrCorpExportLogEntity); - - } //接收第三方上传或文件导入数据 @Async @@ -242,12 +121,10 @@ public class ThrCorpsDlService { return thrCorpEntity; } ).collect(Collectors.toList()); -// thrCorpImportDetailService.insertCorpDetailImports(thrCorpImportDetailEntities); thrCorpEntities = thrCorpImportDetailEntities.stream().map( item -> { ThrCorpEntity thrCorpEntity = new ThrCorpEntity(); BeanUtils.copyProperties(item, thrCorpEntity); -// thrCorpEntity.setUnitId(item.getId()); thrCorpEntity.setUpdateTime(new Date()); thrCorpEntity.setThirdSysFk(thirdSys); return thrCorpEntity; diff --git a/src/main/java/com/glxp/api/service/thrsys/ThrDeptService.java b/src/main/java/com/glxp/api/service/thrsys/ThrDeptService.java index 5d1acc449..3161a9d14 100644 --- a/src/main/java/com/glxp/api/service/thrsys/ThrDeptService.java +++ b/src/main/java/com/glxp/api/service/thrsys/ThrDeptService.java @@ -12,18 +12,12 @@ import java.util.List; public interface ThrDeptService extends IService { - ThrDeptEntity findDefault(Boolean advaceType, Boolean isDefault); - boolean editExit(String code, String thirdSysFk, Long id); List filterThrInvWarehouse(FilterThrDeptRequest filterThrDeptRequest); - List filterGroupInvWarehouse(FilterThrDeptRequest filterThrDeptRequest); - boolean insertThrDept(ThrDeptEntity thrDeptEntity); - boolean insertThrDeptList(List thrDeptEntities); - boolean updateInvWarehouse(ThrDeptEntity thrDeptEntity); ThrDeptEntity selectById(String id); diff --git a/src/main/java/com/glxp/api/service/thrsys/ThrInvOrderDetailService.java b/src/main/java/com/glxp/api/service/thrsys/ThrInvOrderDetailService.java index c6cde2ca4..81e8d4df9 100644 --- a/src/main/java/com/glxp/api/service/thrsys/ThrInvOrderDetailService.java +++ b/src/main/java/com/glxp/api/service/thrsys/ThrInvOrderDetailService.java @@ -6,7 +6,7 @@ import com.glxp.api.req.thrsys.FilterThrInvOrderDetailRequest; import java.util.List; public interface ThrInvOrderDetailService { - public List filterThrInvOrderDetails(FilterThrInvOrderDetailRequest filterThrInvOrderDetailRequest); + List filterThrInvOrderDetails(FilterThrInvOrderDetailRequest filterThrInvOrderDetailRequest); int delThrInvOrderDetail(Integer id); diff --git a/src/main/java/com/glxp/api/service/thrsys/ThrInvOrderService.java b/src/main/java/com/glxp/api/service/thrsys/ThrInvOrderService.java index 370aaaceb..57c2d11d2 100644 --- a/src/main/java/com/glxp/api/service/thrsys/ThrInvOrderService.java +++ b/src/main/java/com/glxp/api/service/thrsys/ThrInvOrderService.java @@ -22,12 +22,12 @@ public interface ThrInvOrderService { /** * 查询三方系统的出入库明细、进行处理 普耗 */ - public void handleExternalThrInvPhOrder(FilterInvProductRequest filterInvProductRequest); + void handleExternalThrInvPhOrder(FilterInvProductRequest filterInvProductRequest); /** * 查询三方系统的出入库明细、进行处理 高耗 */ - public void handleExternalThrInvGhOrder(FilterInvProductRequest filterInvProductRequest); + void handleExternalThrInvGhOrder(FilterInvProductRequest filterInvProductRequest); void downloadInvSfOrder(ThrSystemDetailEntity thrSystemDetailEntity); @@ -87,8 +87,4 @@ public interface ThrInvOrderService { */ void scanInvPhOrderGeneratePhOrder(); - /** - * 定时扫描三方的明细表-高耗明细类型 未处理的 进行重新处理生成单据 - */ - void scanInvGhOrderGenerateGhOrder(); } diff --git a/src/main/java/com/glxp/api/service/thrsys/ThrInvProductsDetailService.java b/src/main/java/com/glxp/api/service/thrsys/ThrInvProductsDetailService.java index 3dcd35541..f5b0557d3 100644 --- a/src/main/java/com/glxp/api/service/thrsys/ThrInvProductsDetailService.java +++ b/src/main/java/com/glxp/api/service/thrsys/ThrInvProductsDetailService.java @@ -9,10 +9,6 @@ import java.util.List; public interface ThrInvProductsDetailService { List filterInvProductsDetailImport(FilterThrCorpImportLogRequest filterThrCorpImportLogRequest); - boolean insertInvProductsDetailImport(ThrInvProductsImportDetailEntity thrInvProductsImportDetailEntity); - - boolean updateInvProductsDetailImport(ThrInvProductsImportDetailEntity thrInvProductsImportDetailEntity); - boolean insertInvProductsDetailImports(List thrInvProductsImportDetailEntities); boolean deleteById(String id); diff --git a/src/main/java/com/glxp/api/service/thrsys/ThrInvProductsService.java b/src/main/java/com/glxp/api/service/thrsys/ThrInvProductsService.java index f725eafae..a12ba258c 100644 --- a/src/main/java/com/glxp/api/service/thrsys/ThrInvProductsService.java +++ b/src/main/java/com/glxp/api/service/thrsys/ThrInvProductsService.java @@ -13,12 +13,8 @@ public interface ThrInvProductsService { ThrInvProductsEntity selectById(String id); - boolean insertThrInvProduct(ThrInvProductsEntity thrInvProductsEntity); - boolean insertThrInvProducts(List thrInvProductsEntities); - boolean updateThrInvProducts(ThrInvProductsEntity thrInvProductsEntity); - boolean deleteById(String id); boolean deleteAll(); diff --git a/src/main/java/com/glxp/api/service/thrsys/ThrInvWarehouseService.java b/src/main/java/com/glxp/api/service/thrsys/ThrInvWarehouseService.java index d815d6fdf..6e887cec1 100644 --- a/src/main/java/com/glxp/api/service/thrsys/ThrInvWarehouseService.java +++ b/src/main/java/com/glxp/api/service/thrsys/ThrInvWarehouseService.java @@ -15,8 +15,6 @@ public interface ThrInvWarehouseService extends IService ThrInvWarehouseEntity selectById(String id); - ThrInvWarehouseEntity selectByThrCode(String thirdSys, String thirdId); - List filterThrInvWarehouse(FilterThrSubInvWarehouseRequest filterThrSubInvWarehouseRequest); List selectByPid(String pid); @@ -25,20 +23,10 @@ public interface ThrInvWarehouseService extends IService boolean insertThrInvWarehouse(ThrInvWarehouseEntity thrInvWarehouseEntity); - boolean insertInvWarehouses(List thrSubInvWarehouseEntities); - boolean updateThrInvWarehouse(ThrInvWarehouseEntity thrInvWarehouseEntity); boolean deleteById(String id); - /** - * 查询第三方分库数据 - * - * @param filterThrSubInvWarehouseRequest - * @return - */ - List filterThrInvWarehouseResponse(FilterThrSubInvWarehouseRequest filterThrSubInvWarehouseRequest); - List findByLastTime(Date lastUpdateTime); /** diff --git a/src/main/java/com/glxp/api/service/thrsys/ThrOrderDetailService.java b/src/main/java/com/glxp/api/service/thrsys/ThrOrderDetailService.java index fe7f6b223..9bbe20b08 100644 --- a/src/main/java/com/glxp/api/service/thrsys/ThrOrderDetailService.java +++ b/src/main/java/com/glxp/api/service/thrsys/ThrOrderDetailService.java @@ -13,12 +13,8 @@ public interface ThrOrderDetailService { List filterThrOrderDetailDetail(FilterThrOrderDetailRequest filterThrOrderDetailRequest); - boolean insertThrOrderDetail(ThrOrderDetailEntity thrOrderDetailEntity); - boolean insertThrOrderDetails(List thrOrderDetailEntities); - int updateThrOrderDetail(ThrOrderDetailEntity thrOrderDetailEntity); - boolean deleteById(String id); boolean deleteByOrderIdFk(String id); diff --git a/src/main/java/com/glxp/api/service/thrsys/ThrOrderImportDetailService.java b/src/main/java/com/glxp/api/service/thrsys/ThrOrderImportDetailService.java index e35683c23..d74841870 100644 --- a/src/main/java/com/glxp/api/service/thrsys/ThrOrderImportDetailService.java +++ b/src/main/java/com/glxp/api/service/thrsys/ThrOrderImportDetailService.java @@ -11,10 +11,6 @@ public interface ThrOrderImportDetailService { List filterOrderImportDetail(FilterThrCorpImportLogRequest filterThrCorpImportLogRequest); - boolean insertOrderImportDetail(ThrOrderImportDetailEntity thrOrderImportDetailEntity); - - boolean updateOrderImportDetail(ThrOrderImportDetailEntity thrOrderImportDetailEntity); - boolean insertOrderImportDetails(List thrOrderImportDetailEntities); boolean deleteById(String id); diff --git a/src/main/java/com/glxp/api/service/thrsys/ThrOrderService.java b/src/main/java/com/glxp/api/service/thrsys/ThrOrderService.java index a242e2c54..3e56ebb40 100644 --- a/src/main/java/com/glxp/api/service/thrsys/ThrOrderService.java +++ b/src/main/java/com/glxp/api/service/thrsys/ThrOrderService.java @@ -14,20 +14,12 @@ public interface ThrOrderService { List filterThrOrder(FilterThrOrderRequest filterThrOrderRequest); - List filterAllOrders(List billNos, String action); - - List filterAllDetail(FilterThrOrderRequest filterThrOrderRequest); - ThrOrderEntity findByUnique(String billNo, String thirdSysFk); - ThrOrderEntity findReceiveOrder(String billNo); - ThrOrderEntity findById(Integer id); boolean insertThrOrder(ThrOrderEntity thrCorpEntity); - boolean insertThrOrders(List thrOrderEntities); - int updateThrOrder(ThrOrderEntity thrOrderEntity); boolean deleteById(String id); diff --git a/src/main/java/com/glxp/api/service/thrsys/ThrOrdersDlService.java b/src/main/java/com/glxp/api/service/thrsys/ThrOrdersDlService.java index e7f73406f..131cd8530 100644 --- a/src/main/java/com/glxp/api/service/thrsys/ThrOrdersDlService.java +++ b/src/main/java/com/glxp/api/service/thrsys/ThrOrdersDlService.java @@ -31,9 +31,6 @@ import java.util.List; @Service public class ThrOrdersDlService { - - // @Value("${SPSYNC_IP}") -// private String spsSyncUrl; @Resource ThrOrderService thrOrderService; @Resource @@ -144,81 +141,6 @@ public class ThrOrdersDlService { head.add("实际数量"); head.add("原单据类型"); excelData.add(head); - //todo改功能有关表还未设计 -// BussinessTypeEntity bussinessTypeEntity = bussinessTypeService.findBTByAction(thrOrderExportRequest.getBillAction()); -// -// //选中导出 -// if (thrOrderExportRequest.getErpOrderResponses() != null && thrOrderExportRequest.getErpOrderResponses().size() > 0) { -// BussinessTypeFilterRequest bussinessTypeFilterRequest = new BussinessTypeFilterRequest(); -// bussinessTypeFilterRequest.setEnabled(true); -// List bussinessTypeEntities = bussinessTypeService.filterList(bussinessTypeFilterRequest); -// List erpOrderResponses = thrOrderExportRequest.getErpOrderResponses(); -// for (ErpOrderResponse erpOrderResponse : erpOrderResponses) { -// List subErpOrders = erpOrderResponse.getSubErpOrders(); -// for (ErpOrderResponse.SubErpOrder subErpOrder : subErpOrders) { -// List rows = new ArrayList<>(); -// rows.add(erpOrderResponse.getBillNo()); -// rows.add(erpOrderResponse.getBilldate()); -//// BasicUnitMaintainEntity basicUnitMaintainEntity = basicUnitMaintainService.selectByThirdId(erpOrderResponse.getCorpId(), bussinessTypeEntity.getThirdSysFk()); -//// if (basicUnitMaintainEntity != null) -//// rows.add(basicUnitMaintainEntity.getErpId()); -//// else -// rows.add(erpOrderResponse.getCorpId()); -// -// rows.add(erpOrderResponse.getCorpName()); -// rows.add(getName(bussinessTypeEntities, erpOrderResponse.getBillType())); -// rows.add(erpOrderResponse.getBillFlag()); -// rows.add(subErpOrder.getProductId()); -// rows.add(subErpOrder.getProductName()); -// rows.add(subErpOrder.getSpec()); -// rows.add(subErpOrder.getBatchNo()); -// rows.add(subErpOrder.getProductDate()); -// rows.add(subErpOrder.getExpireDate()); -// rows.add(subErpOrder.getCount() + ""); -// rows.add(subErpOrder.getReCount() + ""); -// rows.add(erpOrderResponse.getOriginType()); -// excelData.add(rows); -// } -// -// } -// -// } else {//一键导出 -// -// BasicThirdSysDetailEntity basicThirdSysDetailEntity = thrSystemDetailService.selectByKey("orderQueryUrl", bussinessTypeEntity.getThirdSysFk()); -// -// if (basicThirdSysDetailEntity == null || basicThirdSysDetailEntity.getValue() == null) { -// thrOrderExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_FAIL); -// thrOrderExportLogEntity.setRemark("业务单据接口地址未定义"); -// thrOrderExportLogService.updateThrOrderExportLog(thrOrderExportLogEntity); -// return; -// } -// if (!basicThirdSysDetailEntity.getEnabled() || basicThirdSysDetailEntity.getThirdSysFk() == null) { -// thrOrderExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_FAIL); -// thrOrderExportLogEntity.setRemark("第三方系统业务单据接口服务未启用"); -// thrOrderExportLogService.updateThrOrderExportLog(thrOrderExportLogEntity); -// return; -// } -// -// -// if (basicThirdSysDetailEntity.getFromType() == 0) { -// FilterThrOrderRequest filterThrOrderRequest = new FilterThrOrderRequest(); -// filterThrOrderRequest.setThirdSysFk(bussinessTypeEntity.getThirdSysFk()); -// BeanUtils.copyProperties(thrOrderExportRequest, filterThrOrderRequest); -// List> datas = exportThrOrders(filterThrOrderRequest); -// excelData.addAll(datas); -// } else { -// FilterThrOrderRequest filterThrOrderRequest = new FilterThrOrderRequest(); -// BeanUtils.copyProperties(thrOrderExportRequest, filterThrOrderRequest); -// List> genDatas = genExcelData(filterThrOrderRequest); -// if (genDatas != null && genDatas.size() > 0) { -// excelData.addAll(genDatas); -// } -// } -// -// } -// String sheetName = "业务单据"; -// new ExcelUtil().exportExcel(excelData, sheetName, thrOrderExportLogEntity.getFilePath(), 20); -// thrOrderExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_SUCCESS); thrOrderExportLogService.updateThrOrderExportLog(thrOrderExportLogEntity); } @@ -281,8 +203,6 @@ public class ThrOrdersDlService { //toDo 上傳SMP postThrOrderRequest.setGenKey(genKey); postThrOrderRequest.setThirdSys(thrOrderExportRequest.getThirdSysFk()); -// SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey("smp_service_ip"); -// if (systemParamConfigEntity != null) { String response = httpOkClient.uCloudPost(getIpUrl() + "/udiwms/thrsys/postOrderDetail", postThrOrderRequest); BaseResponse baseResponse = JSONObject.parseObject(response, new TypeReference() { }); @@ -291,10 +211,7 @@ public class ThrOrdersDlService { } else { thrOrderExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_FAIL); } -// } else { -// thrOrderExportLogEntity.setRemark("SMP服务IP地址未定义！"); -// thrOrderExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_FAIL); -// } + thrOrderExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_SUCCESS); thrOrderExportLogService.updateThrOrderExportLog(thrOrderExportLogEntity); @@ -391,48 +308,4 @@ public class ThrOrdersDlService { return null; } -// -// public List> genExcelData(FilterThrOrderRequest filterThrOrderRequest) { -// -// BussinessTypeFilterRequest bussinessTypeFilterRequest = new BussinessTypeFilterRequest(); -// bussinessTypeFilterRequest.setEnabled(true); -// List bussinessTypeEntities = bussinessTypeService.filterList(bussinessTypeFilterRequest); -// List> excelData = new ArrayList<>(); -// List thrOrderEntities = thrOrderService.filterThrOrder(filterThrOrderRequest); -// for (ThrOrderEntity thrOrderEntity : thrOrderEntities) { -// FilterThrOrderDetailRequest filterThrOrderDetailRequest = new FilterThrOrderDetailRequest(); -// filterThrOrderDetailRequest.setOrderIdFk(thrOrderEntity.getId() + ""); -// List thrOrderDetailEntities = thrOrderDetailService.filterThrOrderDetailDetail(filterThrOrderDetailRequest); -// if (thrOrderDetailEntities != null) { -// for (ThrOrderDetailEntity thrOrderDetailEntity : thrOrderDetailEntities) { -// List rows = new ArrayList<>(); -// rows.add(thrOrderEntity.getBillNo()); -// rows.add(thrOrderEntity.getBilldate()); -// -//// BasicUnitMaintainEntity basicUnitMaintainEntity = basicUnitMaintainService.selectByThirdId(thrOrderEntity.getCorpId(), filterThrOrderRequest.getThirdSysFk()); -//// if (basicUnitMaintainEntity != null) -//// rows.add(basicUnitMaintainEntity.getErpId()); -//// else -// rows.add(thrOrderEntity.getCorpId()); -// -//// rows.add(thrOrderEntity.getCorpId()); -// rows.add(thrOrderEntity.getCorpName()); -// rows.add(getName(bussinessTypeEntities, thrOrderEntity.getBillType())); -// rows.add(thrOrderEntity.getBillFlag()); -// rows.add(thrOrderDetailEntity.getProductId()); -// rows.add(thrOrderDetailEntity.getProductName()); -// rows.add(thrOrderDetailEntity.getSpec()); -// rows.add(thrOrderDetailEntity.getBatchNo()); -// rows.add(thrOrderDetailEntity.getProductDate()); -// rows.add(thrOrderDetailEntity.getExpireDate()); -// rows.add(thrOrderDetailEntity.getCount() + ""); -// rows.add(thrOrderDetailEntity.getReCount() + ""); -// rows.add(thrOrderEntity.getOriginType()); -// excelData.add(rows); -// } -// } -// -// } -// return excelData; -// } } diff --git a/src/main/java/com/glxp/api/service/thrsys/ThrProductsAddDiService.java b/src/main/java/com/glxp/api/service/thrsys/ThrProductsAddDiService.java index f9b1aedcc..1da7f2fa1 100644 --- a/src/main/java/com/glxp/api/service/thrsys/ThrProductsAddDiService.java +++ b/src/main/java/com/glxp/api/service/thrsys/ThrProductsAddDiService.java @@ -11,31 +11,4 @@ import java.util.List; public interface ThrProductsAddDiService { - List filterThrProductsList(FilterThrProductsRequest filterThrProductsRequest); - - ThrProductsAddDiResponse selecById(Long id); - - ThrProductsAddDiResponse selecByUuid(String uuid); - - /** - * 删除DI产品信息 - * - * @param id - */ - boolean delThrDiProducts(Long id); - - boolean updateDiProduct(ThrProductsAddDiEntity thrProductsAddDiEntity); - - boolean addThrAddDiProducts(AddThrDiProductsRequest thrDiProductsRequest); - - UdiInfoResponse getDiProductDetail(String uuid); - - /** 根据ID查询 */ - ThrProductsAddDiEntity filterThrProductsGetId( Integer id); - - boolean insertThrProducts(ThrProductsAddDiEntity thrProductsAddDiEntity); - - List filterThrProductsDiList(FilterThrProductsRequest filterThrProductsRequest); - - List filterThrProductsDiLists(FilterThrProductsRequest filterThrProductsRequest); } diff --git a/src/main/java/com/glxp/api/service/thrsys/ThrProductsDlService.java b/src/main/java/com/glxp/api/service/thrsys/ThrProductsDlService.java index 44ec1d921..9a32c8f38 100644 --- a/src/main/java/com/glxp/api/service/thrsys/ThrProductsDlService.java +++ b/src/main/java/com/glxp/api/service/thrsys/ThrProductsDlService.java @@ -40,255 +40,12 @@ public class ThrProductsDlService { ThrProductsService thrProductsService; @Resource ThrSystemDetailService thrSystemDetailService; - // @Resource -// RedisUtil redisUtil; -// @Resource -// ThrProductsImportLogService thrProductsImportLogService; -// @Resource -// ThrProductsImportDetailService thrProductsImportDetailService; + @Resource ThrProductsExportLogService thrProductsExportLogService; @Resource private ErpBasicClient erpBasicClient; - - // @Resource -// private BasicThirdSysService basicThirdSysService; -// @Resource -// private UdiRelevanceService udiRelevanceService; -// @Resource -// private UdiContrastService udiContrastService; -// -// @Async -// public void importSelectProducrs(String genKey, List thrProductsEntities, String thirdSys) { -// ThrProductsImportLogEntity thrProductsImportLogEntity = thrProductsImportLogService.selectByGenKey(genKey); -// if (thrProductsEntities != null && thrProductsEntities.size() > 0) { -// List thrProductsImportDetailEntities; -// thrProductsImportDetailEntities = thrProductsEntities.stream().map( -// item -> { -// ThrProductsImportDetailEntity thrProductsImportDetailEntity = new ThrProductsImportDetailEntity(); -// BeanUtils.copyProperties(item, thrProductsImportDetailEntity); -// thrProductsImportDetailEntity.setSpec(item.getStandard()); -// thrProductsImportDetailEntity.setThirdSysFk(thirdSys); -// thrProductsImportDetailEntity.setGenKeyFk(thrProductsImportLogEntity.getGenKey()); -// return thrProductsImportDetailEntity; -// } -// ).collect(Collectors.toList()); -// thrProductsImportDetailService.insertProductsDetailImports(thrProductsImportDetailEntities); -// FilterUdiIpLogRequest filterUdiIpLogRequest = new FilterUdiIpLogRequest(); -// filterUdiIpLogRequest.setGenKey(genKey); -// List thrProductsImportDetailEntities1 = -// thrProductsImportDetailService.filterProductsDetailImport(filterUdiIpLogRequest); -// List thrProductsEntities1 = thrProductsImportDetailEntities1.stream().map( -// item -> { -// ThrProductsEntity thrProductsEntity = new ThrProductsEntity(); -// BeanUtils.copyProperties(item, thrProductsEntity); -// thrProductsEntity.setUpdateTime(new Date()); -//// thrProductsService.insertOrUpdateSelective(thrProductsEntity); -// return thrProductsEntity; -// } -// ).collect(Collectors.toList()); -// thrProductsService.insertThrProductss(thrProductsEntities1); -// -// redisUtil.set(Constant.dlThrProducts, "false"); -// thrProductsImportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_SUCCESS); -// thrProductsImportLogService.updateImportLog(thrProductsImportLogEntity); -// WebSocketServer.sendInfo("产品信息下载已完成，请刷新查看！", "sid"); -// } -// } -// -// //主动下载产品信息 -// @Async -// public void importProducrs(String genKey, FilterThrProductsRequest filterThrProductsRequest) { -// ThrProductsImportLogEntity thrProductsImportLogEntity = thrProductsImportLogService.selectByGenKey(genKey); -// BasicThirdSysDetailEntity piDetailEntity = basicThirdSysDetailService.selectByKey("piQueryUrl", filterThrProductsRequest.getThirdSysFk()); -// if (piDetailEntity == null || piDetailEntity.getValue() == null) { -// thrProductsImportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_FAIL); -// thrProductsImportLogEntity.setRemark("产品信息接口未设置"); -// thrProductsImportLogService.updateImportLog(thrProductsImportLogEntity); -// WebSocketServer.sendInfo("产品信息接口未设置！", "sid"); -// return; -// } -// -// int page = 1; -// int limit = 50; -// while (page != -1) { -// FilterErpGoodsRequest filterErpGoodsRequest = new FilterErpGoodsRequest(); -// BeanUtils.copyProperties(filterThrProductsRequest, filterErpGoodsRequest); -// page = getInvmandoc(thrProductsImportLogEntity, page, limit, piDetailEntity.getValue(), filterErpGoodsRequest.getThirdSys(), filterErpGoodsRequest); -// } -// FilterUdiIpLogRequest filterUdiIpLogRequest = new FilterUdiIpLogRequest(); -// filterUdiIpLogRequest.setGenKey(genKey); -// List thrProductsImportDetailEntities = -// thrProductsImportDetailService.filterProductsDetailImport(filterUdiIpLogRequest); -// List thrProductsEntities = thrProductsImportDetailEntities.stream().map( -// item -> { -// ThrProductsEntity thrProductsEntity = new ThrProductsEntity(); -// BeanUtils.copyProperties(item, thrProductsEntity); -// thrProductsEntity.setUpdateTime(new Date()); -// return thrProductsEntity; -// } -// ).collect(Collectors.toList()); -// -// List> splitList = CustomUtil.splitList(thrProductsEntities, 100); -// for (List data : splitList) { -// thrProductsService.insertThrProductss(data); -// } -//// BasicThirdSysEntity basicThirdSysEntity = basicThirdSysService.selectMainThrSys(); -//// if (filterThrProductsRequest.getThirdSysFk().equals(basicThirdSysEntity.getThirdId())) { -//// for (ThrProductsEntity thrProductsEntity : thrProductsEntities) { -//// UdiRelevanceEntity udiRelevanceEntity = udiRelevanceService.selectByMainIdLimitOne(thrProductsEntity.getCode()); -//// if (udiRelevanceEntity == null) { -//// udiContrastService.createOnlyMainId(thrProductsEntity.getCode()); -//// } -//// } -//// } -// redisUtil.set(Constant.dlThrProducts, "false"); -// thrProductsImportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_SUCCESS); -// thrProductsImportLogService.updateImportLog(thrProductsImportLogEntity); -// WebSocketServer.sendInfo("产品信息下载已完成，请刷新查看！", "sid"); -// } -// -// //导出生成Excel文件 -// @Async -// public void genExcel(String genKey, ThrProductsExportRequest thrProductsExportRequest) { -// -// ThrProductsExportLogEntity thrProductsExportLogEntity = thrProductsExportLogService.selectByGenKey(genKey); -// -// List> excelData = new ArrayList<>(); -// List head = new ArrayList<>(); -// head.add("产品ID"); -// head.add("产品名称"); -// head.add("计量单位"); -// head.add("规格型号"); -// head.add("注册证号"); -// head.add("生产厂家"); -// head.add("配送企业"); -// excelData.add(head); -// //选中导出 -// if (thrProductsExportRequest.getThrProductsEntities() != null && thrProductsExportRequest.getThrProductsEntities().size() > 0) { -// List thrProductsEntities = thrProductsExportRequest.getThrProductsEntities(); -// excelData.addAll(getRows(thrProductsEntities)); -// -// } else {//一键导出 -// -// BasicThirdSysDetailEntity basicThirdSysDetailEntity = basicThirdSysDetailService.selectByKey("piQueryUrl", thrProductsExportRequest.getThirdSys()); -// if (basicThirdSysDetailEntity == null || basicThirdSysDetailEntity.getValue() == null) { -// thrProductsExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_FAIL); -// thrProductsExportLogEntity.setRemark("产品信息接口未定义！"); -// thrProductsExportLogService.updateThrProductsExportLog(thrProductsExportLogEntity); -// return; -// } -// -// if (!basicThirdSysDetailEntity.getEnabled()) { -// thrProductsExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_FAIL); -// thrProductsExportLogEntity.setRemark("第三方系统产品信息接口服务未启用！"); -// thrProductsExportLogService.updateThrProductsExportLog(thrProductsExportLogEntity); -// return; -// } -// -// if (basicThirdSysDetailEntity.getFromType() == 0) { -// FilterThrProductsRequest filterThrProductsRequest = new FilterThrProductsRequest(); -// BeanUtils.copyProperties(thrProductsExportRequest, filterThrProductsRequest); -// List thrProductsEntities = exportThrProducts(filterThrProductsRequest); -// excelData.addAll(getRows(thrProductsEntities)); -// -// } else { -// FilterThrProductsRequest filterThrInvProductsRequest = new FilterThrProductsRequest(); -// BeanUtils.copyProperties(thrProductsExportRequest, filterThrInvProductsRequest); -// List> genDatas = genExcelData(null, filterThrInvProductsRequest); -// if (genDatas != null && genDatas.size() > 0) { -// excelData.addAll(genDatas); -// } -// } -// } -// String sheetName = "产品信息"; -// new ExcelUtil().exportExcel(excelData, sheetName, thrProductsExportLogEntity.getFilePath(), 20); -// thrProductsExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_SUCCESS); -// thrProductsExportLogService.updateThrProductsExportLog(thrProductsExportLogEntity); -// -// } -// -// //上传SMP -// @Async -// public void uploadSmp(String genKey, ThrProductsExportRequest thrProductsExportRequest) { -// -// PostThrProductsRequest postThrProductsRequest = new PostThrProductsRequest(); -// List datas = new ArrayList<>(); -// ThrProductsExportLogEntity thrProductsExportLogEntity = thrProductsExportLogService.selectByGenKey(genKey); -// -// //选中导出 -// if (thrProductsExportRequest.getThrProductsEntities() != null && thrProductsExportRequest.getThrProductsEntities().size() > 0) { -// List thrProductsEntities = thrProductsExportRequest.getThrProductsEntities(); -// List lists = thrProductsEntities.stream().map( -// item -> { -// ErpProductsResponse thrProductsEntity = new ErpProductsResponse(); -// BeanUtils.copyProperties(item, thrProductsEntity); -// return thrProductsEntity; -// } -// ).collect(Collectors.toList()); -// datas.addAll(lists); -// postThrProductsRequest.setDatas(datas); -// postThrProductsRequest.setGenKey(genKey); -// postThrProductsRequest.setThirdSys(thrProductsExportRequest.getThirdSys()); -// postThrProductsRequest.setUploadType("接口上传"); -// -// -// } else {//一键导出 -// -// BasicThirdSysDetailEntity basicThirdSysDetailEntity = basicThirdSysDetailService.selectByKey("piQueryUrl", thrProductsExportRequest.getThirdSys()); -// if (basicThirdSysDetailEntity == null || basicThirdSysDetailEntity.getValue() == null) { -// thrProductsExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_FAIL); -// thrProductsExportLogEntity.setRemark("产品信息接口未定义！"); -// thrProductsExportLogService.updateThrProductsExportLog(thrProductsExportLogEntity); -// return; -// } -// -// if (!basicThirdSysDetailEntity.getEnabled()) { -// thrProductsExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_FAIL); -// thrProductsExportLogEntity.setRemark("第三方系统产品信息接口服务未启用！"); -// thrProductsExportLogService.updateThrProductsExportLog(thrProductsExportLogEntity); -// return; -// } -// List thrProductsEntities; -// if (basicThirdSysDetailEntity.getFromType() == 0) { -// FilterThrProductsRequest filterThrProductsRequest = new FilterThrProductsRequest(); -// BeanUtils.copyProperties(thrProductsExportRequest, filterThrProductsRequest); -// thrProductsEntities = exportThrProducts(filterThrProductsRequest); -// } else { -// FilterThrProductsRequest filterThrInvProductsRequest = new FilterThrProductsRequest(); -// thrProductsEntities = thrProductsService.filterThrProductsRequest(filterThrInvProductsRequest); -// } -// if (thrProductsEntities != null) { -// List lists = thrProductsEntities.stream().map( -// item -> { -// ErpProductsResponse thrProductsEntity = new ErpProductsResponse(); -// BeanUtils.copyProperties(item, thrProductsEntity); -// return thrProductsEntity; -// } -// ).collect(Collectors.toList()); -// datas.addAll(lists); -// postThrProductsRequest.setDatas(datas); -// postThrProductsRequest.setGenKey(genKey); -// postThrProductsRequest.setThirdSys(thrProductsExportRequest.getThirdSys()); -// postThrProductsRequest.setUploadType("接口上传"); -// } -// -// -// } -// String response = httpOkClient.uCloudPost(getIpUrl() + "/udiwms/thrsys/postThrProducts", postThrProductsRequest); -// BaseResponse baseResponse = JSONObject.parseObject(response, new TypeReference() { -// }); -// if (baseResponse.getCode() == 20000) { -// thrProductsExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_SUCCESS); -// } else { -// thrProductsExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_FAIL); -// } -// thrProductsExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_SUCCESS); -// thrProductsExportLogService.updateThrProductsExportLog(thrProductsExportLogEntity); -// } -// -// //上传SMP @Async public void uploadSpssync(String genKey, ThrProductsExportRequest thrProductsExportRequest) { @@ -382,88 +139,6 @@ public class ThrProductsDlService { return syncDataSetEntity.getSyncIp(); } - // -// // //接收第三方上传或文件导入数据 -// @Async -// public void insertData(String genKey, List erpProductsResponses, String thirdSys) { -// ThrProductsImportLogEntity thrProductsImportLogEntity = thrProductsImportLogService.selectByGenKey(genKey); -// if (erpProductsResponses != null && erpProductsResponses.size() > 0) { -// List thrProductsImportDetailEntities; -// thrProductsImportDetailEntities = erpProductsResponses.stream().map( -// item -> { -// ThrProductsImportDetailEntity thrProductsImportDetailEntity = new ThrProductsImportDetailEntity(); -// BeanUtils.copyProperties(item, thrProductsImportDetailEntity); -// thrProductsImportDetailEntity.setThirdSysFk(thirdSys); -// thrProductsImportDetailEntity.setGenKeyFk(genKey); -// return thrProductsImportDetailEntity; -// } -// ).collect(Collectors.toList()); -// -// List> splitList = CustomUtil.splitList(thrProductsImportDetailEntities, 100); -// for (List data : splitList) { -// thrProductsImportDetailService.insertProductsDetailImports(data); -// } -// List thrProductsEntities; -// thrProductsEntities = thrProductsImportDetailEntities.stream().map( -// item -> { -// ThrProductsEntity thrProductsEntity = new ThrProductsEntity(); -// BeanUtils.copyProperties(item, thrProductsEntity); -// thrProductsEntity.setUpdateTime(new Date()); -// thrProductsService.insertOrUpdateSelective(thrProductsEntity); -// return thrProductsEntity; -// } -// ).collect(Collectors.toList()); -// List> products = CustomUtil.splitList(thrProductsEntities, 100); -//// for (List data : products) { -//// thrProductsService.insertThrProductss(data); -//// } -// thrProductsImportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_SUCCESS); -// thrProductsImportLogEntity.setUpdateTime(new Date()); -// thrProductsImportLogService.updateImportLog(thrProductsImportLogEntity); -// } else { -// thrProductsImportLogEntity.setRemark("未选择产品信息"); -// thrProductsImportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_FAIL); -// thrProductsImportLogService.updateImportLog(thrProductsImportLogEntity); -// } -// } -// -// public int getInvmandoc(ThrProductsImportLogEntity thrProductsImportLogEntity, int page, int limit, String -// productUrl, String thirdSys, FilterErpGoodsRequest filterErpGoodsRequest) { -// -// filterErpGoodsRequest.setPage(page); -// filterErpGoodsRequest.setLimit(limit); -// BaseResponse> erpProducts = erpBasicClient.getErpProducts(filterErpGoodsRequest); -// if (erpProducts != null && erpProducts.getCode() == 20000) { -// List erpProductsResponses = erpProducts.getData().getList(); -// if (erpProductsResponses != null && erpProductsResponses.size() > 0) { -// List thrProductsImportDetailEntities; -// thrProductsImportDetailEntities = erpProductsResponses.stream().map( -// item -> { -// ThrProductsImportDetailEntity thrProductsImportDetailEntity = new ThrProductsImportDetailEntity(); -// BeanUtils.copyProperties(item, thrProductsImportDetailEntity); -// thrProductsImportDetailEntity.setSpec(item.getStandard()); -// thrProductsImportDetailEntity.setThirdSysFk(thirdSys); -// thrProductsImportDetailEntity.setGenKeyFk(thrProductsImportLogEntity.getGenKey()); -// return thrProductsImportDetailEntity; -// } -// ).collect(Collectors.toList()); -// thrProductsImportDetailService.insertProductsDetailImports(thrProductsImportDetailEntities); -// page++; -// return page; -//// if (page * limit < erpProducts.getData().getTotal()) { -//// return page; -//// } -// } else { -// return -1; -// } -// } else { -// thrProductsImportLogEntity.setRemark(erpProducts.getMessage()); -// thrProductsImportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_FAIL); -// thrProductsImportLogService.updateImportLog(thrProductsImportLogEntity); -// return -1; -// } -// } -// public List exportThrProducts(FilterThrProductsRequest filterThrProductsRequest) { ThrSystemDetailEntity thrSystemDetailEntity = thrSystemDetailService.selectByKey("piQueryUrl", filterThrProductsRequest.getThirdSys()); int page = 1; @@ -509,20 +184,6 @@ public class ThrProductsDlService { return null; } - // public List> genExcelData(String id, FilterThrProductsRequest filterThrProductsRequest) { -// -// List> excelData = new ArrayList<>(); -// List thrProductsEntities = new ArrayList<>(); -// if (id != null) { -// ThrProductsEntity thrProductsEntity = thrProductsService.selectById(id); -// thrProductsEntities.add(thrProductsEntity); -// } else { -// thrProductsEntities = thrProductsService.filterThrProductsRequest(filterThrProductsRequest); -// } -// excelData.addAll(getRows(thrProductsEntities)); -// return excelData; -// } -// public List genJsonData(String id, FilterThrProductsRequest filterThrProductsRequest) { List jsonData = new ArrayList<>(); if (id != null) { @@ -536,24 +197,6 @@ public class ThrProductsDlService { return jsonData; } - // -// public List> getRows(List thrProductsEntities) { -// List> excelData = new ArrayList<>(); -// for (ThrProductsEntity thrProductsEntity : thrProductsEntities) { -// List rows = new ArrayList<>(); -// rows.add(thrProductsEntity.getCode()); -// rows.add(thrProductsEntity.getName()); -// rows.add(thrProductsEntity.getMeasname() + ""); -// rows.add(thrProductsEntity.getSpec()); -// rows.add(thrProductsEntity.getRegisterNo()); -// rows.add(thrProductsEntity.getManufactory()); -// rows.add(thrProductsEntity.getSupName()); -// excelData.add(rows); -// } -// return excelData; -// } -// -// //导出json文件 @Async public void genJsonFile(String genKey, ThrProductsExportRequest thrProductsExportRequest) { diff --git a/src/main/java/com/glxp/api/service/thrsys/ThrProductsImportDetailService.java b/src/main/java/com/glxp/api/service/thrsys/ThrProductsImportDetailService.java index 5e2e2e2b1..845a0185b 100644 --- a/src/main/java/com/glxp/api/service/thrsys/ThrProductsImportDetailService.java +++ b/src/main/java/com/glxp/api/service/thrsys/ThrProductsImportDetailService.java @@ -11,12 +11,6 @@ public interface ThrProductsImportDetailService { List filterProductsDetailImport(FilterThrProductsImportLogRequest filterThrProductsImportLogRequest); - boolean insertProductsDetailImport(ThrProductsImportDetailEntity thrOrderImportDetailEntity); - - boolean updateProductsDetailImport(ThrProductsImportDetailEntity thrOrderImportDetailEntity); - - boolean insertProductsDetailImports(List thrOrderImportDetailEntities); - boolean deleteById(String id); boolean deleteByTime(); diff --git a/src/main/java/com/glxp/api/service/thrsys/ThrProductsImportLogService.java b/src/main/java/com/glxp/api/service/thrsys/ThrProductsImportLogService.java index e1c482354..fd0cd3edf 100644 --- a/src/main/java/com/glxp/api/service/thrsys/ThrProductsImportLogService.java +++ b/src/main/java/com/glxp/api/service/thrsys/ThrProductsImportLogService.java @@ -14,10 +14,8 @@ public interface ThrProductsImportLogService { boolean insertImportLog(ThrProductsImportLogEntity thrProductsImportLogEntity); boolean updateImportLog(ThrProductsImportLogEntity thrProductsImportLogEntity); -// boolean deleteById(String id); boolean deleteByTime(); -// -// ThrProductsImportLogEntity selectByGenKey(String genKey); + } diff --git a/src/main/java/com/glxp/api/service/thrsys/ThrSystemBusApiService.java b/src/main/java/com/glxp/api/service/thrsys/ThrSystemBusApiService.java index ecfca536f..98bea2b83 100644 --- a/src/main/java/com/glxp/api/service/thrsys/ThrSystemBusApiService.java +++ b/src/main/java/com/glxp/api/service/thrsys/ThrSystemBusApiService.java @@ -10,8 +10,6 @@ import java.util.List; public interface ThrSystemBusApiService extends IService { - boolean insertSysBusApi(ThrSystemBusApiEntity basicThirdSysEntity); - boolean updateSysBusApi(ThrSystemBusApiEntity basicThirdSysEntity); ThrSystemBusApiEntity selectByKey(String key, String thirdSys); diff --git a/src/main/java/com/glxp/api/service/thrsys/ThrSystemDetailService.java b/src/main/java/com/glxp/api/service/thrsys/ThrSystemDetailService.java index 76a6cf887..c99127995 100644 --- a/src/main/java/com/glxp/api/service/thrsys/ThrSystemDetailService.java +++ b/src/main/java/com/glxp/api/service/thrsys/ThrSystemDetailService.java @@ -17,8 +17,4 @@ public interface ThrSystemDetailService { void updateInterfaceStatus(List list); - /** - * 测试第三方服务连通性 - */ - BaseResponse testThirdService(ThrSystemEntity thrSystemEntity); } diff --git a/src/main/java/com/glxp/api/service/thrsys/ThrSystemService.java b/src/main/java/com/glxp/api/service/thrsys/ThrSystemService.java index b5d3fe91f..0e0e07e50 100644 --- a/src/main/java/com/glxp/api/service/thrsys/ThrSystemService.java +++ b/src/main/java/com/glxp/api/service/thrsys/ThrSystemService.java @@ -29,13 +29,6 @@ public interface ThrSystemService extends IService { * @return */ boolean selectThirdNameExists(String thirdId, String thirdName); - /** - * 根据第三方系统ID查询第三方系统名称 - * - * @param thirdId - * @return - */ - String selectThirdNameByThirdId(@Param("thirdId") String thirdId); int countThirdSys(FilterBasicThirdSysRequest filterBasicThirdSysRequest); diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrBusTypeOriginServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrBusTypeOriginServiceImpl.java index 27f031839..c481fd023 100644 --- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrBusTypeOriginServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrBusTypeOriginServiceImpl.java @@ -127,32 +127,6 @@ public class ThrBusTypeOriginServiceImpl extends ServiceImpl responseList = thrBusTypeOriginDao.filterJoinList(request); - if (CollUtil.isNotEmpty(responseList)) { - return responseList.get(0); - } - return null; - } - - @Override - public ThrBusTypeOriginResponse findByMainAction(String mainAction) { - FilterThrBusTypeOriginRequest request = new FilterThrBusTypeOriginRequest(); - request.setMainAction(mainAction); - List responseList = thrBusTypeOriginDao.filterJoinList(request); - if (CollUtil.isNotEmpty(responseList)) { - return responseList.get(0); - } - return null; - } - - @Override - public String findNameByAction(String originAction) { - return thrBusTypeOriginDao.selectNameByAction(originAction); - } /** * 设置创建/更新信息 diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrCorpExportLogServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrCorpExportLogServiceImpl.java index 94c029e4d..f453e7837 100644 --- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrCorpExportLogServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrCorpExportLogServiceImpl.java @@ -57,9 +57,6 @@ public class ThrCorpExportLogServiceImpl implements ThrCorpExportLogService { public boolean updateThrCorpExportLog(ThrCorpExportLogEntity thrCorpExportLogEntity) { //塞入创建时间创建人 thrCorpExportLogEntity.setCreateTime(new Date()); - //todo 未添加创建人 -// thrCorpExportLogEntity.setCreateUser(String.valueOf(customerService.getUserId())); -// thrCorpExportLogEntity.setUpdateUser(String.valueOf(customerService.getUserId())); return thrCorpExportLogDao.updateThrCorpExportLog(thrCorpExportLogEntity); } diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrCorpImportDetailServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrCorpImportDetailServiceImpl.java index a778ecba5..6cef3fe62 100644 --- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrCorpImportDetailServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrCorpImportDetailServiceImpl.java @@ -36,24 +36,6 @@ public class ThrCorpImportDetailServiceImpl implements ThrCorpImportDetailServic return data; } - @Override - public boolean insertCorpDetailImport(ThrCorpImportDetailEntity thrCorpImportDetailEntity) { - thrCorpImportDetailEntity.setUpdateTime(new Date()); - thrCorpImportDetailEntity.setCreateTime(new Date()); - thrCorpImportDetailEntity.setCreateUser(String.valueOf(customerServicel.getUserId())); - thrCorpImportDetailEntity.setUpdateUser(String.valueOf(customerServicel.getUserId())); - return thrCorpImportDetailDao.insertCorpDetailImport(thrCorpImportDetailEntity); - } - - @Override - public boolean updateCorpDetailImport(ThrCorpImportDetailEntity thrCorpImportDetailEntity) { - thrCorpImportDetailEntity.setUpdateTime(new Date()); - thrCorpImportDetailEntity.setCreateTime(new Date()); - thrCorpImportDetailEntity.setCreateUser(String.valueOf(customerServicel.getUserId())); - thrCorpImportDetailEntity.setUpdateUser(String.valueOf(customerServicel.getUserId())); - return thrCorpImportDetailDao.updateCorpDetailImport(thrCorpImportDetailEntity); - } - @Override public boolean insertCorpDetailImports(List thrCorpImportDetailEntities) { return thrCorpImportDetailDao.insertCorpDetailImports(thrCorpImportDetailEntities); diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrCorpServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrCorpServiceImpl.java index 7a982e1d2..2e5986f3b 100644 --- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrCorpServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrCorpServiceImpl.java @@ -46,14 +46,6 @@ public class ThrCorpServiceImpl extends ServiceImpl i return data; } - @Override - public boolean insertThrCorps(ThrCorpEntity thrCorpEntity) { - if (thrCorpEntity.getId() == null) { - thrCorpEntity.setId(IdUtil.getSnowflakeNextId()); - } - return thrCorpDao.insertThrCorps(thrCorpEntity); - } - @Override public boolean insertThrCorpss(List thrCorpEntitys) { for (ThrCorpEntity thrCorpEntity : thrCorpEntitys) { @@ -64,11 +56,6 @@ public class ThrCorpServiceImpl extends ServiceImpl i return thrCorpDao.insertThrCorpss(thrCorpEntitys); } - @Override - public boolean updateThrCorps(ThrCorpEntity thrCorpEntity) { - return thrCorpDao.updateThrCorps(thrCorpEntity); - } - @Override public boolean deleteById(String id) { return thrCorpDao.deleteById(id); diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrDeptServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrDeptServiceImpl.java index fd73a4234..6e335873b 100644 --- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrDeptServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrDeptServiceImpl.java @@ -36,20 +36,7 @@ public class ThrDeptServiceImpl extends ServiceImpl i @Resource private ThrInvWarehouseDao thrInvWarehouseDao; @Resource - private ThrDeptServiceImpl thrDeptService; - @Resource private ThrInvWarehouseServiceImpl thrInvWarehouseService; - @Override - public ThrDeptEntity findDefault(Boolean advaceType, Boolean isDefault) { - - FilterThrDeptRequest filterThrDeptRequest = new FilterThrDeptRequest(); - filterThrDeptRequest.setIsDefault(isDefault); - filterThrDeptRequest.setAdvanceType(advaceType); - List thrInvWarehouseEntities = thrDeptDao.filterThrInvWarehouse(filterThrDeptRequest); - if (thrInvWarehouseEntities != null && thrInvWarehouseEntities.size() > 0) - return thrInvWarehouseEntities.get(0); - return null; - } @Override public boolean editExit(String code, String thirdSysFk, Long id) { @@ -68,27 +55,11 @@ public class ThrDeptServiceImpl extends ServiceImpl i return thrDeptDao.filterThrInvWarehouse(filterThrDeptRequest); } - @Override - public List filterGroupInvWarehouse(FilterThrDeptRequest filterThrDeptRequest) { - if (filterThrDeptRequest == null) { - return Collections.emptyList(); - } - if (filterThrDeptRequest.getPage() != null) { - int offset = (filterThrDeptRequest.getPage() - 1) * filterThrDeptRequest.getLimit(); - PageHelper.offsetPage(offset, filterThrDeptRequest.getLimit()); - } - return thrDeptDao.filterThrGroupInvWarehouse(filterThrDeptRequest); - } - @Override public boolean insertThrDept(ThrDeptEntity thrDeptEntity) { return thrDeptDao.insertThrDept(thrDeptEntity); } - @Override - public boolean insertThrDeptList(List thrDeptEntities) { - return thrDeptDao.insertThrDeptList(thrDeptEntities); - } @Override public boolean updateInvWarehouse(ThrDeptEntity thrDeptEntity) { @@ -169,34 +140,6 @@ public class ThrDeptServiceImpl extends ServiceImpl i thrInvWarehouseService.saveBatch(warehouseList); this.saveBatch(list); -// if(list!= null && list.size() >0){ -// for (ThrDeptEntity thrDeptEntity : list) { -// QueryWrapper queryWrapper = new QueryWrapper().eq("code",thrDeptEntity.getCode()); -// ThrDeptEntity thrDeptEntityNew = thrDeptDao.selectOne(queryWrapper); -// if(thrDeptEntityNew!=null){ -// thrDeptDao.update(thrDeptEntity,queryWrapper); -// }else { -// thrDeptDao.insert(thrDeptEntity); -// -// } -// } -// } -// if(warehouseList!= null && warehouseList.size() >0){ -// for (ThrInvWarehouseEntity invWarehouseEntity : warehouseList) { -// QueryWrapper queryWrapper = new QueryWrapper().eq("code",invWarehouseEntity.getCode()); -// ThrInvWarehouseEntity thrInvWarehouseEntityNew = thrInvWarehouseDao.selectOne(queryWrapper); -// if(thrInvWarehouseEntityNew!=null){ -// thrInvWarehouseDao.update(invWarehouseEntity,queryWrapper); -// }else { -// thrInvWarehouseDao.insert(invWarehouseEntity); -// -// } -// } -// } - //插入数据 -// thrDeptDao.insertOrUpdateBatch(list); -// thrInvWarehouseDao.insertOrUpdateBatch(warehouseList); -// thrInvWarehouseDao.insertThrInvWarehouses(warehouseList); if (list.size() >= limit) { page++; } else { diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvOrderServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvOrderServiceImpl.java index d47559c74..227f6d18c 100644 --- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvOrderServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvOrderServiceImpl.java @@ -139,15 +139,6 @@ public class ThrInvOrderServiceImpl implements ThrInvOrderService { thrInvOrderMapper.insert(thrInvOrder); thrInvOrderDetailMapper.insertBatch(thrInvOrderDetails); -// //是否自动生成出入库单据 -// if (IntUtil.value(systemParamConfigService.selectValueByParamKey("fee_out_auto_gen")) > 0) { -// GenerateOrderRequest generateOrderRequest = new GenerateOrderRequest(); -// generateOrderRequest.setBillNo(thrInvOrder.getBillNo()); -// generateOrderRequest.setAction(thrInvOrder.getBillType()); -// generateOrderRequest.setFromCorp(thrInvOrder.getFromCorp()); -// generateOrder(generateOrderRequest); -// } - } }); @@ -434,8 +425,6 @@ public class ThrInvOrderServiceImpl implements ThrInvOrderService { List thrInvOrderDetails = thrInvOrderDetailMapper.selectList(qwd); if (CollectionUtil.isEmpty(thrInvOrderDetails)) return false; - //校验单据的relId有null不生成单据 -// if (!inspectionDocuments(thrInvOrderDetails)) return false; BasicBussinessTypeEntity bussinessTypeEntity = bussinessTypeService.findByAction(generateOrderRequest.getAction()); @@ -516,8 +505,6 @@ public class ThrInvOrderServiceImpl implements ThrInvOrderService { } - -// ioAddInoutService.stockGenScan(ioOrderEntity); return true; } @@ -541,10 +528,6 @@ public class ThrInvOrderServiceImpl implements ThrInvOrderService { qwd.eq("orderIdFk", billNo); List thrInvOrderDetails = thrInvOrderDetailMapper.selectList(qwd); if (CollectionUtil.isEmpty(thrInvOrderDetails)) return false; - - //校验单据的relId有null不生成单据 -// if (!inspectionDocuments(thrInvOrderDetails)) return false; - BasicBussinessTypeEntity bussinessTypeEntity = bussinessTypeService.findByAction(generateOrderRequest.getAction()); Map> grouped = new HashMap<>(); //往来类型为患者，则需要根据患者进行拆单 @@ -581,10 +564,6 @@ public class ThrInvOrderServiceImpl implements ThrInvOrderService { List newIoCodeTemps = new ArrayList<>(thrInvOrderDetails.size()); - //码校验，提交时统一校验 -// if (!checkIoCodeTemps(thrInvOrderDetails)) { -// return false; -// } if (!copyIoCodeTemps(entry.getValue(), newIoCodeTemps, newBillNo, generateOrderRequest)) { return false; @@ -627,18 +606,6 @@ public class ThrInvOrderServiceImpl implements ThrInvOrderService { return true; } - /** - * 高耗码校验 - * - * @param thrInvOrderDetails - * @return - */ - private boolean checkIoCodeTemps(List thrInvOrderDetails) { - // TODO: 2024/3/6 增加高耗码校验 - - return true; - } - @Resource UdiRlSupService udiRlSupService; @@ -981,9 +948,6 @@ public class ThrInvOrderServiceImpl implements ThrInvOrderService { public boolean genOrder( ThrInvOrder thrInvOrder, BasicBussinessTypeEntity bussinessTypeEntity, List thrInvOrderDetails) { -// QueryWrapper qwd = new QueryWrapper<>(); -// qwd.eq("orderIdFk", thrInvOrder.getBillNo()); -// List thrInvOrderDetails = thrInvOrderDetailMapper.selectList(qwd); if (CollectionUtil.isEmpty(thrInvOrderDetails)) return false; @@ -1023,11 +987,6 @@ public class ThrInvOrderServiceImpl implements ThrInvOrderService { } ioOrderEntity.setCustomerId("110"); Long userId = 1l; -// try { -// userId = customerService.getUserId(); -// } catch (Exception e) { -// e.printStackTrace(); -// } ioOrderEntity.setUpdateUser(userId + ""); ioOrderEntity.setCreateUser(userId + ""); ioOrderEntity.setOrderType(ConstantStatus.ORDER_TYPE_SCAN);//正常单据处理 @@ -1324,20 +1283,6 @@ public class ThrInvOrderServiceImpl implements ThrInvOrderService { log.info("扫描处理第三方高耗明细生成单据定时任务结束"); } - /** - * 校验relId字段有空返回false - * - * @param thrInvOrderDetails - * @return - */ - private boolean inspectionDocuments(List thrInvOrderDetails) { - for (int i = 0; i < thrInvOrderDetails.size(); i++) { - ThrInvOrderDetail thrInvOrderDetail = thrInvOrderDetails.get(0); - if (ObjectUtil.isNull(thrInvOrderDetail.getRelId())) return false; - } - return true; - } - /** * 复制列表 * diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvProductsDetailServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvProductsDetailServiceImpl.java index 04308639e..0064183de 100644 --- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvProductsDetailServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvProductsDetailServiceImpl.java @@ -20,9 +20,6 @@ public class ThrInvProductsDetailServiceImpl implements ThrInvProductsDetailServ @Resource ThrInvProductsDetailDao thrInvProductsDetailDao; - @Resource - CustomerService customerServicel; - @Override public List filterInvProductsDetailImport(FilterThrCorpImportLogRequest filterThrCorpImportLogRequest) { if (filterThrCorpImportLogRequest == null) { @@ -36,24 +33,6 @@ public class ThrInvProductsDetailServiceImpl implements ThrInvProductsDetailServ return data; } - @Override - public boolean insertInvProductsDetailImport(ThrInvProductsImportDetailEntity thrInvProductsImportDetailEntity) { - thrInvProductsImportDetailEntity.setUpdateTime(new Date()); - thrInvProductsImportDetailEntity.setCreateTime(new Date()); - thrInvProductsImportDetailEntity.setCreateUser(String.valueOf(customerServicel.getUserId())); - thrInvProductsImportDetailEntity.setUpdateUser(String.valueOf(customerServicel.getUserId())); - return thrInvProductsDetailDao.insertInvProductsDetailImport(thrInvProductsImportDetailEntity); - } - - @Override - public boolean updateInvProductsDetailImport(ThrInvProductsImportDetailEntity thrInvProductsImportDetailEntity) { - thrInvProductsImportDetailEntity.setUpdateTime(new Date()); - thrInvProductsImportDetailEntity.setCreateTime(new Date()); - thrInvProductsImportDetailEntity.setCreateUser(String.valueOf(customerServicel.getUserId())); - thrInvProductsImportDetailEntity.setUpdateUser(String.valueOf(customerServicel.getUserId())); - return thrInvProductsDetailDao.updateInvProductsDetailImport(thrInvProductsImportDetailEntity); - } - @Override public boolean insertInvProductsDetailImports(List thrInvProductsImportDetailEntities) { return thrInvProductsDetailDao.insertInvProductsDetailImports(thrInvProductsImportDetailEntities); diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvProductsServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvProductsServiceImpl.java index 2a169429c..27ef9c7ac 100644 --- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvProductsServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvProductsServiceImpl.java @@ -42,28 +42,11 @@ public class ThrInvProductsServiceImpl implements ThrInvProductsService { return thrInvProductsDao.selectById(id); } - @Override - public boolean insertThrInvProduct(ThrInvProductsEntity thrInvProductsEntity) { - thrInvProductsEntity.setUpdateTime(new Date()); - thrInvProductsEntity.setCreateTime(new Date()); - thrInvProductsEntity.setCreateUser(String.valueOf(customerServicel.getUserId())); - thrInvProductsEntity.setUpdateUser(String.valueOf(customerServicel.getUserId())); - return thrInvProductsDao.insertThrInvProduct(thrInvProductsEntity); - } - @Override public boolean insertThrInvProducts(List thrInvProductsEntities) { return thrInvProductsDao.insertThrInvProducts(thrInvProductsEntities); } - @Override - public boolean updateThrInvProducts(ThrInvProductsEntity thrInvProductsEntity) { - thrInvProductsEntity.setUpdateTime(new Date()); - thrInvProductsEntity.setCreateTime(new Date()); - thrInvProductsEntity.setCreateUser(String.valueOf(customerServicel.getUserId())); - thrInvProductsEntity.setUpdateUser(String.valueOf(customerServicel.getUserId())); - return thrInvProductsDao.updateThrInvProducts(thrInvProductsEntity); - } @Override public boolean deleteById(String id) { diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvWarehouseServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvWarehouseServiceImpl.java index eecde8a5d..c2c0bfe35 100644 --- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvWarehouseServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvWarehouseServiceImpl.java @@ -51,17 +51,6 @@ public class ThrInvWarehouseServiceImpl extends ServiceImpl thrInvWarehouseEntitys = thrInvWarehouseDao.filterThrInvWarehouse(filterThrSubInvWarehouseRequest); - if (CollUtil.isNotEmpty(thrInvWarehouseEntitys)) { - return thrInvWarehouseEntitys.get(0); - } else return null; - } - @Override public List filterThrInvWarehouse(FilterThrSubInvWarehouseRequest filterThrSubInvWarehouseRequest) { if (filterThrSubInvWarehouseRequest == null) { @@ -97,12 +86,6 @@ public class ThrInvWarehouseServiceImpl extends ServiceImpl thrInvWarehouseEntitys) { - thrInvWarehouseEntitys.forEach(thrInvWarehouseEntity -> thrInvWarehouseEntity.setUpdateTime(new Date())); - return thrInvWarehouseDao.insertThrInvWarehouses(thrInvWarehouseEntitys); - } - @Override public boolean updateThrInvWarehouse(ThrInvWarehouseEntity thrInvWarehouseEntity) { thrInvWarehouseEntity.setUpdateTime(new Date()); @@ -114,18 +97,6 @@ public class ThrInvWarehouseServiceImpl extends ServiceImpl filterThrInvWarehouseResponse(FilterThrSubInvWarehouseRequest filterThrSubInvWarehouseRequest) { - if (null == filterThrSubInvWarehouseRequest) { - return Collections.emptyList(); - } - if (filterThrSubInvWarehouseRequest.getPage() != null) { - int offset = (filterThrSubInvWarehouseRequest.getPage() - 1) * filterThrSubInvWarehouseRequest.getLimit(); - PageHelper.offsetPage(offset, filterThrSubInvWarehouseRequest.getLimit()); - } - return thrInvWarehouseDao.filterThrInvWarehouseResponse(filterThrSubInvWarehouseRequest); - } - @Override public List findByLastTime(Date lastUpdateTime) { return thrInvWarehouseDao.selectByLastTime(lastUpdateTime); diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrOrderDetailServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrOrderDetailServiceImpl.java index 0e3c58c59..90e4fc491 100644 --- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrOrderDetailServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrOrderDetailServiceImpl.java @@ -38,20 +38,11 @@ public class ThrOrderDetailServiceImpl implements ThrOrderDetailService { return data; } - @Override - public boolean insertThrOrderDetail(ThrOrderDetailEntity thrOrderDetailEntity) { - return thrOrderDetailDao.insertThrOrderDetail(thrOrderDetailEntity); - } - @Override public boolean insertThrOrderDetails(List thrOrderDetailEntities) { return thrOrderDetailDao.insertThrOrderDetails(thrOrderDetailEntities); } - @Override - public int updateThrOrderDetail(ThrOrderDetailEntity thrOrderDetailEntity) { - return thrOrderDetailDao.updateById(thrOrderDetailEntity); - } @Override public boolean deleteById(String id) { diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrOrderImportDetailServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrOrderImportDetailServiceImpl.java index f43fa3b42..9ab190777 100644 --- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrOrderImportDetailServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrOrderImportDetailServiceImpl.java @@ -32,15 +32,6 @@ public class ThrOrderImportDetailServiceImpl implements ThrOrderImportDetailServ return data; } - @Override - public boolean insertOrderImportDetail(ThrOrderImportDetailEntity thrOrderImportDetailEntity) { - return thrOrderImportDetailDao.insertOrderdDetailImport(thrOrderImportDetailEntity); - } - - @Override - public boolean updateOrderImportDetail(ThrOrderImportDetailEntity thrOrderImportDetailEntity) { - return thrOrderImportDetailDao.updateOrderdDetailImport(thrOrderImportDetailEntity); - } @Override public boolean insertOrderImportDetails(List thrOrderImportDetailEntities) { diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrOrderImportLogServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrOrderImportLogServiceImpl.java index 8e1003a18..999841709 100644 --- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrOrderImportLogServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrOrderImportLogServiceImpl.java @@ -100,10 +100,6 @@ public class ThrOrderImportLogServiceImpl implements ThrOrderImportLogService { ThrOrderEntity thrOrderEntity = new ThrOrderEntity(); BeanUtils.copyProperties(thrOrderImportDetailEntity, thrOrderEntity); thrOrderEntity.setUpdateTime(new Date()); -// BussinessTypeEntity bussinessTypeEntity = bussinessTypeService.findBTByName(thrOrderEntity.getBillType()); -// if (bussinessTypeEntity != null) { -// thrOrderEntity.setBillType(bussinessTypeEntity.getAction()); -// } thrOrderService.insertThrOrder(thrOrderEntity); thrOrderEntity = thrOrderService.findByUnique(thrOrderEntity.getBillNo(), thrOrderEntity.getThirdSysFk()); ThrOrderEntity finalThrOrderEntity = thrOrderEntity; diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrOrderServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrOrderServiceImpl.java index c1c63106e..81560310a 100644 --- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrOrderServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrOrderServiceImpl.java @@ -62,74 +62,6 @@ public class ThrOrderServiceImpl implements ThrOrderService { return data; } - - @Override - public List filterAllOrders(List billNos, String thirdSys) { - List erpOrderEntities = new ArrayList<>(); - for (String billNo : billNos) { - FilterThrOrderRequest filterThrOrderRequest = new FilterThrOrderRequest(); - filterThrOrderRequest.setBillNo(billNo); - filterThrOrderRequest.setThirdSysFk(thirdSys); - List data = thrOrderDao.filterThrOrder(filterThrOrderRequest); - if (data != null && data.size() > 0) { - for (ThrOrderEntity thrOrderEntity : data) { - FilterThrOrderDetailRequest filterThrOrderDetailRequest = new FilterThrOrderDetailRequest(); - filterThrOrderDetailRequest.setOrderIdFk(thrOrderEntity.getId() + ""); - List thrOrderDetailEntities = thrOrderDetailDao.filterThrOrderDetailDetail(filterThrOrderDetailRequest); - if (thrOrderDetailEntities != null && thrOrderDetailEntities.size() > 0) { - for (ThrOrderDetailEntity thrOrderDetailEntity : thrOrderDetailEntities) { - ThrErpOrderResponse thrErpOrderResponse = new ThrErpOrderResponse(); - BeanUtils.copyProperties(thrOrderEntity, thrErpOrderResponse); - BeanUtils.copyProperties(thrOrderDetailEntity, thrErpOrderResponse); - thrErpOrderResponse.setCompanyid(thrOrderEntity.getCorpId()); - thrErpOrderResponse.setCompanyname(thrOrderEntity.getCorpName()); - thrErpOrderResponse.setErpOrderId(thrOrderEntity.getBillNo()); - thrErpOrderResponse.setIodtlId(thrOrderEntity.getBillNo()); - thrErpOrderResponse.setErpCount(Integer.valueOf(thrOrderDetailEntity.getCount())); - thrErpOrderResponse.setReCount(Integer.valueOf(thrOrderDetailEntity.getReCount())); - thrErpOrderResponse.setBatchNo(thrOrderDetailEntity.getBatchNo()); - thrErpOrderResponse.setGoodsid(thrOrderDetailEntity.getProductId()); - thrErpOrderResponse.setGoodsname(thrOrderDetailEntity.getProductName()); - thrErpOrderResponse.setCredate(thrOrderDetailEntity.getProductDate()); - thrErpOrderResponse.setExpireDate(thrOrderDetailEntity.getExpireDate()); - thrErpOrderResponse.setPackSpec(thrOrderDetailEntity.getSpec()); - erpOrderEntities.add(thrErpOrderResponse); - } - } - } - } - } - return erpOrderEntities; - } - - @Override - public List filterAllDetail(FilterThrOrderRequest filterThrOrderRequest) { - - List erpOrderResponses = new ArrayList<>(); - List data = filterThrOrder(filterThrOrderRequest); - if (data != null && data.size() > 0) { - for (ThrOrderEntity thrOrderEntity : data) { - FilterThrOrderDetailRequest filterThrOrderDetailRequest = new FilterThrOrderDetailRequest(); - filterThrOrderDetailRequest.setOrderIdFk(thrOrderEntity.getId() + ""); - List thrOrderDetailEntities = thrOrderDetailDao.filterThrOrderDetailDetail(filterThrOrderDetailRequest); - ThrOrderResponse erpOrderResponse = new ThrOrderResponse(); - BeanUtils.copyProperties(thrOrderEntity, erpOrderResponse); - List subErpOrders = new ArrayList<>(); - if (thrOrderDetailEntities != null && thrOrderDetailEntities.size() > 0) { - for (ThrOrderDetailEntity thrOrderDetailEntity : thrOrderDetailEntities) { - ThrOrderResponse.SubErpOrder subErpOrder = new ThrOrderResponse.SubErpOrder(); - BeanUtils.copyProperties(thrOrderDetailEntity, subErpOrder); - subErpOrders.add(subErpOrder); - } - } - erpOrderResponse.setSubErpOrders(subErpOrders); - erpOrderResponses.add(erpOrderResponse); - } - } - - return erpOrderResponses; - } - @Override public ThrOrderEntity findByUnique(String billNo, String thirdSysFk) { @@ -147,20 +79,6 @@ public class ThrOrderServiceImpl implements ThrOrderService { return null; } - @Override - public ThrOrderEntity findReceiveOrder(String billNo) { - if (StrUtil.isEmpty(billNo)) { - return null; - } - FilterThrOrderRequest filterThrOrderRequest = new FilterThrOrderRequest(); - filterThrOrderRequest.setBillNo(billNo); - filterThrOrderRequest.setType(1); - List thrOrderEntities = filterThrOrder(filterThrOrderRequest); - if (thrOrderEntities != null && thrOrderEntities.size() > 0) { - return thrOrderEntities.get(0); - } - return null; - } @Override public ThrOrderEntity findById(Integer id) { @@ -173,12 +91,6 @@ public class ThrOrderServiceImpl implements ThrOrderService { return thrOrderDao.insertThrOrder(thrCorpEntity); } - @Override - @Transactional(rollbackFor = Exception.class) - public boolean insertThrOrders(List thrOrderEntities) { - return thrOrderDao.insertThrOrders(thrOrderEntities); - } - @Override @Transactional(rollbackFor = Exception.class) public int updateThrOrder(ThrOrderEntity thrOrderEntity) { @@ -203,7 +115,6 @@ public class ThrOrderServiceImpl implements ThrOrderService { String data = (String) redisUtil.get(Constant.dlThrOrders); if ((data != null && data.equals("true"))) { log.error("当前任务正在下载更新业务单据信息，请稍后重试！"); - return; } else { redisUtil.set(Constant.dlThrOrders, "true", 1); List thrSystemBusApiEntities = thrSystemBusApiService.list(new QueryWrapper().eq("thirdSys", "thirdId").eq("type", 1)); diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsImportDetailServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsImportDetailServiceImpl.java index 16b0ad7f4..70aa614e3 100644 --- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsImportDetailServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsImportDetailServiceImpl.java @@ -32,21 +32,6 @@ public class ThrProductsImportDetailServiceImpl implements ThrProductsImportDeta return data; } - @Override - public boolean insertProductsDetailImport(ThrProductsImportDetailEntity thrOrderImportDetailEntity) { - return thrProductsImportDetailDao.insertProductsDetailImport(thrOrderImportDetailEntity); - } - - @Override - public boolean updateProductsDetailImport(ThrProductsImportDetailEntity thrOrderImportDetailEntity) { - return thrProductsImportDetailDao.updateProductsDetailImport(thrOrderImportDetailEntity); - } - - @Override - public boolean insertProductsDetailImports(List thrOrderImportDetailEntities) { - return thrProductsImportDetailDao.insertProductsDetailImports(thrOrderImportDetailEntities); - } - @Override public boolean deleteById(String id) { return thrProductsImportDetailDao.deleteById(id); diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsImportLogServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsImportLogServiceImpl.java index e8e23a5fa..9469d11ac 100644 --- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsImportLogServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsImportLogServiceImpl.java @@ -50,15 +50,4 @@ public class ThrProductsImportLogServiceImpl implements ThrProductsImportLogServ public boolean deleteByTime() { return thrProductsImportLogDao.deleteByTime(); } -// -// @Override -// public ThrProductsImportLogEntity selectByGenKey(String genKey) { -// -// filterUdiIpLogRequest.setGenKey(genKey); -// List data = thrProductsImportLogDao.filterImportLog(filterUdiIpLogRequest); -// if (data != null && data.size() > 0) { -// return data.get(0); -// } -// return null; -// } } diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrSystemBusApiServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrSystemBusApiServiceImpl.java index 3c6b3484f..4e8c7eb2a 100644 --- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrSystemBusApiServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrSystemBusApiServiceImpl.java @@ -21,12 +21,6 @@ public class ThrSystemBusApiServiceImpl extends ServiceImpl