Merge remote-tracking branch 'origin/master_0929' into master_0929

@@ -207,12 +207,6 @@ public class GetPurchaseOrderInfoBo extends BaseBo<PurchaseOrderInfo> {
     private String customerTier;
     private String customerTier;
 
 
     /**
     /**
-     * 总数量
-     */
-    @ApiModelProperty("总数量")
-    private String sumNumber;
-
-    /**
      * 撤销数量
      * 撤销数量
      */
      */
     @ApiModelProperty("撤销数量")
     @ApiModelProperty("撤销数量")

@@ -141,6 +141,9 @@ public class PurchaseOrderInfoServiceImpl extends BaseMpServiceImpl<PurchaseOrde
 
 
         PurchaseOrderInfo data = new PurchaseOrderInfo();
         PurchaseOrderInfo data = new PurchaseOrderInfo();
         data.setId(IdUtil.getId());
         data.setId(IdUtil.getId());
+        if (!StringUtil.isBlank(vo.getContractId())) {
+            data.setContractId(vo.getContractId());
+        }
         if (!StringUtil.isBlank(vo.getOrderNo())) {
         if (!StringUtil.isBlank(vo.getOrderNo())) {
             data.setOrderNo(vo.getOrderNo());
             data.setOrderNo(vo.getOrderNo());
         }
         }