采购单测试调试完成

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(采购单) <br/>
  * File: PurchaseFlowNodeFeignFallback.java <br/>
@@ -55,11 +57,10 @@ public class PurchaseFlowNodeRest {
 	@Autowired
 	private PurchaseFlowNodeService purchaseFlowNodeService;
 
-	@ApiOperation("根据条件分页查询数据的列表")
 	@PostMapping("/listPage")
-	public ResultBean<PagerVo<PurchaseFlowNodeVo>> listPage(@RequestBody PagerQuery<PurchaseFlowNodeQuery> pq){
+	public ResultBean<List<PurchaseFlowNodeVo>> listPage(@RequestParam("sid") String sid){
 		ResultBean rb = ResultBean.fireFail();
-		PagerVo<PurchaseFlowNodeVo> pv = purchaseFlowNodeService.listPageVo(pq);
+		List<PurchaseFlowNodeVo> pv = purchaseFlowNodeService.listPageVo(sid);
 		return rb.success().setData(pv);
 	}
 }

src/main/java/com/yxt/purchase/biz/purchasebill/PurchaseBillService.java

@@ -120,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("pb.state", "0");
         if (StringUtils.isNotBlank(query.getSupplierSid())) {
             qw.eq("pb.supplierSid", query.getSupplierSid());
         }
@@ -174,6 +174,8 @@ public class PurchaseBillService extends MybatisBaseService<PurchaseBillMapper,
             purchaseBillAmountService.insertByDto(purchaseBillAmount);
             //保存采购单扩展
             purchaseBillExtend.setBillSid(sid);
+            purchaseBillExtend.setDeliveryStateValue("未发货");
+            purchaseBillExtend.setReceiveStateValue("待提交");
             purchaseBillExtendService.insertByDto(purchaseBillExtend);
             //保存商品信息
             for (PurchaseBillDetailDto purchaseBillDetailDto : purchaseBillDetailList) {
@@ -203,6 +205,8 @@ public class PurchaseBillService extends MybatisBaseService<PurchaseBillMapper,
             PurchaseFlowNodeDto purchaseFlowNodeDto = new PurchaseFlowNodeDto();
             purchaseFlowNodeDto.setBillSid(sid);
             purchaseFlowNodeDto.setCreateByName(dto.getCreateByName());
+            purchaseFlowNodeDto.setNodeCode("01");
+            purchaseFlowNodeDto.setNodeName("新增");
             purchaseFlowNodeDto.setResult("成功");
             purchaseFlowNodeService.insertByDto(purchaseFlowNodeDto);
             return sid;
@@ -254,6 +258,8 @@ public class PurchaseBillService extends MybatisBaseService<PurchaseBillMapper,
             PurchaseFlowNodeDto purchaseFlowNodeDto = new PurchaseFlowNodeDto();
             purchaseFlowNodeDto.setBillSid(sid);
             purchaseFlowNodeDto.setCreateByName(purchaseBill.getCreateByName());
+            purchaseFlowNodeDto.setNodeCode("02");
+            purchaseFlowNodeDto.setNodeName("提交");
             purchaseFlowNodeDto.setResult("审核等级0->1[提交]，提交");
             purchaseFlowNodeService.insertByDto(purchaseFlowNodeDto);
         }
@@ -287,6 +293,8 @@ public class PurchaseBillService extends MybatisBaseService<PurchaseBillMapper,
         List<PurchaseBillDetailDetailsVo> purchaseBillDetailDetailsVos = purchaseBillDetailService.selByMainSid(sid);
         List<PurchaseBillBatchDetailsVo> 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<PurchaseBillMapper,
         PurchaseFlowNodeDto purchaseFlowNodeDto = new PurchaseFlowNodeDto();
         purchaseFlowNodeDto.setBillSid(sid);
         purchaseFlowNodeDto.setCreateByName(purchaseBill.getCreateByName());
+        purchaseFlowNodeDto.setNodeCode("03");
+        purchaseFlowNodeDto.setNodeName("审核");
         purchaseFlowNodeDto.setResult("审核等级1->" + state + "[审核]，审核");
         purchaseFlowNodeDto.setRemarks(remarks);
         purchaseFlowNodeService.insertByDto(purchaseFlowNodeDto);

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("制单人姓名")

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; // 货号
 

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; // 过期日期
 }

src/main/java/com/yxt/purchase/biz/purchaseflownode/PurchaseFlowNodeMapper.java

@@ -52,5 +52,6 @@ import java.util.List;
 @Mapper
 public interface PurchaseFlowNodeMapper extends BaseMapper<PurchaseFlowNode> {
 
-	IPage<PurchaseFlowNodeVo> selectPageVo(IPage<PurchaseFlowNode> page, @Param(Constants.WRAPPER) Wrapper<PurchaseFlowNode> qw);
+	@Select("select * from purchase_flow_node where billSid = #{sid}")
+	List<PurchaseFlowNodeVo> selectPageVo(String sid);
 }

src/main/java/com/yxt/purchase/biz/purchaseflownode/PurchaseFlowNodeMapper.xml

@@ -3,10 +3,4 @@
 <mapper namespace="com.yxt.purchase.biz.purchaseflownode.PurchaseFlowNodeMapper">
     <!--    <where> ${ew.sqlSegment} </where>-->
     <!--    ${ew.customSqlSegment} -->
-    <select id="selectPageVo" resultType="com.yxt.purchase.biz.purchaseflownode.PurchaseFlowNodeVo">
-        SELECT * FROM purchase_flow_node
-        <where>
-            ${ew.sqlSegment}
-        </where>
-    </select>
 </mapper>

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(采购单) <br/>
  * File: PurchaseFlowNodeService.java <br/>
@@ -52,13 +54,8 @@ import org.springframework.stereotype.Service;
 @Service
 public class PurchaseFlowNodeService extends MybatisBaseService<PurchaseFlowNodeMapper, PurchaseFlowNode> {
 
-    public PagerVo<PurchaseFlowNodeVo> listPageVo(PagerQuery<PurchaseFlowNodeQuery> pq) {
+    public List<PurchaseFlowNodeVo> listPageVo(String sid) {
-        PurchaseFlowNodeQuery query = pq.getParams();
+        List<PurchaseFlowNodeVo> p = baseMapper.selectPageVo(sid);
-        QueryWrapper<PurchaseFlowNode> qw = new QueryWrapper<>();
-        qw.eq("billSid", query.getBillSid());
-        IPage<PurchaseFlowNode> page = PagerUtil.queryToPage(pq);
-        IPage<PurchaseFlowNodeVo> pagging = baseMapper.selectPageVo(page, qw);
-        PagerVo<PurchaseFlowNodeVo> p = PagerUtil.pageToVo(pagging, null);
         return p;
     }