PC端功能：进销存-请领单
This commit is contained in:
parent
100ae92557
commit
d75b09a6a4
|
|
@ -71,7 +71,7 @@ public class NuInvoicingQldInfoController extends JeecgController<NuInvoicingQld
|
|||
HttpServletRequest req) {
|
||||
QueryWrapper<NuInvoicingQldInfo> queryWrapper = QueryGenerator.initQueryWrapper(nuInvoicingQldInfo, req.getParameterMap());
|
||||
Page<NuInvoicingQldInfo> page = new Page<NuInvoicingQldInfo>(pageNo, pageSize);
|
||||
IPage<NuInvoicingQldInfo> pageList = nuInvoicingQldInfoService.page(page, queryWrapper);
|
||||
IPage<NuInvoicingQldInfo> pageList = nuInvoicingQldInfoService.pages(page, nuInvoicingQldInfo);
|
||||
return Result.OK(pageList);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -4,10 +4,9 @@ import java.io.Serializable;
|
|||
import java.io.UnsupportedEncodingException;
|
||||
import java.util.Date;
|
||||
import java.math.BigDecimal;
|
||||
import com.baomidou.mybatisplus.annotation.IdType;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import com.baomidou.mybatisplus.annotation.TableLogic;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.*;
|
||||
import com.nu.modules.warehouseMaterialInfo.entity.BlWarehouseMaterialInfo;
|
||||
import org.jeecg.common.constant.ProvinceCityArea;
|
||||
import org.jeecg.common.util.SpringContextUtils;
|
||||
import lombok.Data;
|
||||
|
|
@ -58,13 +57,14 @@ public class NuInvoicingQldInfo implements Serializable {
|
|||
@Excel(name = "请领单单号", width = 15)
|
||||
@ApiModelProperty(value = "请领单单号")
|
||||
private java.lang.String qldNo;
|
||||
/**库房id nu_warehouse_material_info.nu_id*/
|
||||
@Excel(name = "库房id nu_warehouse_material_info.nu_id", width = 15)
|
||||
@ApiModelProperty(value = "库房id nu_warehouse_material_info.nu_id")
|
||||
/**库房*/
|
||||
@Excel(name = "库房", width = 15)
|
||||
@ApiModelProperty(value = "库房")
|
||||
@Dict(dictTable = "nu_base_info", dicCode = "nu_id", dicText = "nu_name")
|
||||
private java.lang.String kfId;
|
||||
/**物料id nu_config_material_info.id*/
|
||||
@Excel(name = "物料id nu_config_material_info.id", width = 15)
|
||||
@ApiModelProperty(value = "物料id nu_config_material_info.id")
|
||||
/**物料*/
|
||||
@Excel(name = "物料", width = 15)
|
||||
@ApiModelProperty(value = "物料")
|
||||
private java.lang.String wlId;
|
||||
/**请领数量*/
|
||||
@Excel(name = "请领数量", width = 15)
|
||||
|
|
@ -78,4 +78,11 @@ public class NuInvoicingQldInfo implements Serializable {
|
|||
@Excel(name = "长者id nu_biz_elder_info.id", width = 15)
|
||||
@ApiModelProperty(value = "长者id nu_biz_elder_info.id")
|
||||
private java.lang.String elderId;
|
||||
|
||||
//物料信息
|
||||
@TableField(exist = false)
|
||||
private BlWarehouseMaterialInfo meterialInfo;
|
||||
//库房名称
|
||||
@TableField(exist = false)
|
||||
private java.lang.String kfName;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -29,113 +29,169 @@ import lombok.experimental.Accessors;
|
|||
@TableName("nu_invoicing_qld_main")
|
||||
@Accessors(chain = true)
|
||||
@EqualsAndHashCode(callSuper = false)
|
||||
@ApiModel(value="nu_invoicing_qld_main对象", description="进销存-请领单-主表")
|
||||
@ApiModel(value = "nu_invoicing_qld_main对象", description = "进销存-请领单-主表")
|
||||
public class NuInvoicingQldMain implements Serializable {
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/**id*/
|
||||
/**
|
||||
* id
|
||||
*/
|
||||
@TableId(type = IdType.ASSIGN_ID)
|
||||
@ApiModelProperty(value = "id")
|
||||
private java.lang.String id;
|
||||
/**createBy*/
|
||||
/**
|
||||
* createBy
|
||||
*/
|
||||
@ApiModelProperty(value = "createBy")
|
||||
private java.lang.String createBy;
|
||||
/**createTime*/
|
||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
|
||||
/**
|
||||
* createTime
|
||||
*/
|
||||
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@ApiModelProperty(value = "createTime")
|
||||
private java.util.Date createTime;
|
||||
/**updateBy*/
|
||||
/**
|
||||
* updateBy
|
||||
*/
|
||||
@ApiModelProperty(value = "updateBy")
|
||||
private java.lang.String updateBy;
|
||||
/**updateTime*/
|
||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
|
||||
/**
|
||||
* updateTime
|
||||
*/
|
||||
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@ApiModelProperty(value = "updateTime")
|
||||
private java.util.Date updateTime;
|
||||
/**请领单单号*/
|
||||
/**
|
||||
* 请领单单号
|
||||
*/
|
||||
@Excel(name = "请领单单号", width = 15)
|
||||
@ApiModelProperty(value = "请领单单号")
|
||||
private java.lang.String qldNo;
|
||||
/**请领状态 0购物车 1已作废 2已回退 3待出库 4已出库 5已收货*/
|
||||
@Excel(name = "请领状态 0购物车 1已作废 2已回退 3待出库 4已出库 5已收货", width = 15)
|
||||
@ApiModelProperty(value = "请领状态 0购物车 1已作废 2已回退 3待出库 4已出库 5已收货")
|
||||
/**
|
||||
* 请领状态
|
||||
*/
|
||||
@Excel(name = "请领状态", width = 15)
|
||||
@ApiModelProperty(value = "请领状态")
|
||||
@Dict(dicCode = "qld_status")
|
||||
private java.lang.String status;
|
||||
/**员工是否已读 Y已读 N有最新未读*/
|
||||
/**
|
||||
* 员工是否已读 Y已读 N有最新未读
|
||||
*/
|
||||
@Excel(name = "员工是否已读 Y已读 N有最新未读", width = 15)
|
||||
@ApiModelProperty(value = "员工是否已读 Y已读 N有最新未读")
|
||||
private java.lang.String izYgRead;
|
||||
/**库管是否已读 Y已读 N有最新未读*/
|
||||
/**
|
||||
* 库管是否已读 Y已读 N有最新未读
|
||||
*/
|
||||
@Excel(name = "库管是否已读 Y已读 N有最新未读", width = 15)
|
||||
@ApiModelProperty(value = "库管是否已读 Y已读 N有最新未读")
|
||||
private java.lang.String izKgRead;
|
||||
/**提交人*/
|
||||
/**
|
||||
* 提交人
|
||||
*/
|
||||
@Excel(name = "提交人", width = 15)
|
||||
@ApiModelProperty(value = "提交人")
|
||||
@Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
|
||||
private java.lang.String tjBy;
|
||||
/**提交时间*/
|
||||
/**
|
||||
* 提交时间
|
||||
*/
|
||||
@Excel(name = "提交时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
|
||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
|
||||
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@ApiModelProperty(value = "提交时间")
|
||||
private java.util.Date tjTime;
|
||||
/**作废人*/
|
||||
/**
|
||||
* 作废人
|
||||
*/
|
||||
@Excel(name = "作废人", width = 15)
|
||||
@ApiModelProperty(value = "作废人")
|
||||
@Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
|
||||
private java.lang.String zfBy;
|
||||
/**作废时间*/
|
||||
/**
|
||||
* 作废时间
|
||||
*/
|
||||
@Excel(name = "作废时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
|
||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
|
||||
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@ApiModelProperty(value = "作废时间")
|
||||
private java.util.Date zfTime;
|
||||
/**回退人*/
|
||||
/**
|
||||
* 回退人
|
||||
*/
|
||||
@Excel(name = "回退人", width = 15)
|
||||
@ApiModelProperty(value = "回退人")
|
||||
@Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
|
||||
private java.lang.String htBy;
|
||||
/**回退时间*/
|
||||
/**
|
||||
* 回退时间
|
||||
*/
|
||||
@Excel(name = "回退时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
|
||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
|
||||
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@ApiModelProperty(value = "回退时间")
|
||||
private java.util.Date htTime;
|
||||
/**出库人*/
|
||||
/**
|
||||
* 出库人
|
||||
*/
|
||||
@Excel(name = "出库人", width = 15)
|
||||
@ApiModelProperty(value = "出库人")
|
||||
@Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
|
||||
private java.lang.String ckBy;
|
||||
/**出库时间*/
|
||||
/**
|
||||
* 出库时间
|
||||
*/
|
||||
@Excel(name = "出库时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
|
||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
|
||||
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@ApiModelProperty(value = "出库时间")
|
||||
private java.util.Date ckTime;
|
||||
/**收货人*/
|
||||
/**
|
||||
* 收货人
|
||||
*/
|
||||
@Excel(name = "收货人", width = 15)
|
||||
@ApiModelProperty(value = "收货人")
|
||||
@Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
|
||||
private java.lang.String shBy;
|
||||
/**收货时间*/
|
||||
/**
|
||||
* 收货时间
|
||||
*/
|
||||
@Excel(name = "收货时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
|
||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
|
||||
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@ApiModelProperty(value = "收货时间")
|
||||
private java.util.Date shTime;
|
||||
/**节点名称*/
|
||||
/**
|
||||
* 节点名称
|
||||
*/
|
||||
@Excel(name = "节点名称", width = 15)
|
||||
@ApiModelProperty(value = "节点名称")
|
||||
private java.lang.String jdMc;
|
||||
/**nuid nu_base_info.nu_id*/
|
||||
@Excel(name = "nuid nu_base_info.nu_id", width = 15)
|
||||
/**
|
||||
* nuid nu_base_info.nu_id
|
||||
*/
|
||||
@Excel(name = "NUID", width = 15)
|
||||
@ApiModelProperty(value = "nuid nu_base_info.nu_id")
|
||||
@Dict(dictTable = "nu_base_info", dicCode = "nu_id", dicText = "nu_name")
|
||||
private java.lang.String nuId;
|
||||
/**长者id nu_biz_elder_info.id*/
|
||||
@Excel(name = "长者id nu_biz_elder_info.id", width = 15)
|
||||
/**
|
||||
* 长者id nu_biz_elder_info.id
|
||||
*/
|
||||
@Excel(name = "长者姓名", width = 15)
|
||||
@ApiModelProperty(value = "长者id nu_biz_elder_info.id")
|
||||
@Dict(dictTable = "nu_biz_elder_info", dicCode = "id", dicText = "name")
|
||||
private java.lang.String elderId;
|
||||
/**作废原因*/
|
||||
/**
|
||||
* 作废原因
|
||||
*/
|
||||
@Excel(name = "作废原因", width = 15)
|
||||
@ApiModelProperty(value = "作废原因")
|
||||
private java.lang.String zfYy;
|
||||
/**回退原因*/
|
||||
/**
|
||||
* 回退原因
|
||||
*/
|
||||
@Excel(name = "回退原因", width = 15)
|
||||
@ApiModelProperty(value = "回退原因")
|
||||
private java.lang.String htYy;
|
||||
|
|
|
|||
|
|
@ -2,6 +2,10 @@ package com.nu.modules.qld.mapper;
|
|||
|
||||
import java.util.List;
|
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import com.baomidou.mybatisplus.core.toolkit.Constants;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.nu.entity.InvoicingQldInfoEntity;
|
||||
import com.nu.entity.InvoicingQldQueryEntity;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
|
|
@ -17,4 +21,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
|||
public interface NuInvoicingQldInfoMapper extends BaseMapper<NuInvoicingQldInfo> {
|
||||
|
||||
List<InvoicingQldInfoEntity> queryWlInfo(InvoicingQldQueryEntity queryDto);
|
||||
|
||||
IPage<NuInvoicingQldInfo> pages(Page<NuInvoicingQldInfo> page, @Param("dto") NuInvoicingQldInfo dto);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -56,4 +56,41 @@
|
|||
ORDER BY
|
||||
MAX(info.create_time) DESC
|
||||
</select>
|
||||
|
||||
<select id="pages" resultType="com.nu.modules.qld.entity.NuInvoicingQldInfo">
|
||||
SELECT info.kf_id as "kfId",
|
||||
info.ql_num as "qlNum",
|
||||
baseInfo.nu_name AS "kfName",
|
||||
material.id AS "meterialInfo.id",
|
||||
material.category_id AS "meterialInfo.categoryId",
|
||||
material.type_id AS "meterialInfo.typeId",
|
||||
material.medication_id AS "meterialInfo.medicationId",
|
||||
material.material_name AS "meterialInfo.materialName",
|
||||
material.material_no AS "meterialInfo.materialNo",
|
||||
material.specification_model AS "meterialInfo.specificationModel",
|
||||
material.sales_unit_price AS "meterialInfo.salesUnitPrice",
|
||||
material.reference_unit_price AS "meterialInfo.referenceUnitPrice",
|
||||
material.material_units AS "meterialInfo.materialUnits",
|
||||
material.multi_unit_switch AS "meterialInfo.multiUnitSwitch",
|
||||
material.one_unit AS "meterialInfo.oneUnit",
|
||||
material.one_unit_proportion AS "meterialInfo.oneUnitProportion",
|
||||
material.one_unit_price AS "meterialInfo.oneUnitPrice",
|
||||
material.two_unit AS "meterialInfo.twoUnit",
|
||||
material.two_unit_proportion AS "meterialInfo.twoUnitProportion",
|
||||
material.two_unit_price AS "meterialInfo.twoUnitPrice",
|
||||
material.multi_unit_type AS "meterialInfo.multiUnitType",
|
||||
material.suppliers AS "meterialInfo.suppliers",
|
||||
material.material_img AS "meterialInfo.materialImg",
|
||||
material.material_ident AS "meterialInfo.materialIdent",
|
||||
material.iz_enabled AS "meterialInfo.izEnabled",
|
||||
material.del_flag AS "meterialInfo.delFlag",
|
||||
material.tag_type AS "meterialInfo.tagType",
|
||||
material.iz_ybbx AS "meterialInfo.izYbbx",
|
||||
material.iz_jgyh AS "meterialInfo.izJgyh"
|
||||
FROM nu_invoicing_qld_info info
|
||||
LEFT JOIN nu_config_material_info material ON info.wl_id = material.id
|
||||
LEFT JOIN nu_base_info baseInfo ON info.kf_id = baseInfo.nu_id
|
||||
where info.qld_no = #{dto.qldNo}
|
||||
order by info.create_time desc
|
||||
</select>
|
||||
</mapper>
|
||||
|
|
|
|||
|
|
@ -1,5 +1,8 @@
|
|||
package com.nu.modules.qld.service;
|
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.nu.modules.qld.entity.NuInvoicingQldInfo;
|
||||
import com.baomidou.mybatisplus.extension.service.IService;
|
||||
|
||||
|
|
@ -11,4 +14,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
|
|||
*/
|
||||
public interface INuInvoicingQldInfoService extends IService<NuInvoicingQldInfo> {
|
||||
|
||||
IPage<NuInvoicingQldInfo> pages(Page<NuInvoicingQldInfo> page, NuInvoicingQldInfo dto);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,8 @@
|
|||
package com.nu.modules.qld.service.impl;
|
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.nu.modules.qld.entity.NuInvoicingQldInfo;
|
||||
import com.nu.modules.qld.mapper.NuInvoicingQldInfoMapper;
|
||||
import com.nu.modules.qld.service.INuInvoicingQldInfoService;
|
||||
|
|
@ -16,4 +19,8 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|||
@Service
|
||||
public class NuInvoicingQldInfoServiceImpl extends ServiceImpl<NuInvoicingQldInfoMapper, NuInvoicingQldInfo> implements INuInvoicingQldInfoService {
|
||||
|
||||
@Override
|
||||
public IPage<NuInvoicingQldInfo> pages(Page<NuInvoicingQldInfo> page, NuInvoicingQldInfo dto) {
|
||||
return baseMapper.pages(page,dto);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue