diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java index 1ced767f..5bc7d4ba 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java @@ -18,6 +18,8 @@ import com.glxp.api.entity.auth.AuthAdmin; import com.glxp.api.entity.auth.InvWarehouseEntity; import com.glxp.api.entity.basic.*; import com.glxp.api.entity.inout.*; +import com.glxp.api.entity.purchase.PurOrderDetailEntity; +import com.glxp.api.entity.purchase.PurOrderEntity; import com.glxp.api.entity.purchase.SupProductEntity; import com.glxp.api.entity.system.SystemParamConfigEntity; import com.glxp.api.entity.thrsys.ThrOrderDetailEntity; @@ -33,6 +35,8 @@ import com.glxp.api.res.inout.IoOrderInvoiceResponse; import com.glxp.api.service.auth.InvWarehouseService; import com.glxp.api.service.basic.*; import com.glxp.api.service.inout.*; +import com.glxp.api.service.purchase.PurOrderDetailService; +import com.glxp.api.service.purchase.PurOrderService; import com.glxp.api.service.purchase.SupCertService; import com.glxp.api.service.purchase.SupProductService; import com.glxp.api.service.system.SystemParamConfigService; @@ -399,6 +403,71 @@ public class IoOrderDetailBizController extends BaseController { } + @Resource + PurOrderService purOrderService; + @Resource + PurOrderDetailService purOrderDetailService; + + //选入领用单据至业务单据 + @AuthRuleAnnotation("") + @PostMapping("/udiwms/inout/order/addPurOrder") + @Log(title = "单据管理", businessType = BusinessType.INSERT) + public BaseResponse addPurOrder(@RequestBody PurOrderEntity purOrderEntity, + BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + purOrderEntity = purOrderService.selectById(purOrderEntity.getId()); + List purOrderDetailEntities = purOrderDetailService.findByOrderId(purOrderEntity.getId() + ""); + BasicBusTypeChangeEntity basicBusTypeChangeEntity = basicBusTypeChangeService.selectByOriginAction(purOrderEntity.getBillType()); + BasicBussinessTypeEntity bussinessTypeEntity = basicBussinessTypeService.findByAction(basicBusTypeChangeEntity.getTargetAction()); + + AuthAdmin authAdmin = getUser(); + //创建单据 + IoOrderEntity orderEntity = new IoOrderEntity(); + String orderNo = gennerOrderUtils.createScOrderNo(new OrderNoTypeBean(Constant.SCAN_ORDER + StrUtil.trimToEmpty(bussinessTypeEntity.getPrefix()), "yyyyMMdd")); + orderEntity.setBillNo(orderNo); + orderEntity.setCreateUser(authAdmin.getId() + ""); + orderEntity.setCreateTime(new Date()); + orderEntity.setUpdateUser(authAdmin.getId() + ""); + orderEntity.setUpdateTime(new Date()); + orderEntity.setCustomerId(authAdmin.getCustomerId() + ""); + orderEntity.setCorpOrderId(purOrderEntity.getBillNo()); + orderEntity.setAction(bussinessTypeEntity.getAction()); + orderEntity.setMainAction(bussinessTypeEntity.getMainAction()); + orderEntity.setDeptCode(purOrderEntity.getDeptCode()); + orderEntity.setInvCode(purOrderEntity.getInvCode()); + orderEntity.setFromReceiveBillNo(purOrderEntity.getBillNo()); + orderEntity.setStatus(ConstantStatus.ORDER_STATUS_TEMP_SAVE); + orderEntity.setDealStatus(ConstantStatus.ORDER_DEAL_DRAFT); + orderEntity.setFromType(ConstantStatus.FROM_RECEIVE); + orderEntity.setOrderType(ConstantStatus.ORDER_TYPE_BIZ); + orderEntity.setBusType(bussinessTypeEntity.getBusType()); + orderService.insertOrder(orderEntity); + for (PurOrderDetailEntity purReceiveDetailEntity : purOrderDetailEntities) { + IoOrderDetailBizEntity ioOrderDetailBizEntity = new IoOrderDetailBizEntity(); + UdiRelevanceResponse udiRelevanceResponse = udiRelevanceService.selectGroupById(purReceiveDetailEntity.getProductId().longValue()); + ioOrderDetailBizEntity.setOrderIdFk(orderEntity.getBillNo()); + ioOrderDetailBizEntity.setBindRlFk(udiRelevanceResponse.getId()); + ioOrderDetailBizEntity.setUuidFk(udiRelevanceResponse.getUuid()); + ioOrderDetailBizEntity.setNameCode(udiRelevanceResponse.getNameCode()); + ioOrderDetailBizEntity.setCoName(udiRelevanceResponse.getCpmctymc()); + ioOrderDetailBizEntity.setCertCode(udiRelevanceResponse.getZczbhhzbapzbh()); + ioOrderDetailBizEntity.setYlqxzcrbarmc(udiRelevanceResponse.getYlqxzcrbarmc()); + ioOrderDetailBizEntity.setManufacturer(udiRelevanceResponse.getManufactory()); + ioOrderDetailBizEntity.setMeasname(udiRelevanceResponse.getMeasname()); + ioOrderDetailBizEntity.setSpec(udiRelevanceResponse.getGgxh()); + ioOrderDetailBizEntity.setPrice(udiRelevanceResponse.getPrice()); + ioOrderDetailBizEntity.setSupId(purReceiveDetailEntity.getSupId()); + ioOrderDetailBizEntity.setCount(purReceiveDetailEntity.getCount()); + orderDetailBizService.insert(ioOrderDetailBizEntity); + } + return ResultVOUtils.success("选入成功！"); + + } + + @AuthRuleAnnotation("") @PostMapping("/udiwms/inout/order/delBizProduct") @Log(title = "单据管理", businessType = BusinessType.DELETE) @@ -483,13 +552,13 @@ public class IoOrderDetailBizController extends BaseController { @Log(title = "发票管理", businessType = BusinessType.INSERT) public BaseResponse insertInvoice(@RequestBody IoOrderDetailBizEntity ioOrderDetailBizEntity) { - IoOrderInvoiceEntity ioOrderInvoiceEntity = new IoOrderInvoiceEntity(); - ioOrderInvoiceEntity.setOrderIdFk(ioOrderDetailBizEntity.getOrderIdFk()); - ioOrderInvoiceEntity.setBindRlFk(ioOrderDetailBizEntity.getBindRlFk() + ""); - ioOrderInvoiceEntity.setBatchNo(ioOrderDetailBizEntity.getBatchNo()); - ioOrderInvoiceEntity.setProductDate(ioOrderDetailBizEntity.getProductDate()); - ioOrderInvoiceEntity.setExpireDate(ioOrderDetailBizEntity.getExpireDate()); - boolean b = ioOrderInvoiceService.insertInvoice(ioOrderInvoiceEntity); + IoOrderInvoiceEntity ioOrderInvoiceEntity = new IoOrderInvoiceEntity(); + ioOrderInvoiceEntity.setOrderIdFk(ioOrderDetailBizEntity.getOrderIdFk()); + ioOrderInvoiceEntity.setBindRlFk(ioOrderDetailBizEntity.getBindRlFk() + ""); + ioOrderInvoiceEntity.setBatchNo(ioOrderDetailBizEntity.getBatchNo()); + ioOrderInvoiceEntity.setProductDate(ioOrderDetailBizEntity.getProductDate()); + ioOrderInvoiceEntity.setExpireDate(ioOrderDetailBizEntity.getExpireDate()); + boolean b = ioOrderInvoiceService.insertInvoice(ioOrderInvoiceEntity); return ResultVOUtils.success("成功"); diff --git a/src/main/java/com/glxp/api/controller/purchase/SupCertController.java b/src/main/java/com/glxp/api/controller/purchase/SupCertController.java index f84c96d1..3cccb6f0 100644 --- a/src/main/java/com/glxp/api/controller/purchase/SupCertController.java +++ b/src/main/java/com/glxp/api/controller/purchase/SupCertController.java @@ -320,8 +320,8 @@ public class SupCertController { int i = 1; if (selectSupCertList != null && selectSupCertList.size() > 0) { for (SupCertEntity obj : selectSupCertList) { - List urlList=Arrays.asList(obj.getFilePath().split(",")); - for (String url:urlList){ + List urlList = Arrays.asList(obj.getFilePath().split(",")); + for (String url : urlList) { //组装数据 Map supData = new HashMap<>(); supData.put("companyName", supCompanyEntity.getCompanyName() == null ? ' ' : supCompanyEntity.getCompanyName()); @@ -340,7 +340,7 @@ public class SupCertController { supData.put("status", obj.getStatus() == 0 ? "有效" : "失效"); supData.put("auditStatus", getAuditStatus(obj.getAuditStatus())); supData.put("remark", obj.getRemark() == null ? ' ' : obj.getRemark()); - supData.put("filePath", "d:/udi/udiwms/udiwmsfile/register/file/image2/" + url); + supData.put("filePath", filePath + "register/file/image2/" + url); list.add(supData); i++; } @@ -434,8 +434,8 @@ public class SupCertController { int i = 1; if (selectSupCertList != null && selectSupCertList.size() > 0) { for (SupCertEntity obj : selectSupCertList) { - List urlList=Arrays.asList(obj.getFilePath().split(",")); - for (String url:urlList){ + List urlList = Arrays.asList(obj.getFilePath().split(",")); + for (String url : urlList) { //组装数据 Map supData = new HashMap<>(); supData.put("customerName", supManufacturerEntity.getSupName() == null ? ' ' : supManufacturerEntity.getSupName()); @@ -456,7 +456,7 @@ public class SupCertController { supData.put("status", obj.getStatus() == 0 ? "有效" : "失效"); supData.put("auditStatus", getAuditStatus(obj.getAuditStatus())); supData.put("remark2", obj.getRemark() == null ? ' ' : obj.getRemark()); - supData.put("filePath", "d:/udi/udiwms/udiwmsfile/register/file/image2/" + url); + supData.put("filePath", filePath + "register/file/image2/" + url); list.add(supData); i++; } @@ -498,8 +498,8 @@ public class SupCertController { if (selectSupCertList != null && selectSupCertList.size() > 0) { for (SupCertEntity obj : selectSupCertList) { - List urlList=Arrays.asList(obj.getFilePath().split(",")); - for (String url:urlList){ + List urlList = Arrays.asList(obj.getFilePath().split(",")); + for (String url : urlList) { //组装数据 Map supData = new HashMap<>(); supData.put("customerName", supManufacturerEntity.getSupName() == null ? ' ' : supManufacturerEntity.getSupName()); @@ -522,7 +522,7 @@ public class SupCertController { supData.put("status", obj.getStatus() == 0 ? "有效" : "失效"); supData.put("auditStatus", getAuditStatus(obj.getAuditStatus())); supData.put("remark2", obj.getRemark() == null ? ' ' : obj.getRemark()); - supData.put("filePath", "d:/udi/udiwms/udiwmsfile/register/file/image2/" + url); + supData.put("filePath", filePath + "register/file/image2/" + url); list.add(supData); i++; } @@ -536,12 +536,12 @@ public class SupCertController { //首营预览文件 @PostMapping("/udiwms/image/register/file") public BaseResponse uploadRegisterFile(@RequestBody FilterImageRequest filterImageRequest) { - List urlList=Arrays.asList(filterImageRequest.getImageUrl().split(",")); + List urlList = Arrays.asList(filterImageRequest.getImageUrl().split(",")); List list = new ArrayList<>(); - for (String obj:urlList){ - String url = filterImageRequest.getCertFileUrl() + obj; - list.add(url); - } + for (String obj : urlList) { + String url = filterImageRequest.getCertFileUrl() + obj; + list.add(url); + } return ResultVOUtils.success(list); } diff --git a/src/main/java/com/glxp/api/controller/sync/SpsSyncDownloadController.java b/src/main/java/com/glxp/api/controller/sync/SpsSyncDownloadController.java index 3572a4df..82ea2178 100644 --- a/src/main/java/com/glxp/api/controller/sync/SpsSyncDownloadController.java +++ b/src/main/java/com/glxp/api/controller/sync/SpsSyncDownloadController.java @@ -115,7 +115,6 @@ public class SpsSyncDownloadController { codeTempEntity.setId(null); codeMappert.insert(codeTempEntity); } - } } diff --git a/src/main/java/com/glxp/api/dao/purchase/PurOrderDao.java b/src/main/java/com/glxp/api/dao/purchase/PurOrderDao.java index 76001694..cbf211f0 100644 --- a/src/main/java/com/glxp/api/dao/purchase/PurOrderDao.java +++ b/src/main/java/com/glxp/api/dao/purchase/PurOrderDao.java @@ -1,15 +1,13 @@ package com.glxp.api.dao.purchase; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.glxp.api.dao.BaseMapperPlus; import com.glxp.api.entity.purchase.PurOrderEntity; import com.glxp.api.req.purchase.PurOrderRequest; -import com.glxp.api.req.purchase.PurPlanRequest; import com.glxp.api.res.purchase.PurOrderResponse; -import com.glxp.api.res.purchase.PurPlanResponse; import java.util.List; -public interface PurOrderDao extends BaseMapper { +public interface PurOrderDao extends BaseMapperPlus { List queryPageList(PurOrderRequest purPlanRequest); -} \ No newline at end of file +} diff --git a/src/main/java/com/glxp/api/service/inout/impl/ReceiveServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/ReceiveServiceImpl.java index f9e07174..cd5809e1 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/ReceiveServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inout/impl/ReceiveServiceImpl.java @@ -38,9 +38,9 @@ public class ReceiveServiceImpl implements ReceiveService { @Override public int updateOrder(PurReceiveEntity purReceiveEntity) { - QueryWrapper ew=new QueryWrapper<>(); - ew.eq("billNo",purReceiveEntity.getBillNo()); - return receiveDao.update(purReceiveEntity,ew); + QueryWrapper ew = new QueryWrapper<>(); + ew.eq("billNo", purReceiveEntity.getBillNo()); + return receiveDao.update(purReceiveEntity, ew); } @Override diff --git a/src/main/java/com/glxp/api/service/purchase/PurOrderService.java b/src/main/java/com/glxp/api/service/purchase/PurOrderService.java index 214698ca..6f7392c9 100644 --- a/src/main/java/com/glxp/api/service/purchase/PurOrderService.java +++ b/src/main/java/com/glxp/api/service/purchase/PurOrderService.java @@ -1,7 +1,7 @@ package com.glxp.api.service.purchase; - +import com.glxp.api.entity.inout.PurReceiveEntity; import com.glxp.api.entity.purchase.PurOrderEntity; import com.glxp.api.entity.purchase.PurPlanEntity; import com.glxp.api.req.purchase.PurOrderRequest; @@ -12,6 +12,7 @@ import com.glxp.api.res.purchase.PurPlanResponse; import java.util.List; public interface PurOrderService { + PurOrderEntity selectById(Long id); List queryPageList(PurOrderRequest purOrderRequest); diff --git a/src/main/java/com/glxp/api/service/purchase/impl/PurOrderServiceImpl.java b/src/main/java/com/glxp/api/service/purchase/impl/PurOrderServiceImpl.java index 36429d6f..1f49245c 100644 --- a/src/main/java/com/glxp/api/service/purchase/impl/PurOrderServiceImpl.java +++ b/src/main/java/com/glxp/api/service/purchase/impl/PurOrderServiceImpl.java @@ -3,6 +3,7 @@ package com.glxp.api.service.purchase.impl; import com.github.pagehelper.PageHelper; import com.glxp.api.dao.purchase.PurOrderDao; import com.glxp.api.dao.purchase.PurPlanDao; +import com.glxp.api.entity.inout.PurReceiveEntity; import com.glxp.api.entity.purchase.PurOrderEntity; import com.glxp.api.entity.purchase.PurPlanEntity; import com.glxp.api.req.purchase.PurOrderRequest; @@ -25,6 +26,11 @@ public class PurOrderServiceImpl implements PurOrderService { @Resource PurOrderDao purOrderDao; + @Override + public PurOrderEntity selectById(Long id) { + return purOrderDao.selectById(id); + } + @Override public List queryPageList(PurOrderRequest purOrderRequest) { if (purOrderRequest == null) { diff --git a/src/main/java/com/glxp/api/task/AsyncSpsTask.java b/src/main/java/com/glxp/api/task/AsyncSpsTask.java index 68a08c5d..5380d166 100644 --- a/src/main/java/com/glxp/api/task/AsyncSpsTask.java +++ b/src/main/java/com/glxp/api/task/AsyncSpsTask.java @@ -36,7 +36,7 @@ public class AsyncSpsTask implements SchedulingConfigurer { scheduledRequest.setCronName("syncIdcSps"); logger.info("syncIdcSps----------------"); ScheduledEntity scheduledEntity = scheduledDao.findScheduled(scheduledRequest); - String cron = scheduledEntity != null ? scheduledEntity.getCron() : "0 0/3 * * * ?"; + String cron = scheduledEntity != null ? scheduledEntity.getCron() : "0 0/50 * * * ?"; if (cron.isEmpty()) { logger.error("cron is null");