Tony/god-ytr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix：还原到父版本

Browse Source
This commit is contained in:
LiWeiJie 2024-07-12 14:46:06 +08:00
parent 21b9156aff
commit e11525c66e
5 changed files with 39 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
God-Vue-master/god-admin/src/main/java/com/god/web/controller/wmsSaleOrder/WmsSaleOrderInfoController.java
View File

@ -1,7 +1,6 @@
package com.god.web.controller.wmsSaleOrder; package com.god.web.controller.wmsSaleOrder;
import java.util.List; import java.util.List;
import java.util.Map;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@ -102,14 +101,4 @@ public class WmsSaleOrderInfoController extends BaseController
{ {
return toAjax(wmsSaleOrderInfoService.deleteWmsSaleOrderInfoByIds(ids)); return toAjax(wmsSaleOrderInfoService.deleteWmsSaleOrderInfoByIds(ids));
} }
/**
* 首页销售订单总金额（含税）
* @return 数据
*/
@GetMapping(value = "/selectTotalOrderAmount")
public AjaxResult selectTotalOrderAmount()
{
return success(wmsSaleOrderInfoService.selectTotalOrderAmount());
}
} }

3
God-Vue-master/god-system/src/main/java/com/god/wmsSaleOrder/mapper/WmsSaleOrderInfoMapper.java
View File

@ -3,7 +3,6 @@ package com.god.wmsSaleOrder.mapper;
import java.util.List; import java.util.List;
import com.god.wmsSaleOrder.domain.WmsSaleOrderInfo; import com.god.wmsSaleOrder.domain.WmsSaleOrderInfo;
import com.god.wmsSaleOrder.domain.WmsSaleOrderDetail; import com.god.wmsSaleOrder.domain.WmsSaleOrderDetail;
import java.util.Map;
/** /**
* 销售订单信息Mapper接口 * 销售订单信息Mapper接口
@ -85,6 +84,4 @@ public interface WmsSaleOrderInfoMapper
* @return 结果 * @return 结果
*/ */
public int deleteWmsSaleOrderDetailBySaleOrderId(String id); public int deleteWmsSaleOrderDetailBySaleOrderId(String id);
Map<String, String> selectTotalOrderAmount();
} }

4
God-Vue-master/god-system/src/main/java/com/god/wmsSaleOrder/service/IWmsSaleOrderInfoService.java
View File

@ -2,7 +2,6 @@ package com.god.wmsSaleOrder.service;
import java.util.List; import java.util.List;
import com.god.wmsSaleOrder.domain.WmsSaleOrderInfo; import com.god.wmsSaleOrder.domain.WmsSaleOrderInfo;
import java.util.Map;
/** /**
* 销售订单信息Service接口 * 销售订单信息Service接口
@ -59,7 +58,4 @@ public interface IWmsSaleOrderInfoService
* @return 结果 * @return 结果
*/ */
public int deleteWmsSaleOrderInfoById(String id); public int deleteWmsSaleOrderInfoById(String id);
Map<String, String> selectTotalOrderAmount();
} }

6
God-Vue-master/god-system/src/main/java/com/god/wmsSaleOrder/service/impl/WmsSaleOrderInfoServiceImpl.java
View File

@ -3,7 +3,6 @@ package com.god.wmsSaleOrder.service.impl;
import java.util.List; import java.util.List;
import com.god.common.utils.DateUtils; import com.god.common.utils.DateUtils;
import com.god.common.utils.uuid.IdUtils; import com.god.common.utils.uuid.IdUtils;
import java.util.Map;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.ArrayList; import java.util.ArrayList;
@ -109,11 +108,6 @@ public class WmsSaleOrderInfoServiceImpl implements IWmsSaleOrderInfoService
return wmsSaleOrderInfoMapper.deleteWmsSaleOrderInfoById(id); return wmsSaleOrderInfoMapper.deleteWmsSaleOrderInfoById(id);
} }
@Override
public Map<String, String> selectTotalOrderAmount() {
return wmsSaleOrderInfoMapper.selectTotalOrderAmount();
}
/** /**
* 新增销售订单明细信息 * 新增销售订单明细信息
* *

8
God-Vue-master/god-system/src/main/resources/mapper/wmsSaleOrder/WmsSaleOrderInfoMapper.xml
View File

@ -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}) ( #{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})
</foreach> </foreach>
</insert> </insert>
<select id="selectTotalOrderAmount" resultType="map">
SELECT
sum( total_price_val ) sum
FROM
wms_sale_order_info
WHERE
interface_type = 'WmsSaleOrder'
</select>
</mapper> </mapper>