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-07-25 17:35:45 +08:00
parent 5836efe42f
commit 85585b323e
10 changed files with 49 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/yxt/purchase/biz/purchasebill/PurchaseBillDetailsVo.java
View File

@@ -86,9 +86,8 @@ public class PurchaseBillDetailsVo implements Vo {
private String purchaserSid; // 采购员sid（单选）
@ApiModelProperty("采购员姓名")
private String purchaserName; // 采购员姓名
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
@ApiModelProperty("预计到货日期")
private Date deliveryDate; // 预计到货日期
private String deliveryDate;
@ApiModelProperty("仓库sid")
private String wareHouseSid;
@ApiModelProperty("仓库名称")

3
src/main/java/com/yxt/purchase/biz/purchasebill/PurchaseBillDto.java
View File

@@ -82,9 +82,8 @@ public class PurchaseBillDto implements Dto {
private String purchaserSid; // 采购员sid（单选）
@ApiModelProperty("采购员姓名")
private String purchaserName; // 采购员姓名
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
@ApiModelProperty("预计到货日期")
private Date deliveryDate; // 预计到货日期
private String deliveryDate; // 预计到货日期
@ApiModelProperty("仓库sid")
private String wareHouseSid;
@ApiModelProperty("仓库名称")

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

@@ -69,7 +69,7 @@
<select id="selectNum" resultType="java.lang.String">
select RIGHT (billNo, 4)
from pms_purchase_bill
from purchase_bill
where billNo LIKE concat(#{billNo}, '%')
order by billNo desc
limit 1

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

@@ -76,6 +76,7 @@ public class PurchaseBillService extends MybatisBaseService<PurchaseBillMapper,
public PagerVo<PurchaseBillVo> listPageVo(PagerQuery<PurchaseBillQuery> pq) {
PurchaseBillQuery query = pq.getParams();
QueryWrapper<PurchaseBill> qw = new QueryWrapper<>();
qw.eq("pb.deptSid","3042d730-64e8-4e34-b08a-44adca4da3a5");
if (StringUtils.isNotBlank(query.getSupplierSid())) {
qw.eq("pb.supplierSid", query.getSupplierSid());
}
@@ -119,7 +120,7 @@ public class PurchaseBillService extends MybatisBaseService<PurchaseBillMapper,
public PagerVo<PurchaseBillExVo> exlistPage(PagerQuery<PurchaseBillQuery> pq) {
PurchaseBillQuery query = pq.getParams();
QueryWrapper<PurchaseBill> qw = new QueryWrapper<>();
qw.ne("state","0");
qw.ne("state", "0");
if (StringUtils.isNotBlank(query.getSupplierSid())) {
qw.eq("pb.supplierSid", query.getSupplierSid());
}
@@ -165,7 +166,6 @@ public class PurchaseBillService extends MybatisBaseService<PurchaseBillMapper,
PurchaseBillAmountDto purchaseBillAmount = dto.getPurchaseBillAmount();
PurchaseBillExtendDto purchaseBillExtend = dto.getPurchaseBillExtend();
List<PurchaseBillDetailDto> purchaseBillDetailList = dto.getPurchaseBillDetailList();
List<PurchaseBillBatchDto> purchaseBillBatchList = dto.getPurchaseBillBatchList();
List<PurchaseAppendixUrl> purchaseAppendixList = dto.getPurchaseAppendixList();
if (StringUtils.isBlank(dtoSid)) {
String sid = this.insertByDto(dto);
@@ -182,11 +182,13 @@ public class PurchaseBillService extends MybatisBaseService<PurchaseBillMapper,
goodsImgUrl = goodsImgUrl.replace(fileUploadComponent.getUrlPrefix(), "");
purchaseBillDetailDto.setGoodsImgUrl(goodsImgUrl);
String detailSid = purchaseBillDetailService.insertByDto(purchaseBillDetailDto);
for (PurchaseBillBatchDto purchaseBillBatchDto : purchaseBillBatchList) {
purchaseBillBatchDto.setBillSid(sid);
purchaseBillBatchDto.setBillDetailSid(detailSid);
purchaseBillBatchService.insertByDto(purchaseBillBatchDto);
}
PurchaseBillBatchDto purchaseBillBatchDto = new PurchaseBillBatchDto();
purchaseBillBatchDto.setBillSid(sid);
purchaseBillBatchDto.setBillDetailSid(detailSid);
purchaseBillBatchDto.setBatchNumber(purchaseBillDetailDto.getBatchNumber());
purchaseBillBatchDto.setExpireDate(purchaseBillDetailDto.getExpireDate());
purchaseBillBatchDto.setMadeDate(purchaseBillDetailDto.getMadeDate());
purchaseBillBatchService.insertByDto(purchaseBillBatchDto);
}
//保存附件信息
for (PurchaseAppendixUrl purchaseAppendixUrl : purchaseAppendixList) {
@@ -224,11 +226,13 @@ public class PurchaseBillService extends MybatisBaseService<PurchaseBillMapper,
goodsImgUrl = goodsImgUrl.replace(fileUploadComponent.getUrlPrefix(), "");
purchaseBillDetailDto.setGoodsImgUrl(goodsImgUrl);
String detailSid = purchaseBillDetailService.insertByDto(purchaseBillDetailDto);
for (PurchaseBillBatchDto purchaseBillBatchDto : purchaseBillBatchList) {
purchaseBillBatchDto.setBillSid(dtoSid);
purchaseBillBatchDto.setBillDetailSid(detailSid);
purchaseBillBatchService.insertByDto(purchaseBillBatchDto);
}
PurchaseBillBatchDto purchaseBillBatchDto = new PurchaseBillBatchDto();
purchaseBillBatchDto.setBillSid(dtoSid);
purchaseBillBatchDto.setBillDetailSid(detailSid);
purchaseBillBatchDto.setBatchNumber(purchaseBillDetailDto.getBatchNumber());
purchaseBillBatchDto.setExpireDate(purchaseBillDetailDto.getExpireDate());
purchaseBillBatchDto.setMadeDate(purchaseBillDetailDto.getMadeDate());
purchaseBillBatchService.insertByDto(purchaseBillBatchDto);
}
//保存附件信息
for (PurchaseAppendixUrl purchaseAppendixUrl : purchaseAppendixList) {
@@ -244,7 +248,7 @@ public class PurchaseBillService extends MybatisBaseService<PurchaseBillMapper,
public void submit(PurchaseBillDto dto) {
String sid = saveOrUpdateDto(dto);
baseMapper.updateState(sid,"1");
baseMapper.updateState(sid, "1");
//保存操作日志
PurchaseFlowNodeDto purchaseFlowNodeDto = new PurchaseFlowNodeDto();
purchaseFlowNodeDto.setBillSid(sid);
@@ -310,8 +314,8 @@ public class PurchaseBillService extends MybatisBaseService<PurchaseBillMapper,
return rb.success();
}
public void examine(String sid,String state,String remarks) {
baseMapper.updateState(sid,state);
public void examine(String sid, String state, String remarks) {
baseMapper.updateState(sid, state);
PurchaseBill purchaseBill = fetchBySid(sid);
//保存操作日志
PurchaseFlowNodeDto purchaseFlowNodeDto = new PurchaseFlowNodeDto();

6
src/main/java/com/yxt/purchase/biz/purchasebillbatch/PurchaseBillBatchDetailsVo.java
View File

@@ -61,12 +61,10 @@ public class PurchaseBillBatchDetailsVo implements Vo {
private String sortNo; // 序列号
@ApiModelProperty("批次号")
private String batchNumber; // 批次号
@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
@ApiModelProperty("生产日期")
private Date madeDate; // 生产日期
@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
private String madeDate; // 生产日期
@ApiModelProperty("过期日期")
private Date expireDate; // 过期日期
private String expireDate; // 过期日期
@ApiModelProperty("货号")
private String goodsNum; // 货号

6
src/main/java/com/yxt/purchase/biz/purchasebillbatch/PurchaseBillBatchDto.java
View File

@@ -61,12 +61,10 @@ public class PurchaseBillBatchDto implements Dto {
private String sortNo; // 序列号
@ApiModelProperty("批次号")
private String batchNumber; // 批次号
@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
@ApiModelProperty("生产日期")
private Date madeDate; // 生产日期
@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
private String madeDate; // 生产日期
@ApiModelProperty("过期日期")
private Date expireDate; // 过期日期
private String expireDate; // 过期日期
@ApiModelProperty("货号")
private String goodsNum; // 货号

10
src/main/java/com/yxt/purchase/biz/purchasebilldetail/PurchaseBillDetailDetailsVo.java
View File

@@ -92,9 +92,8 @@ public class PurchaseBillDetailDetailsVo implements Vo {
private BigDecimal amount; // 采购金额
@ApiModelProperty("采购周期")
private Integer cycle; // 采购周期
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
@ApiModelProperty("预期到货日期")
private Date deliveryDate; // 预期到货日期
private String deliveryDate;
@ApiModelProperty("总税额")
private BigDecimal taxAmount;
@@ -110,4 +109,11 @@ public class PurchaseBillDetailDetailsVo implements Vo {
private BigDecimal unTaxPrice;
@ApiModelProperty("未含税总价（未含税价*采购数量）")
private BigDecimal unTaxTotalAmount;
@ApiModelProperty("批次号")
private String batchNumber; // 批次号
@ApiModelProperty("生产日期")
private String madeDate; // 生产日期
@ApiModelProperty("过期日期")
private String expireDate; // 过期日期
}

10
src/main/java/com/yxt/purchase/biz/purchasebilldetail/PurchaseBillDetailDto.java
View File

@@ -93,9 +93,8 @@ public class PurchaseBillDetailDto implements Dto {
private BigDecimal amount; // 采购金额
@ApiModelProperty("采购周期")
private Integer cycle; // 采购周期
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
@ApiModelProperty("预期到货日期")
private Date deliveryDate; // 预期到货日期
private String deliveryDate;
@ApiModelProperty("总税额")
private BigDecimal taxAmount;
@@ -111,4 +110,11 @@ public class PurchaseBillDetailDto implements Dto {
private BigDecimal unTaxPrice;
@ApiModelProperty("未含税总价（未含税价*采购数量）")
private BigDecimal unTaxTotalAmount;
@ApiModelProperty("批次号")
private String batchNumber; // 批次号
@ApiModelProperty("生产日期")
private String madeDate; // 生产日期
@ApiModelProperty("过期日期")
private String expireDate; // 过期日期
}

10
src/main/java/com/yxt/purchase/biz/purchasebilldetail/PurchaseBillDetailMapper.xml
View File

@@ -16,10 +16,10 @@
pdd.amount,
pdd.warehouseName,
pdd.unit
FROM pms_purchase_bill_detail pdd
LEFT JOIN pms_purchaseback_bill ppb
FROM purchase_bill_detail pdd
LEFT JOIN purchaseback_bill ppb
ON pdd.billSid = ppb.sourceBillSid
LEFT JOIN pms_purchaseback_detail ppd
LEFT JOIN purchaseback_detail ppd
ON ppb.sid = ppd.billSid
<where> ${ew.sqlSegment} </where>
</select>
@@ -34,8 +34,8 @@
pdd.amount,
IFNULL(ppd.backCount,0) AS retreatCount,
ppd.backAmount
FROM pms_purchase_bill_detail pdd
LEFT JOIN pms_purchaseback_bill ppb
FROM purchase_bill_detail pdd
LEFT JOIN purchaseback_bill ppb
ON pdd.billSid = ppb.sourceBillSid
LEFT JOIN pms_purchaseback_detail ppd
ON ppb.sid = ppd.billSid

4
src/main/java/com/yxt/purchase/biz/purchasebillinvoice/PurchaseBillInvoiceMapper.java
View File

@@ -33,9 +33,9 @@ import org.apache.ibatis.annotations.Select;
@Mapper
public interface PurchaseBillInvoiceMapper extends BaseMapper<PurchaseBillInvoice> {
@Delete("delete from pms_purchase_bill_invoice where billSid = #{dtoSid}")
@Delete("delete from purchase_bill_invoice where billSid = #{dtoSid}")
void delByMainSid(String dtoSid);
@Select("select * from pms_purchase_bill_invoice where billSid = #{sid}")
@Select("select * from purchase_bill_invoice where billSid = #{sid}")
PurchaseBillInvoiceDetailsVo selByMainSid(String sid);
}