open_platform/ss-common-purchase
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

采购单查询条件修改

Browse Source 
选择供应商接口修改
选择人员接口修改
This commit is contained in:
God
2024-08-02 15:08:53 +08:00
parent b4ccf57f0a
commit c1c9c0a6e1
2 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/yxt/purchase/biz/purchasebill/PurchaseBillQuery.java
View File

@@ -49,7 +49,7 @@ public class PurchaseBillQuery implements Query {
@ApiModelProperty("单据编号")
private String billNo;
@ApiModelProperty("采购员")
private String purchaserSid;
private String purchaserName;
@ApiModelProperty("备注")
private String remarks;
@ApiModelProperty("发货状态key")

18
src/main/java/com/yxt/purchase/biz/purchasebill/PurchaseBillService.java
View File

@@ -110,19 +110,19 @@ public class PurchaseBillService extends MybatisBaseService<PurchaseBillMapper,
qw.eq("pb.wareHouseSid", query.getWareHouseSid());
}
if (StringUtils.isNotBlank(query.getReceiveStateKey())) {
qw.eq("pbe.receiveStateValue", query.getReceiveStateKey());
qw.eq("pbe.receiveStateKey", query.getReceiveStateKey());
}
if (StringUtils.isNotBlank(query.getLogisticsNum())) {
qw.like("pbe.logisticsNum", query.getLogisticsNum());
}
if (StringUtils.isNotBlank(query.getDeliveryStateKey())) {
qw.eq("pbe.deliveryStateValue", query.getDeliveryStateKey());
qw.eq("pbe.deliveryStateKey", query.getDeliveryStateKey());
}
if (StringUtils.isNotBlank(query.getBillNo())) {
qw.like("pb.billNo", query.getBillNo());
}
if (StringUtils.isNotBlank(query.getPurchaserSid())) {
qw.like("pb.purchaserSid", query.getPurchaserSid());
if (StringUtils.isNotBlank(query.getPurchaserName())) {
qw.like("pb.purchaserName", query.getPurchaserName());
}
if (StringUtils.isNotBlank(query.getRemarks())) {
qw.like("pb.remarks", query.getRemarks());
@@ -179,19 +179,19 @@ public class PurchaseBillService extends MybatisBaseService<PurchaseBillMapper,
qw.eq("pb.wareHouseSid", query.getWareHouseSid());
}
if (StringUtils.isNotBlank(query.getReceiveStateKey())) {
qw.eq("pbe.receiveStateValue", query.getReceiveStateKey());
qw.eq("pbe.receiveStateKey", query.getReceiveStateKey());
}
if (StringUtils.isNotBlank(query.getLogisticsNum())) {
qw.like("pbe.logisticsNum", query.getLogisticsNum());
}
if (StringUtils.isNotBlank(query.getDeliveryStateKey())) {
qw.eq("pbe.deliveryStateValue", query.getDeliveryStateKey());
qw.eq("pbe.deliveryStateKey", query.getDeliveryStateKey());
}
if (StringUtils.isNotBlank(query.getBillNo())) {
qw.like("pb.billNo", query.getBillNo());
}
if (StringUtils.isNotBlank(query.getPurchaserSid())) {
qw.like("pb.purchaserSid", query.getPurchaserSid());
if (StringUtils.isNotBlank(query.getPurchaserName())) {
qw.like("pb.purchaserName", query.getPurchaserName());
}
if (StringUtils.isNotBlank(query.getRemarks())) {
qw.like("pb.remarks", query.getRemarks());
@@ -236,7 +236,9 @@ public class PurchaseBillService extends MybatisBaseService<PurchaseBillMapper,
purchaseBillAmountService.insertByDto(purchaseBillAmount);
//保存采购单扩展
purchaseBillExtend.setBillSid(sid);
purchaseBillExtend.setDeliveryStateKey("1");
purchaseBillExtend.setDeliveryStateValue("未发货");
purchaseBillExtend.setReceiveStateKey("1");
purchaseBillExtend.setReceiveStateValue("待提交");
purchaseBillExtendService.insertByDto(purchaseBillExtend);
//保存商品信息