销售计划明细查询更改

backend/xyst.dinas.project/src/main/java/com/xyst/dinas/project/dao/PurchaseSandCompanyDao.java

@@ -9,6 +9,6 @@ public interface PurchaseSandCompanyDao {
 	
 	KObject load(UUID id);
 
-	List<KObject> queryPurchaseSandCompanyByName(String name);
+	List<KObject> queryPurchaseSandCompanyByName(String name, UUID currentRegionalCompany);
 
 }

backend/xyst.dinas.project/src/main/java/com/xyst/dinas/project/internal/dao/PurchaseSandCompanyDaoImpl.java

@@ -11,6 +11,7 @@ import org.springframework.orm.hibernate5.HibernateCallback;
 import org.springframework.orm.hibernate5.HibernateOperations;
 
 import com.beecode.bcp.type.KObject;
+import com.xyst.dinas.biz.service.DinasOrganizationService;
 import com.xyst.dinas.project.constant.PurchaseSandCompanyConstant;
 import com.xyst.dinas.project.dao.PurchaseSandCompanyDao;
 
@@ -19,14 +20,17 @@ public class PurchaseSandCompanyDaoImpl implements PurchaseSandCompanyDao, Purch
 	@Autowired
 	private HibernateOperations template;
 	
+
+	
 	@Override
-	public List<KObject> queryPurchaseSandCompanyByName(String name) {
+	public List<KObject> queryPurchaseSandCompanyByName(String name, UUID currentRegionalCompany) {
 		return (List<KObject>)template.execute(new HibernateCallback<List<KObject>>() {
 			@SuppressWarnings("unchecked")
 			@Override
 			public List<KObject> doInHibernate(Session session) throws HibernateException {
-				Query<KObject> query = session.createQuery("from " + PURCHASE_SAND_COMPANY_NTITY + " where (discard is null or discard = 0) and name =:name", KObject.class);
+				Query<KObject> query = session.createQuery("from " + PURCHASE_SAND_COMPANY_NTITY + " where (discard is null or discard = 0) and name =:name and regionalCompany.id=:regionalCompany ", KObject.class);
 				query.setParameter("name", name);
+				query.setParameter("regionalCompany", currentRegionalCompany);
 				return query.getResultList();
 			}
 		});

backend/xyst.dinas.project/src/main/java/com/xyst/dinas/project/internal/service/PurchaseSandCompanyServiceImpl.java

 package com.xyst.dinas.project.internal.service;
 
 import java.util.List;
+import java.util.UUID;
 
 import org.springframework.beans.factory.annotation.Autowired;
 
 import com.beecode.bcp.type.KObject;
+import com.xyst.dinas.biz.service.DinasOrganizationService;
 import com.xyst.dinas.project.dao.ProjectFiledDao;
 import com.xyst.dinas.project.dao.PurchaseSandCompanyDao;
 import com.xyst.dinas.project.service.PurchaseSandCompanyService;
@@ -14,9 +16,13 @@ public class PurchaseSandCompanyServiceImpl implements PurchaseSandCompanyServic
 	@Autowired
 	private PurchaseSandCompanyDao purchaseSandCompanyDao;
 	
+	@Autowired
+	private DinasOrganizationService dinasOrganizationService;
+	
 	@Override
 	public Boolean verifyName(String name) {
-		List<KObject> list = purchaseSandCompanyDao.queryPurchaseSandCompanyByName(name);
+		UUID currentRegionalCompany = dinasOrganizationService.getCurrentRegionalCompanyId();
+		List<KObject> list = purchaseSandCompanyDao.queryPurchaseSandCompanyByName(name, currentRegionalCompany);
 		Boolean flag = false;
 		if (list != null && list.size() > 0 ) {
 			flag = true;

backend/xyst.dinas.sales/src/main/java/com/xyst/dinas/sales/dao/SalesPlanDao.java

@@ -5,6 +5,7 @@ import java.util.List;
 import java.util.UUID;
 
 import org.hibernate.query.Query;
+import org.json.JSONObject;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.lang.Nullable;
 import org.springframework.orm.hibernate5.HibernateTemplate;
@@ -94,14 +95,20 @@ public class SalesPlanDao {
 		update(kobject);
 	}
 
-	public List<KObject> querySalesPlanDetailsByMasterId(UUID salesPlanId) {
+	public List<KObject> querySalesPlanDetailsByMasterId(JSONObject jsonObject) {
         return template.execute(session ->{
-			String hql = "from " + SalesPlanConstant.ENTITY_DETAIL + " where master.id =:salesPlanId GROUP BY purchaseSandUnit.id, project.id, contract.id, id ";
-			Query<KObject> query = session.createQuery(hql, KObject.class);
-			query.setParameter("salesPlanId", salesPlanId);
+        	StringBuilder hql = new StringBuilder(" from " + SalesPlanConstant.ENTITY_DETAIL + " where master.id =:salesPlanId  ");
+			if (!jsonObject.isNull("purchaseSandUnitName")) {
+				hql.append(" and purchaseSandUnit.name =:purchaseSandUnitName ");
+			}
+			hql.append(" GROUP BY purchaseSandUnit.id, project.id, contract.id, id ");
+			Query<KObject> query = session.createQuery(hql.toString(), KObject.class);
+			query.setParameter("salesPlanId", UUID.fromString(jsonObject.getString("salesPlanId")));
+			if (!jsonObject.isNull("purchaseSandUnitName")) {
+				query.setParameter("purchaseSandUnitName", jsonObject.getString("purchaseSandUnitName"));
+			}
 			List<KObject> resultList = query.getResultList();
 			return resultList;
-		
 		});
 	}
 

backend/xyst.dinas.sales/src/main/java/com/xyst/dinas/sales/internal/service/SalesPlanServiceImpl.java

@@ -6,6 +6,7 @@ import java.util.UUID;
 
 import javax.transaction.Transactional;
 
+import org.json.JSONObject;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.lang.Nullable;
 
@@ -113,9 +114,10 @@ public class SalesPlanServiceImpl implements SalesPlanService{
 	}
 
 	@Override
-	public Object querySalesPlanDetailsByMasterId(UUID salesPlanId) {
+	public Object querySalesPlanDetailsByMasterId(JSONObject jsonObject) {
+		UUID salesPlanId = UUID.fromString(jsonObject.getString("salesPlanId"));
 		KObject kObject = salesPlanDao.load(salesPlanId);
-		List<KObject> details = salesPlanDao.querySalesPlanDetailsByMasterId(salesPlanId);
+		List<KObject> details = salesPlanDao.querySalesPlanDetailsByMasterId(jsonObject);
 		kObject.set("SalesPlanDetails", details);
 		return kObject;
 	}

backend/xyst.dinas.sales/src/main/java/com/xyst/dinas/sales/service/SalesPlanService.java

@@ -3,6 +3,7 @@ package com.xyst.dinas.sales.service;
 import java.util.List;
 import java.util.UUID;
 
+import org.json.JSONObject;
 import org.springframework.lang.Nullable;
 
 import com.beecode.bcp.type.KObject;
@@ -39,7 +40,7 @@ public interface SalesPlanService {
 	
 	public void approveSalesPlanForTemp(UUID id,int approveState,String approveMemo);
 
-	public Object querySalesPlanDetailsByMasterId(UUID fromString);
+	public Object querySalesPlanDetailsByMasterId(JSONObject jsonObject);
 
 	public Object querySalesPlanDetailsByMasterIdWarehouse(UUID fromString, UUID fromString2);
 	

backend/xyst.dinas.sales/src/main/java/com/xyst/dinas/sales/web/SalesPlanController.java

@@ -2,6 +2,7 @@ package com.xyst.dinas.sales.web;
 
 import java.util.UUID;
 
+import org.json.JSONObject;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.Assert;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -87,9 +88,10 @@ public class SalesPlanController {
 	 * @return
 	 */
 	@ResponseBody
-    @RequestMapping(value = "/salesplan/querySalesPlanDetailsByMasterId", method = RequestMethod.GET)
-    public Object querySalesPlanDetailsByMasterId(@RequestParam("saleaPlanId") String saleaPlanId) {
-		return ResponseObj.success("success", salesPlanService.querySalesPlanDetailsByMasterId(UUID.fromString(saleaPlanId)));
+    @RequestMapping(value = "/salesplan/querySalesPlanDetailsByMasterId", method = RequestMethod.POST)
+    public Object querySalesPlanDetailsByMasterId(@RequestBody String parameter) {
+		JSONObject jsonObject = new JSONObject(parameter);
+		return ResponseObj.success("success", salesPlanService.querySalesPlanDetailsByMasterId(jsonObject));
     }
 
 	/**