diff --git a/God-Vue-master/god-admin/src/main/java/com/god/web/controller/wmsSaleOrder/WmsSaleOrderInfoController.java b/God-Vue-master/god-admin/src/main/java/com/god/web/controller/wmsSaleOrder/WmsSaleOrderInfoController.java index b8319553..1cf53252 100644 --- a/God-Vue-master/god-admin/src/main/java/com/god/web/controller/wmsSaleOrder/WmsSaleOrderInfoController.java +++ b/God-Vue-master/god-admin/src/main/java/com/god/web/controller/wmsSaleOrder/WmsSaleOrderInfoController.java @@ -1,7 +1,6 @@ package com.god.web.controller.wmsSaleOrder; import java.util.List; -import java.util.Map; import javax.servlet.http.HttpServletResponse; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; @@ -24,7 +23,7 @@ import com.god.common.core.page.TableDataInfo; /** * 销售订单信息Controller - * + * * @author god * @date 2023-12-06 */ @@ -102,14 +101,4 @@ public class WmsSaleOrderInfoController extends BaseController { return toAjax(wmsSaleOrderInfoService.deleteWmsSaleOrderInfoByIds(ids)); } - - /** - * 首页销售订单总金额(含税) - * @return 数据 - */ - @GetMapping(value = "/selectTotalOrderAmount") - public AjaxResult selectTotalOrderAmount() - { - return success(wmsSaleOrderInfoService.selectTotalOrderAmount()); - } } diff --git a/God-Vue-master/god-system/src/main/java/com/god/wmsSaleOrder/mapper/WmsSaleOrderInfoMapper.java b/God-Vue-master/god-system/src/main/java/com/god/wmsSaleOrder/mapper/WmsSaleOrderInfoMapper.java index 35c5672d..125cf024 100644 --- a/God-Vue-master/god-system/src/main/java/com/god/wmsSaleOrder/mapper/WmsSaleOrderInfoMapper.java +++ b/God-Vue-master/god-system/src/main/java/com/god/wmsSaleOrder/mapper/WmsSaleOrderInfoMapper.java @@ -3,19 +3,18 @@ package com.god.wmsSaleOrder.mapper; import java.util.List; import com.god.wmsSaleOrder.domain.WmsSaleOrderInfo; import com.god.wmsSaleOrder.domain.WmsSaleOrderDetail; -import java.util.Map; /** * 销售订单信息Mapper接口 - * + * * @author god * @date 2023-12-06 */ -public interface WmsSaleOrderInfoMapper +public interface WmsSaleOrderInfoMapper { /** * 查询销售订单信息 - * + * * @param id 销售订单信息主键 * @return 销售订单信息 */ @@ -23,7 +22,7 @@ public interface WmsSaleOrderInfoMapper /** * 查询销售订单信息列表 - * + * * @param wmsSaleOrderInfo 销售订单信息 * @return 销售订单信息集合 */ @@ -31,7 +30,7 @@ public interface WmsSaleOrderInfoMapper /** * 新增销售订单信息 - * + * * @param wmsSaleOrderInfo 销售订单信息 * @return 结果 */ @@ -39,7 +38,7 @@ public interface WmsSaleOrderInfoMapper /** * 修改销售订单信息 - * + * * @param wmsSaleOrderInfo 销售订单信息 * @return 结果 */ @@ -47,7 +46,7 @@ public interface WmsSaleOrderInfoMapper /** * 删除销售订单信息 - * + * * @param id 销售订单信息主键 * @return 结果 */ @@ -55,7 +54,7 @@ public interface WmsSaleOrderInfoMapper /** * 批量删除销售订单信息 - * + * * @param ids 需要删除的数据主键集合 * @return 结果 */ @@ -63,28 +62,26 @@ public interface WmsSaleOrderInfoMapper /** * 批量删除销售订单明细 - * + * * @param ids 需要删除的数据主键集合 * @return 结果 */ public int deleteWmsSaleOrderDetailBySaleOrderIds(String[] ids); - + /** * 批量新增销售订单明细 - * + * * @param wmsSaleOrderDetailList 销售订单明细列表 * @return 结果 */ public int batchWmsSaleOrderDetail(List wmsSaleOrderDetailList); - + /** * 通过销售订单信息主键删除销售订单明细信息 - * + * * @param id 销售订单信息ID * @return 结果 */ public int deleteWmsSaleOrderDetailBySaleOrderId(String id); - - Map selectTotalOrderAmount(); } diff --git a/God-Vue-master/god-system/src/main/java/com/god/wmsSaleOrder/service/IWmsSaleOrderInfoService.java b/God-Vue-master/god-system/src/main/java/com/god/wmsSaleOrder/service/IWmsSaleOrderInfoService.java index efcf3f62..600bf0cc 100644 --- a/God-Vue-master/god-system/src/main/java/com/god/wmsSaleOrder/service/IWmsSaleOrderInfoService.java +++ b/God-Vue-master/god-system/src/main/java/com/god/wmsSaleOrder/service/IWmsSaleOrderInfoService.java @@ -2,19 +2,18 @@ package com.god.wmsSaleOrder.service; import java.util.List; import com.god.wmsSaleOrder.domain.WmsSaleOrderInfo; -import java.util.Map; /** * 销售订单信息Service接口 - * + * * @author god * @date 2023-12-06 */ -public interface IWmsSaleOrderInfoService +public interface IWmsSaleOrderInfoService { /** * 查询销售订单信息 - * + * * @param id 销售订单信息主键 * @return 销售订单信息 */ @@ -22,7 +21,7 @@ public interface IWmsSaleOrderInfoService /** * 查询销售订单信息列表 - * + * * @param wmsSaleOrderInfo 销售订单信息 * @return 销售订单信息集合 */ @@ -30,7 +29,7 @@ public interface IWmsSaleOrderInfoService /** * 新增销售订单信息 - * + * * @param wmsSaleOrderInfo 销售订单信息 * @return 结果 */ @@ -38,7 +37,7 @@ public interface IWmsSaleOrderInfoService /** * 修改销售订单信息 - * + * * @param wmsSaleOrderInfo 销售订单信息 * @return 结果 */ @@ -46,7 +45,7 @@ public interface IWmsSaleOrderInfoService /** * 批量删除销售订单信息 - * + * * @param ids 需要删除的销售订单信息主键集合 * @return 结果 */ @@ -54,12 +53,9 @@ public interface IWmsSaleOrderInfoService /** * 删除销售订单信息信息 - * + * * @param id 销售订单信息主键 * @return 结果 */ public int deleteWmsSaleOrderInfoById(String id); - - Map selectTotalOrderAmount(); - } diff --git a/God-Vue-master/god-system/src/main/java/com/god/wmsSaleOrder/service/impl/WmsSaleOrderInfoServiceImpl.java b/God-Vue-master/god-system/src/main/java/com/god/wmsSaleOrder/service/impl/WmsSaleOrderInfoServiceImpl.java index d3751060..668e91b8 100644 --- a/God-Vue-master/god-system/src/main/java/com/god/wmsSaleOrder/service/impl/WmsSaleOrderInfoServiceImpl.java +++ b/God-Vue-master/god-system/src/main/java/com/god/wmsSaleOrder/service/impl/WmsSaleOrderInfoServiceImpl.java @@ -3,7 +3,6 @@ package com.god.wmsSaleOrder.service.impl; import java.util.List; import com.god.common.utils.DateUtils; import com.god.common.utils.uuid.IdUtils; -import java.util.Map; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.ArrayList; @@ -16,19 +15,19 @@ import com.god.wmsSaleOrder.service.IWmsSaleOrderInfoService; /** * 销售订单信息Service业务层处理 - * + * * @author god * @date 2023-12-06 */ @Service -public class WmsSaleOrderInfoServiceImpl implements IWmsSaleOrderInfoService +public class WmsSaleOrderInfoServiceImpl implements IWmsSaleOrderInfoService { @Autowired private WmsSaleOrderInfoMapper wmsSaleOrderInfoMapper; /** * 查询销售订单信息 - * + * * @param id 销售订单信息主键 * @return 销售订单信息 */ @@ -40,7 +39,7 @@ public class WmsSaleOrderInfoServiceImpl implements IWmsSaleOrderInfoService /** * 查询销售订单信息列表 - * + * * @param wmsSaleOrderInfo 销售订单信息 * @return 销售订单信息 */ @@ -52,7 +51,7 @@ public class WmsSaleOrderInfoServiceImpl implements IWmsSaleOrderInfoService /** * 新增销售订单信息 - * + * * @param wmsSaleOrderInfo 销售订单信息 * @return 结果 */ @@ -68,7 +67,7 @@ public class WmsSaleOrderInfoServiceImpl implements IWmsSaleOrderInfoService /** * 修改销售订单信息 - * + * * @param wmsSaleOrderInfo 销售订单信息 * @return 结果 */ @@ -83,7 +82,7 @@ public class WmsSaleOrderInfoServiceImpl implements IWmsSaleOrderInfoService /** * 批量删除销售订单信息 - * + * * @param ids 需要删除的销售订单信息主键 * @return 结果 */ @@ -97,7 +96,7 @@ public class WmsSaleOrderInfoServiceImpl implements IWmsSaleOrderInfoService /** * 删除销售订单信息信息 - * + * * @param id 销售订单信息主键 * @return 结果 */ @@ -109,14 +108,9 @@ public class WmsSaleOrderInfoServiceImpl implements IWmsSaleOrderInfoService return wmsSaleOrderInfoMapper.deleteWmsSaleOrderInfoById(id); } - @Override - public Map selectTotalOrderAmount() { - return wmsSaleOrderInfoMapper.selectTotalOrderAmount(); - } - /** * 新增销售订单明细信息 - * + * * @param wmsSaleOrderInfo 销售订单信息对象 */ public void insertWmsSaleOrderDetail(WmsSaleOrderInfo wmsSaleOrderInfo) diff --git a/God-Vue-master/god-system/src/main/resources/mapper/wmsSaleOrder/WmsSaleOrderInfoMapper.xml b/God-Vue-master/god-system/src/main/resources/mapper/wmsSaleOrder/WmsSaleOrderInfoMapper.xml index 63bce613..858ddd4d 100644 --- a/God-Vue-master/god-system/src/main/resources/mapper/wmsSaleOrder/WmsSaleOrderInfoMapper.xml +++ b/God-Vue-master/god-system/src/main/resources/mapper/wmsSaleOrder/WmsSaleOrderInfoMapper.xml @@ -3,7 +3,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -60,7 +60,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + - + insert into wms_sale_order_info @@ -181,14 +181,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - delete from wms_sale_order_info where id in + delete from wms_sale_order_info where id in #{id} - + - delete from wms_sale_order_detail where sale_order_id in + delete from wms_sale_order_detail where sale_order_id in #{saleOrderId} @@ -204,12 +204,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ( #{item.id}, #{item.saleOrderId}, #{item.productNum}, #{item.productName}, #{item.productFormat}, #{item.productUnit}, #{item.goodsNum}, #{item.unitPrice}, #{item.totalPriceVal}, #{item.taxRate}, #{item.taxUnitPrice}, #{item.taxPriceVal}, #{item.taxPaid}, #{item.remark}, #{item.isdeleted}, #{item.sourceSys}, #{item.interfaceType}) - - + \ No newline at end of file