java
/
crmproject
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

库存查询增加字段修改

This commit is contained in:
rbw 2024-10-23 11:41:43 +08:00
parent 564aa86e5c
commit 64595685f7
3 changed files with 76 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
crm-admin/src/main/java/com/yb/lb/webapp/stock/StockReportController.java
View File

@ -49,7 +49,14 @@ public class StockReportController extends BaseController {
@ApiParam(required = false, value = "商品名称") @RequestParam(required = false) String goodsName,
@ApiParam(required = false, value = "商品分类名称") @RequestParam(required = false) String goodsTypeName,
@ApiParam(required = false, value = "规格") @RequestParam(required = false) String specifications,
@ApiParam(required = false, value = "客户编码") @RequestParam(required = false) String uecode,
@ApiParam(required = false, value = "部门编码") @RequestParam(required = false) String areaNo,
@ApiParam(required = false, value = "部门名称") @RequestParam(required = false) String areaName,
@ApiParam(required = false, value = "发起人员名称") @RequestParam(required = false) String createName,
@ApiParam(required = false, value = "发起时间") @RequestParam(required = false) String createTime,
@ApiParam(required = false, value = "开始日期") @RequestParam(required = false) String startDate,
@ApiParam(required = false, value = "发起开始日期") @RequestParam(required = false) String startTime,
@ApiParam(required = false, value = "发起开始日期") @RequestParam(required = false) String endTime,
@ApiParam(required = false, value = "结束日期") @RequestParam(required = false) String endDate,
@ApiParam(required = true, value = "页码", defaultValue = "1") @RequestParam(value = "page") Integer pageNum,
@ApiParam(required = true, value = "每页条数", defaultValue = "10") @RequestParam(value = "pageSize") Integer pageSize,
@ -69,8 +76,15 @@ public class StockReportController extends BaseController {
params.put("goodsName", goodsName);
params.put("goodsTypeName", goodsTypeName);
params.put("specifications", specifications);
params.put("uecode", uecode);
params.put("areaNo", areaNo);
params.put("areaName", areaName);
params.put("createName", createName);
params.put("createTime", createTime);
params.put("startDate", startDate);
params.put("startTime", startTime);
params.put("endDate", endDate);
params.put("endTime", endTime);
params.put("confirmStatus", "1");
params.put("page", pageNum);
params.put("pageSize", pageSize);

34
crm-common/src/main/resources/mapper/mapper_oracle/stock/InventoryDetailMapper.xml
View File

@ -28,6 +28,12 @@
<result column="prod_date" property="prodDate" jdbcType="VARCHAR" />
<result column="distributor_name" property="clientName" jdbcType="VARCHAR" />
<result column="join_fhd_num" property="joinFhdNum" jdbcType="VARCHAR" />
<result column="distributor_no" property="distributorNo" jdbcType="VARCHAR" />
<result column="uecode" property="uecode" jdbcType="VARCHAR" />
<result column="create_name" property="createName" jdbcType="VARCHAR" />
<result column="create_time" property="createTime" jdbcType="VARCHAR" />
<result column="area_no" property="areaNo" jdbcType="VARCHAR" />
<result column="area_name" property="areaName" jdbcType="VARCHAR" />
</resultMap>
<!-- 表查询字段 -->
@ -93,13 +99,15 @@
<select id="findStock" resultMap="crmInventoryDetailMap" parameterType="map">
SELECT * FROM (
SELECT
c.distributor_name, a.goods_no, a.prod_date, b.goods_name, b.unit_name, b.specifications, b.goods_type_name,
a.count_num,a.join_fhd_num,
c.distributor_name, c.distributor_no, c.uecode, a.goods_no, a.prod_date, b.goods_name, b.unit_name, b.specifications, b.goods_type_name,
a.count_num,a.join_fhd_num, d.create_name, d.create_time, e.area_no, e.area_name,
ROW_NUMBER () OVER(PARTITION BY a.client_id,a.goods_no ORDER BY a.bill_date DESC, a.create_time
DESC) AS rn
FROM crm_inventory_detail a
LEFT JOIN crm_goods_info b ON a.goods_no = b.goods_no and a.company_id = b.company_id
LEFT JOIN crm_distributor_user_info c ON a.client_id = c.id
LEFT JOIN crm_inventory_info d ON a.bill_id = d.id
LEFT JOIN crm_marketing_area_info e ON c.marketing_area_id = e.id
WHERE a.confirm_status = '1' AND a.company_id = #{companyId}
<if test="clientId != null and clientId != ''">
AND a.client_id = #{clientId}
@ -124,6 +132,26 @@
AND TO_CHAR(TO_DATE(SUBSTR(a.bill_date,1,10),'yyyy-MM-dd'),'yyyy-MM-dd') &lt;=
TO_CHAR(TO_DATE(SUBSTR(#{endDate},1,10),'yyyy-MM-dd'),'yyyy-MM-dd')
</if>
<if test="startTime != null and startTime !=''">
AND TO_CHAR(TO_DATE(SUBSTR(d.create_time,1,10),'yyyy-MM-dd'),'yyyy-MM-dd') &gt;=
TO_CHAR(TO_DATE(SUBSTR(#{startTime},1,10),'yyyy-MM-dd'),'yyyy-MM-dd')
</if>
<if test="endTime != null and endTime !=''">
AND TO_CHAR(TO_DATE(SUBSTR(d.create_time,1,10),'yyyy-MM-dd'),'yyyy-MM-dd') &lt;=
TO_CHAR(TO_DATE(SUBSTR(#{endTime},1,10),'yyyy-MM-dd'),'yyyy-MM-dd')
</if>
<if test="createName != null and createName != ''">
AND d.create_name LIKE '%' || #{createName} || '%'
</if>
<if test="areaNo != null and areaNo != ''">
AND e.area_no LIKE '%' || #{areaNo} || '%'
</if>
<if test="areaName != null and areaName != ''">
AND e.area_name LIKE '%' || #{areaName} || '%'
</if>
<if test="uecode != null and uecode != ''">
AND c.uecode LIKE '%' || #{uecode} || '%'
</if>
<if test="flag !=null and flag !=''">
<!-- 前端传营销区域 -->
<if test="flag == 1">
@ -209,7 +237,7 @@
c.service_id LIKE '%' || #{userId} || '%'
)
</if>
ORDER BY a.goods_no
ORDER BY d.create_time desc, a.goods_no
)
WHERE rn = 1
</select>

37
crm-webapp/src/main/java/com/yb/lb/webapp/stock/entity/CrmInventoryDetail.java
View File

@ -41,6 +41,7 @@ public class CrmInventoryDetail implements java.io.Serializable {
/** 制单时间 */
@ApiModelProperty(hidden = true)
@Excel(name = "制单时间", width = 15, orderNum = "11")
private String createTime;
/** 商品id */
@ -49,12 +50,12 @@ public class CrmInventoryDetail implements java.io.Serializable {
/** 商品编码 */
@ApiModelProperty(value = "商品编码", required = true)
@Excel(name = "商品编码", width = 15, orderNum = "1")
@Excel(name = "商品编码", width = 15, orderNum = "4")
private String goodsNo;
/** 商品名称 */
@ApiModelProperty(value = "商品名称", required = true)
@Excel(name = "商品名称", width = 20, orderNum = "2")
@Excel(name = "商品名称", width = 20, orderNum = "5")
private String goodsName;
/** 计量单位id */
@ -63,12 +64,12 @@ public class CrmInventoryDetail implements java.io.Serializable {
/** 计量单位名称 */
@ApiModelProperty(value = "计量单位名称")
@Excel(name = "计量单位", width = 15, orderNum = "5")
@Excel(name = "计量单位", width = 15, orderNum = "7")
private String unitName;
/** 规格 */
@ApiModelProperty(value = "规格")
@Excel(name = "规格", width = 20, orderNum = "4")
@Excel(name = "规格", width = 20, orderNum = "6")
private String specifications;
/** 商品分类ID */
@ -86,7 +87,7 @@ public class CrmInventoryDetail implements java.io.Serializable {
/** 盘点数量 */
@ApiModelProperty(value = "盘点数量", required = true)
@Excel(name = "库存量", width = 15, orderNum = "7")
@Excel(name = "库存量", width = 15, orderNum = "9")
private String countNum;
/** 盈亏数量 */
@ -103,7 +104,7 @@ public class CrmInventoryDetail implements java.io.Serializable {
/** 生产日期 */
@ApiModelProperty(value = "生产日期", required = true)
@Excel(name = "生产日期", width = 15, orderNum = "6")
@Excel(name = "生产日期", width = 15, orderNum = "8")
private String prodDate;
/** 客户名称 */
@ -115,4 +116,28 @@ public class CrmInventoryDetail implements java.io.Serializable {
@ApiModelProperty(value = "关联发货单张数")
private String joinFhdNum;
/** crm客户编码 */
@ApiModelProperty(hidden = true)
private String distributorNo;
/** u8客户编码 */
@ApiModelProperty(hidden = true)
@Excel(name = "客户编码", width = 20, orderNum = "1")
private String uecode;
/** 发起人名称 */
@ApiModelProperty(hidden = true)
@Excel(name = "发起人名称", width = 20, orderNum = "10")
private String createName;
/** 部门编码 */
@ApiModelProperty(hidden = true)
@Excel(name = "部门编码", width = 20, orderNum = "2")
private String areaNo;
/** 部门名称 */
@ApiModelProperty(hidden = true)
@Excel(name = "部门名称", width = 20, orderNum = "3")
private String areaName;
}