Quellcode durchsuchen

新增采购单状态未录入的异常处理

hejq vor 8 Jahren
Ursprung
Commit
06c2c06598

+ 4 - 29
src/main/java/com/uas/platform/b2b/controller/SaleOrderController.java

@@ -1,7 +1,6 @@
 package com.uas.platform.b2b.controller;
 package com.uas.platform.b2b.controller;
 
 
 import com.alibaba.dubbo.common.utils.CollectionUtils;
 import com.alibaba.dubbo.common.utils.CollectionUtils;
-import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.JSONObject;
 import com.uas.platform.b2b.dao.PurchaseOrderAllDao;
 import com.uas.platform.b2b.dao.PurchaseOrderAllDao;
 import com.uas.platform.b2b.dao.PurchaseOrderDoneDao;
 import com.uas.platform.b2b.dao.PurchaseOrderDoneDao;
@@ -38,7 +37,10 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;
 import org.springframework.web.servlet.ModelAndView;
 
 
 import java.text.SimpleDateFormat;
 import java.text.SimpleDateFormat;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 
 /**
 /**
  * 卖家对订单的操作
  * 卖家对订单的操作
@@ -416,33 +418,6 @@ public class SaleOrderController {
 		return searchService.searchPurchaseWaitingOrderIds(keyword, pageParams);
 		return searchService.searchPurchaseWaitingOrderIds(keyword, pageParams);
 	}
 	}
 
 
-    //    /**
-//     * @param params
-//     * @param searchFilter
-//     * @author yujia 获取待发货的订单 - 搜索
-//     */
-//    @RequestMapping(value = "/test", method = RequestMethod.GET)
-//    @ResponseBody
-//    public SPage<SaleOrderForProd> getSaleOrderItems(PageParams params, String searchFilter) {
-//        logger.log("客户采购单", "查看收到的客户采购订单列表(包括采购明细)(待交货)");
-//        purchaseOrderAllDao.setDisplayStatus(SystemSession.getUser().getUserUU(),
-//                SystemSession.getUser().getEnterprise().getUu(), OrderType.sale.name());
-//        PageInfo pageInfo = new PageInfo(params);
-//        SearchFilter filter = JSONObject.parseObject(searchFilter, SearchFilter.class);
-//        filter = new SearchFilter();
-//        SearchFilter distribute = userService.distribute();
-//        if (distribute != null && distribute.getDistribute() == null) {
-//            return null;
-//        }
-//        if (distribute != null && !CollectionUtils.isEmpty(distribute.getDistribute())) {
-//            filter.setDistribute(distribute.getDistribute());
-//        }
-//        filter.setKeyword("C0100010026");
-//        System.out.println(JSON.toJSON(filter));
-//        SPage<SaleOrderForProd> orders = purchaseOrderService.findOrderItemsByPageInfo(pageInfo, filter);
-//        return orders;
-//    }
-
 	/**
 	/**
 	 * 作为卖家,收到的采购订单(含明细)
 	 * 作为卖家,收到的采购订单(含明细)
 	 * 
 	 * 

+ 7 - 14
src/main/java/com/uas/platform/b2b/model/PurchaseOrderAllItem.java

@@ -1,18 +1,11 @@
 package com.uas.platform.b2b.model;
 package com.uas.platform.b2b.model;
 
 
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import javax.persistence.*;
-
-import com.uas.platform.b2b.core.util.StringUtil;
+import com.alibaba.fastjson.annotation.JSONField;
 import org.apache.axis.utils.StringUtils;
 import org.apache.axis.utils.StringUtils;
 import org.codehaus.jackson.annotate.JsonIgnore;
 import org.codehaus.jackson.annotate.JsonIgnore;
 
 
-import com.alibaba.fastjson.annotation.JSONField;
+import javax.persistence.*;
+import java.util.*;
 
 
 @Table(name = "purc$orderitems")
 @Table(name = "purc$orderitems")
 @Entity
 @Entity
@@ -124,25 +117,25 @@ public class PurchaseOrderAllItem {
 	/**
 	/**
 	 * 处理状态(已回复、未回复),全部回复后改为已回复
 	 * 处理状态(已回复、未回复),全部回复后改为已回复
 	 */
 	 */
-	@Column(name = "pd_status", insertable = false, updatable = false)
+	@Column(name = "pd_status")
 	private Short status;
 	private Short status;
 
 
 	/**
 	/**
 	 * 含税金额
 	 * 含税金额
 	 */
 	 */
-	@Column(name = "pd_amount", insertable = false, updatable = false)
+	@Column(name = "pd_amount")
 	private Double amount;
 	private Double amount;
 
 
 	/**
 	/**
 	 * 不含税单价
 	 * 不含税单价
 	 */
 	 */
-	@Column(name = "pd_notaxprice", insertable = false, updatable = false)
+	@Column(name = "pd_notaxprice")
 	private Double noTaxPrice;
 	private Double noTaxPrice;
 
 
 	/**
 	/**
 	 * 不含税金额
 	 * 不含税金额
 	 */
 	 */
-	@Column(name = "pd_notaxamount", insertable = false, updatable = false)
+	@Column(name = "pd_notaxamount")
 	private Double noTaxAmount;
 	private Double noTaxAmount;
 
 
 	/**
 	/**