wms修改11

op-modules/op-wms/src/main/java/com/op/wms/controller/OdsProcureOutOrderController.java

@@ -2,6 +2,8 @@ package com.op.wms.controller;
 
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
+
+import com.op.common.core.utils.uuid.IdUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -39,7 +41,7 @@ public class OdsProcureOutOrderController extends BaseController {
 	@RequiresPermissions("wms:outorder:list")
 	@GetMapping("/list")
 	public TableDataInfo list(OdsProcureOutOrder odsProcureOutOrder) {
-//		startPage();
+		startPage();
 		List<OdsProcureOutOrder> list = odsProcureOutOrderService.selectOdsProcureOutOrderList(odsProcureOutOrder);
 		return getDataTable(list);
 	}
@@ -50,6 +52,7 @@ public class OdsProcureOutOrderController extends BaseController {
 		List<OdsProcureOutOrder> list = odsProcureOutOrderService.selectOdsProcureOutOrderListZU(odsProcureOutOrder);
 		for (OdsProcureOutOrder	odsProcureOutOrder1:
 				list) {
+			odsProcureOutOrder1.setID(IdUtils.fastSimpleUUID());
 			List<OdsProcureOutOrder>	orderList1=	odsProcureOutOrderService.selectOdsProcureOutOrderListZUTwo(odsProcureOutOrder1);
 			odsProcureOutOrder1.setList(orderList1);
 		}

op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOutOrderServiceImpl.java

@@ -94,12 +94,14 @@ public class OdsProcureOutOrderServiceImpl implements IOdsProcureOutOrderService
 	}
 
 	@Override
+	@DS("#header.poolName")
 	public List<OdsProcureOutOrder> selectOdsProcureOutOrderListZU(OdsProcureOutOrder odsProcureOutOrder) {
 
 		return odsProcureOutOrderMapper.selectOdsProcureOutOrderListZU(odsProcureOutOrder);
 	}
 
 	@Override
+	@DS("#header.poolName")
 	public List<OdsProcureOutOrder> selectOdsProcureOutOrderListZUTwo(OdsProcureOutOrder odsProcureOutOrder1) {
 		List<OdsProcureOutOrder>	orderList= odsProcureOutOrderMapper.selectOdsProcureOutOrderListZUT(odsProcureOutOrder1);
 		return orderList;