Sfoglia il codice sorgente

更新批量回复销售单的方法

hejq 7 anni fa
parent
commit
0ce367ed01

+ 0 - 35
src/main/java/com/uas/platform/b2b/controller/SaleInquiryMouldController.java

@@ -128,41 +128,6 @@ public class SaleInquiryMouldController {
 		return searchService.searchPurcInquiryMouldIds(keyword, pageParams);
 	}
 
-//	/**
-//	 * 作为卖家,收到的模具询价(已过期)
-//	 *
-//	 * @param params
-//	 * @return
-//	 */
-//	@RequestMapping(params = RequestState.END, method = RequestMethod.GET)
-//	@ResponseBody
-//	public SPage<PurchaseInquiryMould> getEndInquiryMould(PageParams params, String searchFilter) {
-//		logger.log("客户模具询价单", "查看收到的客户模具询价单列表(已过期)");
-//		JSONObject jsonObject = JSON.parseObject(searchFilter);
-//		String keyword = jsonObject.getString("keyword");
-//		com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, searchFilter);
-//		// 当前登录企业作为供应商
-//		pageParams.getFilters().put("im_venduu", SystemSession.getUser().getEnterprise().getUu());
-//		SearchFilter filter = userService.distribute();
-//		if (filter != null && filter.getDistribute() == null) {
-//			return null;
-//		}
-//		if (filter != null && !CollectionUtils.isEmpty(filter.getDistribute())) {
-//			List<Object> list = new ArrayList<>();
-//			for (Object object : filter.getDistribute()) {
-//				list.add(object);
-//			}
-//			pageParams.getFilters().put("im_enuu", new MultiValue(list, true));
-//		}
-//		pageParams.getFilters().put("im_status", Status.NOT_REPLY.value());
-//		pageParams.getFilters().put("im_overdue", Constant.YES);
-//		pageParams.getFilters().put("im_valid", Constant.YES);
-//		List<Sort> sortList = new ArrayList<>();
-//		sortList.add(new Sort("im_id", false, Type.LONG, new Long(1)));
-//		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
-//		return searchService.searchPurcInquiryMouldIds(keyword, pageParams);
-//	}
-
 	/**
 	 * 作为卖家,收到的模具询价(已报价)- 搜索
 	 * 

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

@@ -661,11 +661,11 @@ public class SaleOrderController {
 	 */
 	@RequestMapping(value = "/items/reply", method = RequestMethod.POST)
 	public ResponseEntity<String> replyOrderItems(Long date, @RequestBody String idString) {
-		List<PurchaseOrderReply> replies = purchaseOrderService.reply(idString.split(","), date);
-		for (PurchaseOrderReply reply : replies)
-			logger.log("客户采购单", "批量回复客户采购明细", reply.replyDescription(), reply.getOrderItem().getOrder().getCode(),
-					reply.getOrderItem().getId());
-//        purchaseOrderService.replyByBatch(idString, SystemSession.getUser().getUserName(), SystemSession.getUser().getIp(), SystemSession.getUser().getEnterprise().getUu(), SystemSession.getUser().getUserUU());
+//		List<PurchaseOrderReply> replies = purchaseOrderService.reply(idString.split(","), date);
+//		for (PurchaseOrderReply reply : replies)
+//			logger.log("客户采购单", "批量回复客户采购明细", reply.replyDescription(), reply.getOrderItem().getOrder().getCode(),
+//					reply.getOrderItem().getId());
+        purchaseOrderService.replyByBatch(idString, SystemSession.getUser().getUserName(), SystemSession.getUser().getIp(), SystemSession.getUser().getEnterprise().getUu(), SystemSession.getUser().getUserUU(), date);
 		return new ResponseEntity<String>(HttpStatus.OK);
 	}
 

+ 1 - 1
src/main/java/com/uas/platform/b2b/dao/PurchaseOrderItemDao.java

@@ -88,5 +88,5 @@ public interface PurchaseOrderItemDao extends JpaSpecificationExecutor<PurchaseO
 	 * @param useruu userUU
 	 */
     @Procedure(procedureName = "purc$reply_batch")
-    public void replyByBatch(String idString, String username, String userip, Long enuu, Long useruu);
+    public void replyByBatch(String idString, String username, String userip, Long enuu, Long useruu, Long batch_delivery);
 }

+ 1 - 1
src/main/java/com/uas/platform/b2b/service/PurchaseOrderService.java

@@ -405,7 +405,7 @@ public interface PurchaseOrderService {
      * @param enuu
      * @param useruu
      */
-    public void replyByBatch(String idString, String username, String userip, Long enuu, Long useruu);
+    public void replyByBatch(String idString, String username, String userip, Long enuu, Long useruu, Long date);
 
 	/**
 	 * 根据企业UU批量处理采购单明细中的物料转入供应商报价人个人物料

+ 2 - 2
src/main/java/com/uas/platform/b2b/service/impl/PurchaseOrderServiceImpl.java

@@ -970,8 +970,8 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService {
 	}
 
     @Override
-    public void replyByBatch(String idString, String username, String userip, Long enuu, Long useruu) {
-        purchaseOrderItemDao.replyByBatch(idString, username, userip, enuu, useruu);
+    public void replyByBatch(String idString, String username, String userip, Long enuu, Long useruu, Long date) {
+        purchaseOrderItemDao.replyByBatch(idString, username, userip, enuu, useruu, date);
     }
 
     @Override