diff --git a/src/main/java/com/yxt/purchase/apiadmin/PurchaseFlowNodeRest.java b/src/main/java/com/yxt/purchase/apiadmin/PurchaseFlowNodeRest.java index 676e97f..be21433 100644 --- a/src/main/java/com/yxt/purchase/apiadmin/PurchaseFlowNodeRest.java +++ b/src/main/java/com/yxt/purchase/apiadmin/PurchaseFlowNodeRest.java @@ -34,6 +34,8 @@ import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import java.util.List; + /** * Project: ss-purchase(采购单)
* File: PurchaseFlowNodeFeignFallback.java
@@ -55,11 +57,10 @@ public class PurchaseFlowNodeRest { @Autowired private PurchaseFlowNodeService purchaseFlowNodeService; - @ApiOperation("根据条件分页查询数据的列表") @PostMapping("/listPage") - public ResultBean> listPage(@RequestBody PagerQuery pq){ + public ResultBean> listPage(@RequestParam("sid") String sid){ ResultBean rb = ResultBean.fireFail(); - PagerVo pv = purchaseFlowNodeService.listPageVo(pq); + List pv = purchaseFlowNodeService.listPageVo(sid); return rb.success().setData(pv); } } diff --git a/src/main/java/com/yxt/purchase/biz/purchasebill/PurchaseBillService.java b/src/main/java/com/yxt/purchase/biz/purchasebill/PurchaseBillService.java index 8a4c155..d79f721 100644 --- a/src/main/java/com/yxt/purchase/biz/purchasebill/PurchaseBillService.java +++ b/src/main/java/com/yxt/purchase/biz/purchasebill/PurchaseBillService.java @@ -120,7 +120,7 @@ public class PurchaseBillService extends MybatisBaseService exlistPage(PagerQuery pq) { PurchaseBillQuery query = pq.getParams(); QueryWrapper qw = new QueryWrapper<>(); - qw.ne("state", "0"); + qw.ne("pb.state", "0"); if (StringUtils.isNotBlank(query.getSupplierSid())) { qw.eq("pb.supplierSid", query.getSupplierSid()); } @@ -174,6 +174,8 @@ public class PurchaseBillService extends MybatisBaseService1[提交]，提交"); purchaseFlowNodeService.insertByDto(purchaseFlowNodeDto); } @@ -287,6 +293,8 @@ public class PurchaseBillService extends MybatisBaseService purchaseBillDetailDetailsVos = purchaseBillDetailService.selByMainSid(sid); List purchaseBillBatchDetailsVos = purchaseBillBatchService.selByMainSid(sid); for (PurchaseBillDetailDetailsVo purchaseBillDetailDetailsVo : purchaseBillDetailDetailsVos) { + purchaseBillDetailDetailsVo.setCost1(purchaseBillDetailDetailsVo.getCost()); + purchaseBillDetailDetailsVo.setCount1(purchaseBillDetailDetailsVo.getCount()); String goodsImgUrl = purchaseBillDetailDetailsVo.getGoodsImgUrl(); goodsImgUrl = fileUploadComponent.getUrlPrefix() + goodsImgUrl; purchaseBillDetailDetailsVo.setGoodsImgUrl(goodsImgUrl); @@ -328,6 +336,8 @@ public class PurchaseBillService extends MybatisBaseService" + state + "[审核]，审核"); purchaseFlowNodeDto.setRemarks(remarks); purchaseFlowNodeService.insertByDto(purchaseFlowNodeDto); diff --git a/src/main/java/com/yxt/purchase/biz/purchasebill/PurchaseBillVo.java b/src/main/java/com/yxt/purchase/biz/purchasebill/PurchaseBillVo.java index 078e5b1..98b8408 100644 --- a/src/main/java/com/yxt/purchase/biz/purchasebill/PurchaseBillVo.java +++ b/src/main/java/com/yxt/purchase/biz/purchasebill/PurchaseBillVo.java @@ -52,7 +52,7 @@ public class PurchaseBillVo implements Vo { @ApiModelProperty("仓库名称") private String wareHouseName; @ApiModelProperty("收货状态value") - private Integer receiveStateValue; + private String receiveStateValue; @ApiModelProperty("商品总额") private String amountTotal; @ApiModelProperty("采购运费") @@ -78,7 +78,7 @@ public class PurchaseBillVo implements Vo { @ApiModelProperty("已发货数量") private BigDecimal deliveryCount; @ApiModelProperty("发货状态value") - private Integer deliveryStateValue; + private String deliveryStateValue; @ApiModelProperty("备注") private String remarks; @ApiModelProperty("制单人姓名") diff --git a/src/main/java/com/yxt/purchase/biz/purchasebillbatch/PurchaseBillBatchDetailsVo.java b/src/main/java/com/yxt/purchase/biz/purchasebillbatch/PurchaseBillBatchDetailsVo.java index 19548a6..f73a82c 100644 --- a/src/main/java/com/yxt/purchase/biz/purchasebillbatch/PurchaseBillBatchDetailsVo.java +++ b/src/main/java/com/yxt/purchase/biz/purchasebillbatch/PurchaseBillBatchDetailsVo.java @@ -62,9 +62,11 @@ public class PurchaseBillBatchDetailsVo implements Vo { @ApiModelProperty("批次号") private String batchNumber; // 批次号 @ApiModelProperty("生产日期") - private String madeDate; // 生产日期 + @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") + private Date madeDate; // 生产日期 @ApiModelProperty("过期日期") - private String expireDate; // 过期日期 + @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") + private Date expireDate; // 过期日期 @ApiModelProperty("货号") private String goodsNum; // 货号 diff --git a/src/main/java/com/yxt/purchase/biz/purchasebilldetail/PurchaseBillDetailDetailsVo.java b/src/main/java/com/yxt/purchase/biz/purchasebilldetail/PurchaseBillDetailDetailsVo.java index 0a7486d..341a89c 100644 --- a/src/main/java/com/yxt/purchase/biz/purchasebilldetail/PurchaseBillDetailDetailsVo.java +++ b/src/main/java/com/yxt/purchase/biz/purchasebilldetail/PurchaseBillDetailDetailsVo.java @@ -68,6 +68,10 @@ public class PurchaseBillDetailDetailsVo implements Vo { private BigDecimal cost; // 单价 @ApiModelProperty("数量") private BigDecimal count; + @ApiModelProperty("单价") + private BigDecimal cost1; // 单价 + @ApiModelProperty("数量") + private BigDecimal count1; @ApiModelProperty("数量(pcs)") private BigDecimal pcsCount; @ApiModelProperty("吊牌价") @@ -91,7 +95,8 @@ public class PurchaseBillDetailDetailsVo implements Vo { @ApiModelProperty("采购周期") private Integer cycle; @ApiModelProperty("预期到货日期") - private String deliveryDate; + @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") + private Date deliveryDate; @ApiModelProperty("总税额") private BigDecimal taxAmount; @@ -101,7 +106,9 @@ public class PurchaseBillDetailDetailsVo implements Vo { @ApiModelProperty("批次号") private String batchNumber; // 批次号 @ApiModelProperty("生产日期") - private String madeDate; // 生产日期 + @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") + private Date madeDate; // 生产日期 @ApiModelProperty("过期日期") - private String expireDate; // 过期日期 + @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") + private Date expireDate; // 过期日期 } \ No newline at end of file diff --git a/src/main/java/com/yxt/purchase/biz/purchaseflownode/PurchaseFlowNodeMapper.java b/src/main/java/com/yxt/purchase/biz/purchaseflownode/PurchaseFlowNodeMapper.java index 3604216..5c0a0fc 100644 --- a/src/main/java/com/yxt/purchase/biz/purchaseflownode/PurchaseFlowNodeMapper.java +++ b/src/main/java/com/yxt/purchase/biz/purchaseflownode/PurchaseFlowNodeMapper.java @@ -52,5 +52,6 @@ import java.util.List; @Mapper public interface PurchaseFlowNodeMapper extends BaseMapper { - IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); + @Select("select * from purchase_flow_node where billSid = #{sid}") + List selectPageVo(String sid); } \ No newline at end of file diff --git a/src/main/java/com/yxt/purchase/biz/purchaseflownode/PurchaseFlowNodeMapper.xml b/src/main/java/com/yxt/purchase/biz/purchaseflownode/PurchaseFlowNodeMapper.xml index 8963b17..9463398 100644 --- a/src/main/java/com/yxt/purchase/biz/purchaseflownode/PurchaseFlowNodeMapper.xml +++ b/src/main/java/com/yxt/purchase/biz/purchaseflownode/PurchaseFlowNodeMapper.xml @@ -3,10 +3,4 @@ - \ No newline at end of file diff --git a/src/main/java/com/yxt/purchase/biz/purchaseflownode/PurchaseFlowNodeService.java b/src/main/java/com/yxt/purchase/biz/purchaseflownode/PurchaseFlowNodeService.java index ed47f7b..ab96aca 100644 --- a/src/main/java/com/yxt/purchase/biz/purchaseflownode/PurchaseFlowNodeService.java +++ b/src/main/java/com/yxt/purchase/biz/purchaseflownode/PurchaseFlowNodeService.java @@ -36,6 +36,8 @@ import com.yxt.common.core.vo.PagerVo; import org.springframework.stereotype.Service; +import java.util.List; + /** * Project: ss-purchase(采购单)
* File: PurchaseFlowNodeService.java
@@ -52,13 +54,8 @@ import org.springframework.stereotype.Service; @Service public class PurchaseFlowNodeService extends MybatisBaseService { - public PagerVo listPageVo(PagerQuery pq) { - PurchaseFlowNodeQuery query = pq.getParams(); - QueryWrapper qw = new QueryWrapper<>(); - qw.eq("billSid", query.getBillSid()); - IPage page = PagerUtil.queryToPage(pq); - IPage pagging = baseMapper.selectPageVo(page, qw); - PagerVo p = PagerUtil.pageToVo(pagging, null); + public List listPageVo(String sid) { + List p = baseMapper.selectPageVo(sid); return p; }