diff --git a/api/erp-api/src/main/java/cn/qihangerp/erp/controller/PurchaseLogisticsController.java b/api/erp-api/src/main/java/cn/qihangerp/erp/controller/PurchaseLogisticsController.java new file mode 100644 index 00000000..787dad4f --- /dev/null +++ b/api/erp-api/src/main/java/cn/qihangerp/erp/controller/PurchaseLogisticsController.java @@ -0,0 +1,87 @@ +package cn.qihangerp.erp.controller; + +import cn.qihangerp.common.AjaxResult; +import cn.qihangerp.common.TableDataInfo; +import cn.qihangerp.module.erp.domain.ErpLogistics; +import cn.qihangerp.module.erp.service.ErpLogisticsService; +import cn.qihangerp.security.common.BaseController; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import lombok.AllArgsConstructor; +import org.springframework.web.bind.annotation.*; + +import java.util.Arrays; +import java.util.List; + +/** + * 商品管理Controller + * + * @author qihang + * @date 2023-12-29 + */ +@AllArgsConstructor +@RestController +@RequestMapping("/erp/logistics") +public class PurchaseLogisticsController extends BaseController +{ + private final ErpLogisticsService logisticsService; + /** + * + */ + @GetMapping("/list") + public TableDataInfo list(Integer status) + { + List list = logisticsService.list(new LambdaQueryWrapper() + .eq(status!=null,ErpLogistics::getStatus, status) + .last(" ORDER BY id desc") + ); + return getDataTable(list); + } + /** + * 获取物流公司详细信息 + */ + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) + { + return success(logisticsService.getById(id)); + } + + /** + * 修改物流公司 + */ + @PutMapping("/update") + public AjaxResult edit(@RequestBody ErpLogistics bLogisticsCompany) + { + return toAjax(logisticsService.updateById(bLogisticsCompany)); + } + + + @PutMapping("/updateStatus") + public AjaxResult logisticsUpdateStatus(@RequestBody ErpLogistics company) + { + Integer newStatus = null; + if(company.getStatus()==null || company.getStatus().intValue() ==0){ + newStatus = 1; + }else{ + newStatus = 0; + } + return toAjax(logisticsService.updateStatus(company.getId(),newStatus)); + } + /** + * 新增物流公司 + */ + @PostMapping("/add") + public AjaxResult add(@RequestBody ErpLogistics bLogisticsCompany) + { + + return toAjax(logisticsService.save(bLogisticsCompany)); + } + /** + * 删除物流公司 + */ + @DeleteMapping("/del/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) + { + return toAjax(logisticsService.removeBatchByIds(Arrays.stream(ids).toList())); + } + +} diff --git a/api/erp-api/src/main/java/cn/qihangerp/erp/controller/PurchaseOrderShipController.java b/api/erp-api/src/main/java/cn/qihangerp/erp/controller/PurchaseOrderShipController.java new file mode 100644 index 00000000..2fdc520a --- /dev/null +++ b/api/erp-api/src/main/java/cn/qihangerp/erp/controller/PurchaseOrderShipController.java @@ -0,0 +1,69 @@ +package cn.qihangerp.erp.controller; + +import cn.qihangerp.common.AjaxResult; +import cn.qihangerp.common.PageQuery; +import cn.qihangerp.common.TableDataInfo; +import cn.qihangerp.model.entity.ErpPurchaseOrderShip; +import cn.qihangerp.model.query.PurchaseOrderSearchBo; +import cn.qihangerp.module.erp.service.ErpPurchaseOrderShipService; +import cn.qihangerp.security.common.BaseController; +import jakarta.servlet.http.HttpServletRequest; +import lombok.AllArgsConstructor; +import org.springframework.web.bind.annotation.*; + +/** + * 商品管理Controller + * + * @author qihang + * @date 2023-12-29 + */ +@AllArgsConstructor +@RestController +@RequestMapping("/erp/purchase") +public class PurchaseOrderShipController extends BaseController +{ + private final ErpPurchaseOrderShipService shipService; + /** + * + */ + @GetMapping("/shipList") + public TableDataInfo shipList(PurchaseOrderSearchBo bo, PageQuery pageQuery) + { + return getDataTable(shipService.queryPageList(bo, pageQuery)); + } + @GetMapping(value = "/shipDetail/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) + { + ErpPurchaseOrderShip detail = shipService.getById(id); + return AjaxResult.success(detail); + } + @PutMapping("/ship/confirmReceipt") + public AjaxResult confirmReceipt(@RequestBody ErpPurchaseOrderShip erpPurchaseOrderShip, HttpServletRequest request) + { + erpPurchaseOrderShip.setUpdateBy(getUsername()); + return toAjax(shipService.updateScmPurchaseOrderShip(erpPurchaseOrderShip)); + } + + //createStockInEntry +// @PostMapping("/ship/createStockInEntry") +// public AjaxResult createStockInEntry(@RequestBody PurchaseOrderStockInBo bo, HttpServletRequest request) +// { +// if(bo.getId() == null) return AjaxResult.error("缺少参数id"); +// if(bo.getWarehouseId()==null) return AjaxResult.error("请选择仓库"); +// +// bo.setCreateBy(getUsername()); +// int result =shipService.createStockInEntry(bo); +// if(result == -1) return new AjaxResult(404,"采购物流不存在"); +// else if (result == -2) return new AjaxResult(501,"未确认收货不允许操作"); +// else if (result == -3) { +// return new AjaxResult(502,"已处理过了请勿重复操作"); +// } else if (result == -4) { +// return new AjaxResult(503,"状态不正确不能操作"); +// } else if (result == -5) { +// return new AjaxResult(504,"仓库不存在"); +// } else if (result == 1) { +// return toAjax(1); +// }else return toAjax(result); +// } + +} diff --git a/api/erp-api/src/main/java/cn/qihangerp/erp/feign/OpenApiService.java b/api/erp-api/src/main/java/cn/qihangerp/erp/feign/OpenApiService.java index 5e0dbcb0..6da16b62 100644 --- a/api/erp-api/src/main/java/cn/qihangerp/erp/feign/OpenApiService.java +++ b/api/erp-api/src/main/java/cn/qihangerp/erp/feign/OpenApiService.java @@ -5,7 +5,7 @@ import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestParam; -@FeignClient(name = "open-api") +@FeignClient(name = "oms-api") public interface OpenApiService { @GetMapping(value = "/dou/order/get_detail") JSONObject getDouOrderDetail(@RequestParam String orderId); diff --git a/api/erp-api/src/main/java/cn/qihangerp/erp/mq/ApiMessageReceiver.java b/api/erp-api/src/main/java/cn/qihangerp/erp/mq/ApiMessageReceiver.java index 4b6f5556..ae516e1f 100644 --- a/api/erp-api/src/main/java/cn/qihangerp/erp/mq/ApiMessageReceiver.java +++ b/api/erp-api/src/main/java/cn/qihangerp/erp/mq/ApiMessageReceiver.java @@ -4,7 +4,9 @@ import cn.qihangerp.module.service.ApiMessageService; import com.alibaba.fastjson2.JSON; import cn.qihangerp.common.mq.MqMessage; import cn.qihangerp.common.utils.SpringUtils; +import com.alibaba.fastjson2.JSONObject; import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.data.redis.connection.Message; @@ -12,11 +14,10 @@ import org.springframework.data.redis.connection.MessageListener; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.stereotype.Component; +@Slf4j @AllArgsConstructor @Component public class ApiMessageReceiver implements MessageListener { - private static final Logger logger = LoggerFactory.getLogger(ApiMessageReceiver.class); - private final RedisTemplate redisTemplate; // private final OOrderService orderService; @@ -36,7 +37,7 @@ public class ApiMessageReceiver implements MessageListener { String messageContent = new String(message.getBody()); MqMessage vo = JSON.parseObject(messageContent, MqMessage.class); - logger.info("收到通知消息：",vo); + log.info("收到通知消息：{}", JSONObject.toJSONString(vo)); cn.qihangerp.module.service.ApiMessageService apiMessageService = SpringUtils.getBean(ApiMessageService.class); apiMessageService.messageHandle(vo); // System.out.println(vo.getMqType()); diff --git a/microservices/pdd-api/src/main/java/cn/qihangerp/api/pdd/PddOrderApiService.java b/microservices/pdd-api/src/main/java/cn/qihangerp/api/pdd/PddOrderApiService.java index fa0f53e9..fcc03a6a 100644 --- a/microservices/pdd-api/src/main/java/cn/qihangerp/api/pdd/PddOrderApiService.java +++ b/microservices/pdd-api/src/main/java/cn/qihangerp/api/pdd/PddOrderApiService.java @@ -97,7 +97,6 @@ public class PddOrderApiService { return; } - log.info("==========自动任务拉取PDD订单,总记录数" + upResult.getTotalRecords()); int insertSuccess = 0;//新增成功的订单 int totalError = 0; int hasExistOrder = 0;//已存在的订单数 @@ -117,15 +116,15 @@ public class PddOrderApiService { var result = orderService.saveOrder(shopId, pddOrder); if (result.getCode() == ResultVoEnum.DataExist.getIndex()) { //已经存在 - log.info("==========自动任务拉取PDD订单,：开始更新数据库：" + pddOrder.getOrderSn() + "存在、更新************开始通知****/"); + log.info("==========自动任务拉取PDD订单,：开始更新数据库：" + pddOrder.getOrderSn() + "存在、更新============开始通知"); mqUtils.sendApiMessage(MqMessage.build(EnumShopType.PDD, MqType.ORDER_MESSAGE,pddOrder.getOrderSn())); hasExistOrder++; } else if (result.getCode() == ResultVoEnum.SUCCESS.getIndex()) { - log.info("==========自动任务拉取PDD订单,：开始更新数据库：" + pddOrder.getOrderSn() + "不存在、新增************开始通知****/"); + log.info("==========自动任务拉取PDD订单,：开始更新数据库：" + pddOrder.getOrderSn() + "不存在、新增=============开始通知"); mqUtils.sendApiMessage(MqMessage.build(EnumShopType.PDD,MqType.ORDER_MESSAGE,pddOrder.getOrderSn())); insertSuccess++; } else { - log.info("==========自动任务拉取PDD订单,：开始更新数据库：" + pddOrder.getOrderSn() + "报错****************/"); + log.info("==========自动任务拉取PDD订单,：开始更新数据库：" + pddOrder.getOrderSn() + "报错:{}",result.getMsg()); totalError++; } } @@ -159,7 +158,7 @@ public class PddOrderApiService { logs.setDuration(System.currentTimeMillis() - beginTime); pullLogsService.save(logs); - String msg = "成功{startTime:"+startTime.format(formatter)+",endTime:"+endTime.format(formatter)+"}总共找到：" + upResult.getTotalRecords() + "条订单，新增：" + insertSuccess + "条，添加错误：" + totalError + "条，更新：" + hasExistOrder + "条"; + String msg = "成功{startTime:"+startTime.format(formatter)+",endTime:"+endTime.format(formatter)+"}，新增：" + insertSuccess + "条，添加错误：" + totalError + "条，更新：" + hasExistOrder + "条"; log.info("==========自动任务拉取PDD订单,END：" + msg); } } diff --git a/serviceImpl/erp/src/main/java/cn/qihangerp/module/erp/domain/ErpLogistics.java b/serviceImpl/erp/src/main/java/cn/qihangerp/module/erp/domain/ErpLogistics.java new file mode 100644 index 00000000..0a2b7ba7 --- /dev/null +++ b/serviceImpl/erp/src/main/java/cn/qihangerp/module/erp/domain/ErpLogistics.java @@ -0,0 +1,41 @@ +package cn.qihangerp.module.erp.domain; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +/** + * 采购物流公司表 + * @TableName erp_logistics + */ +@TableName(value ="erp_logistics") +@Data +public class ErpLogistics { + /** + * 主键ID + */ + @TableId(type = IdType.AUTO) + private Long id; + + /** + * 物流公司编码 + */ + private String code; + + /** + * 物流公司名称 + */ + private String name; + + /** + * 备注 + */ + private String remark; + + /** + * 状态（0禁用1启用） + */ + private Integer status; +} \ No newline at end of file diff --git a/serviceImpl/erp/src/main/java/cn/qihangerp/module/erp/mapper/ErpLogisticsMapper.java b/serviceImpl/erp/src/main/java/cn/qihangerp/module/erp/mapper/ErpLogisticsMapper.java new file mode 100644 index 00000000..c1d2bf56 --- /dev/null +++ b/serviceImpl/erp/src/main/java/cn/qihangerp/module/erp/mapper/ErpLogisticsMapper.java @@ -0,0 +1,18 @@ +package cn.qihangerp.module.erp.mapper; + +import cn.qihangerp.module.erp.domain.ErpLogistics; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** +* @author 1 +* @description 针对表【erp_logistics(采购物流公司表)】的数据库操作Mapper +* @createDate 2025-12-30 08:20:08 +* @Entity cn.qihangerp.module.erp.domain.ErpLogistics +*/ +public interface ErpLogisticsMapper extends BaseMapper { + +} + + + + diff --git a/serviceImpl/erp/src/main/java/cn/qihangerp/module/erp/service/ErpLogisticsService.java b/serviceImpl/erp/src/main/java/cn/qihangerp/module/erp/service/ErpLogisticsService.java new file mode 100644 index 00000000..bb714ebb --- /dev/null +++ b/serviceImpl/erp/src/main/java/cn/qihangerp/module/erp/service/ErpLogisticsService.java @@ -0,0 +1,13 @@ +package cn.qihangerp.module.erp.service; + +import cn.qihangerp.module.erp.domain.ErpLogistics; +import com.baomidou.mybatisplus.extension.service.IService; + +/** +* @author 1 +* @description 针对表【erp_logistics(采购物流公司表)】的数据库操作Service +* @createDate 2025-12-30 08:20:08 +*/ +public interface ErpLogisticsService extends IService { + int updateStatus(Long id,Integer status); +} diff --git a/serviceImpl/erp/src/main/java/cn/qihangerp/module/erp/service/ErpPurchaseOrderShipService.java b/serviceImpl/erp/src/main/java/cn/qihangerp/module/erp/service/ErpPurchaseOrderShipService.java index 7d4afa00..afd222fd 100644 --- a/serviceImpl/erp/src/main/java/cn/qihangerp/module/erp/service/ErpPurchaseOrderShipService.java +++ b/serviceImpl/erp/src/main/java/cn/qihangerp/module/erp/service/ErpPurchaseOrderShipService.java @@ -1,6 +1,9 @@ package cn.qihangerp.module.erp.service; +import cn.qihangerp.common.PageQuery; +import cn.qihangerp.common.PageResult; import cn.qihangerp.model.entity.ErpPurchaseOrderShip; +import cn.qihangerp.model.query.PurchaseOrderSearchBo; import com.baomidou.mybatisplus.extension.service.IService; /** @@ -9,5 +12,8 @@ import com.baomidou.mybatisplus.extension.service.IService; * @createDate 2025-09-09 10:40:41 */ public interface ErpPurchaseOrderShipService extends IService { + PageResult queryPageList(PurchaseOrderSearchBo bo, PageQuery pageQuery); + + int updateScmPurchaseOrderShip(ErpPurchaseOrderShip erpPurchaseOrderShip); } diff --git a/serviceImpl/erp/src/main/java/cn/qihangerp/module/erp/service/impl/ErpLogisticsServiceImpl.java b/serviceImpl/erp/src/main/java/cn/qihangerp/module/erp/service/impl/ErpLogisticsServiceImpl.java new file mode 100644 index 00000000..318000b8 --- /dev/null +++ b/serviceImpl/erp/src/main/java/cn/qihangerp/module/erp/service/impl/ErpLogisticsServiceImpl.java @@ -0,0 +1,28 @@ +package cn.qihangerp.module.erp.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import cn.qihangerp.module.erp.domain.ErpLogistics; +import cn.qihangerp.module.erp.service.ErpLogisticsService; +import cn.qihangerp.module.erp.mapper.ErpLogisticsMapper; +import org.springframework.stereotype.Service; + +/** +* @author 1 +* @description 针对表【erp_logistics(采购物流公司表)】的数据库操作Service实现 +* @createDate 2025-12-30 08:20:08 +*/ +@Service +public class ErpLogisticsServiceImpl extends ServiceImpl + implements ErpLogisticsService{ + @Override + public int updateStatus(Long id, Integer status) { + ErpLogistics update = new ErpLogistics(); + update.setId(id); + update.setStatus(status); + return this.baseMapper.updateById(update); + } +} + + + + diff --git a/serviceImpl/erp/src/main/java/cn/qihangerp/module/erp/service/impl/ErpPurchaseOrderShipServiceImpl.java b/serviceImpl/erp/src/main/java/cn/qihangerp/module/erp/service/impl/ErpPurchaseOrderShipServiceImpl.java index cf07f7bc..a66e0da0 100644 --- a/serviceImpl/erp/src/main/java/cn/qihangerp/module/erp/service/impl/ErpPurchaseOrderShipServiceImpl.java +++ b/serviceImpl/erp/src/main/java/cn/qihangerp/module/erp/service/impl/ErpPurchaseOrderShipServiceImpl.java @@ -1,19 +1,97 @@ package cn.qihangerp.module.erp.service.impl; +import cn.qihangerp.common.PageQuery; +import cn.qihangerp.common.PageResult; +import cn.qihangerp.common.utils.DateUtils; +import cn.qihangerp.model.entity.ErpPurchaseOrder; import cn.qihangerp.model.entity.ErpPurchaseOrderShip; +import cn.qihangerp.model.query.PurchaseOrderSearchBo; +import cn.qihangerp.module.erp.mapper.ErpPurchaseOrderMapper; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import cn.qihangerp.module.erp.service.ErpPurchaseOrderShipService; import cn.qihangerp.module.erp.mapper.ErpPurchaseOrderShipMapper; +import lombok.AllArgsConstructor; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.regex.Matcher; +import java.util.regex.Pattern; /** * @author 1 * @description 针对表【erp_purchase_order_ship(采购订单物流表)】的数据库操作Service实现 * @createDate 2025-09-09 10:40:41 */ +@AllArgsConstructor @Service public class ErpPurchaseOrderShipServiceImpl extends ServiceImpl implements ErpPurchaseOrderShipService{ + private final ErpPurchaseOrderShipMapper shipMapper; + private final ErpPurchaseOrderMapper orderMapper; + + private final String DATE_PATTERN = + "^(?:(?:(?:\\d{4}-(?:0?[1-9]|1[0-2])-(?:0?[1-9]|1\\d|2[0-8]))|(?:(?:(?:\\d{2}(?:0[48]|[2468][048]|[13579][26])|(?:(?:0[48]|[2468][048]|[13579][26])00))-0?2-29))$)|(?:(?:(?:\\d{4}-(?:0?[13578]|1[02]))-(?:0?[1-9]|[12]\\d|30))$)|(?:(?:(?:\\d{4}-0?[13-9]|1[0-2])-(?:0?[1-9]|[1-2]\\d|30))$)|(?:(?:(?:\\d{2}(?:0[48]|[13579][26]|[2468][048])|(?:(?:0[48]|[13579][26]|[2468][048])00))-0?2-29))$)$"; + private final Pattern DATE_FORMAT = Pattern.compile(DATE_PATTERN); + @Override + public PageResult queryPageList(PurchaseOrderSearchBo bo, PageQuery pageQuery) { + if(org.springframework.util.StringUtils.hasText(bo.getStartTime())){ + Matcher matcher = DATE_FORMAT.matcher(bo.getStartTime()); + boolean b = matcher.find(); + if(b){ + bo.setStartTime(bo.getStartTime()+" 00:00:00"); + } + } + if(org.springframework.util.StringUtils.hasText(bo.getEndTime())){ + Matcher matcher = DATE_FORMAT.matcher(bo.getEndTime()); + boolean b = matcher.find(); + if(b){ + bo.setEndTime(bo.getEndTime()+" 23:59:59"); + } + } + + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper() + .eq(bo.getSupplierId()!=null, ErpPurchaseOrderShip::getSupplierId,bo.getSupplierId()) + .eq(org.springframework.util.StringUtils.hasText(bo.getOrderNum()), ErpPurchaseOrderShip::getOrderNum,bo.getOrderNum()) + .eq(bo.getOrderStatus()!=null, ErpPurchaseOrderShip::getStatus,bo.getOrderStatus()) + .ge(org.springframework.util.StringUtils.hasText(bo.getStartTime()), ErpPurchaseOrderShip::getShipTime,bo.getStartTime()) + .le(org.springframework.util.StringUtils.hasText(bo.getEndTime()), ErpPurchaseOrderShip::getShipTime,bo.getEndTime()) + ; + + + Page pages = shipMapper.selectPage(pageQuery.build(), queryWrapper); + + return PageResult.build(pages); + } + + @Transactional(rollbackFor = Exception.class) + @Override + public int updateScmPurchaseOrderShip(ErpPurchaseOrderShip erpPurchaseOrderShip) + { + ErpPurchaseOrderShip ship = shipMapper.selectById(erpPurchaseOrderShip.getId()); + if(ship== null) return -1; + else if(ship.getStatus()!=0)return -2; + // 更新采购单状态 + ErpPurchaseOrder order = new ErpPurchaseOrder(); + order.setId(erpPurchaseOrderShip.getOrderId()); + order.setStatus(2); + order.setReceivedTime(erpPurchaseOrderShip.getReceiptTime()); + order.setUpdateTime(DateUtils.getNowDate()); + order.setUpdateBy(erpPurchaseOrderShip.getUpdateBy()); + orderMapper.updateById(order); + //更新 + ErpPurchaseOrderShip update = new ErpPurchaseOrderShip(); + update.setId(ship.getId()); + update.setUpdateTime(DateUtils.getNowDate()); + update.setUpdateBy(erpPurchaseOrderShip.getUpdateBy()); + update.setStatus(1); + update.setRemark(erpPurchaseOrderShip.getRemark()); + update.setReceiptTime(erpPurchaseOrderShip.getReceiptTime()); +// update.setReceiptTime(DateUtils.getNowDate()); + update.setId(erpPurchaseOrderShip.getId()); + return shipMapper.updateById(update); + } } diff --git a/serviceImpl/erp/src/main/resources/cn/qihangerp/module/erp/mapper/ErpLogisticsMapper.xml b/serviceImpl/erp/src/main/resources/cn/qihangerp/module/erp/mapper/ErpLogisticsMapper.xml new file mode 100644 index 00000000..74fde7e2 --- /dev/null +++ b/serviceImpl/erp/src/main/resources/cn/qihangerp/module/erp/mapper/ErpLogisticsMapper.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + id,code,name,remark,status + + diff --git a/vue/src/api/purchase/PurchaseOrderShip.js b/vue/src/api/purchase/PurchaseOrderShip.js index 04500ab2..91d88a69 100644 --- a/vue/src/api/purchase/PurchaseOrderShip.js +++ b/vue/src/api/purchase/PurchaseOrderShip.js @@ -3,7 +3,7 @@ import request from '@/utils/request' // 查询采购订单物流列表 export function listPurchaseOrderShip(query) { return request({ - url: '/erp-api/scm/purchase/shipList', + url: '/erp-api/erp/purchase/shipList', method: 'get', params: query }) @@ -12,7 +12,7 @@ export function listPurchaseOrderShip(query) { // 查询采购订单物流详细 export function getPurchaseOrderShip(id) { return request({ - url: '/erp-api/scm/purchase/shipDetail/' + id, + url: '/erp-api/erp/purchase/shipDetail/' + id, method: 'get' }) } @@ -22,7 +22,7 @@ export function getPurchaseOrderShip(id) { //创建入库单 export function createStockInEntry(data) { return request({ - url: '/erp-api/scm/purchase/ship/createStockInEntry', + url: '/erp-api/erp/purchase/ship/createStockInEntry', method: 'post', data: data }) @@ -32,7 +32,7 @@ export function createStockInEntry(data) { // 修改采购订单物流 export function confirmReceipt(data) { return request({ - url: '/erp-api/scm/purchase/ship/confirmReceipt', + url: '/erp-api/erp/purchase/ship/confirmReceipt', method: 'put', data: data }) diff --git a/vue/src/api/purchase/logistics.js b/vue/src/api/purchase/logistics.js index 85dd90b2..85b8c505 100644 --- a/vue/src/api/purchase/logistics.js +++ b/vue/src/api/purchase/logistics.js @@ -3,7 +3,7 @@ import request from '@/utils/request' // 查询物流公司列表 export function listLogistics(query) { return request({ - url: '/erp-api/scm/logistics/list', + url: '/erp-api/erp/logistics/list', method: 'get', params: query }) @@ -20,7 +20,7 @@ export function getLogistics(id) { // 新增物流公司 export function addLogistics(data) { return request({ - url: '/api/logistics', + url: '/erp-api/erp/logistics', method: 'post', data: data }) @@ -29,7 +29,7 @@ export function addLogistics(data) { // 修改物流公司 export function updateLogistics(data) { return request({ - url: '/api/logistics', + url: '/erp-api/erp/logistics', method: 'put', data: data }) @@ -38,7 +38,7 @@ export function updateLogistics(data) { // 删除物流公司 export function delLogistics(id) { return request({ - url: '/api/logistics/' + id, + url: '/erp-api/erp/logistics/' + id, method: 'delete' }) }