Merge branch 'develop' of gitlab.beecode.cn:kunlun/xyst_dinas/xyst_dinas_backend into develop

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

@@ -101,13 +101,16 @@ public class SalesPlanDao {
 	public List<KObject> querySalesPlanDetailsByMasterId(SaleaPlanDetailQuery saleaPlanDetailQuery) {
 		UUID salesPlanId = saleaPlanDetailQuery.getSalesPlanId();
 		String purchaseSandUnitName = saleaPlanDetailQuery.getPurchaseSandUnitName();
+		UUID stationId = saleaPlanDetailQuery.getStationId();
         return template.execute(session ->{
         	StringBuilder hql = new StringBuilder(" from " + SalesPlanConstant.ENTITY_DETAIL + " where master.id =:salesPlanId  ");
 			if (purchaseSandUnitName!=null) hql.append(" and purchaseSandUnit.name =:purchaseSandUnitName ");
-			hql.append(" GROUP BY purchaseSandUnit.id, project.id, contract.id, id ");
+			if (stationId !=null) hql.append(" and station.id =:stationId ");
+			hql.append(" GROUP BY purchaseSandUnit.id, contract.id, id ");
 			Query<KObject> query = session.createQuery(hql.toString(), KObject.class);
 			query.setParameter("salesPlanId", salesPlanId);
 			if (purchaseSandUnitName!=null) query.setParameter("purchaseSandUnitName", purchaseSandUnitName);
+			if (stationId != null) query.setParameter("stationId", stationId);
 			return query.getResultList();
 		});
 	}

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

@@ -215,14 +215,16 @@ public class InventoryServiceImpl implements InventoryService {
 		for(KObject i : inventory) {
 			businessObjectId.add(i.getUuid("id").toString());
 		}
-		List<KObject> logList = inventoryDao.queryLog(businessObjectId);
-		for(KObject log : logList) {
-			KObject operator = staffService.getById(log.getUuid("staffId"));
-			InventoryLog item = new InventoryLog();
-			item.setTime(format.format(log.getDate("time")));
-			item.setOperator(operator.getString("name"));
-			item.setContent(log.getString("logContent"));
-			result.add(item);
+		if(businessObjectId.size() > 0) {
+			List<KObject> logList = inventoryDao.queryLog(businessObjectId);
+			for(KObject log : logList) {
+				KObject operator = staffService.getById(log.getUuid("staffId"));
+				InventoryLog item = new InventoryLog();
+				item.setTime(format.format(log.getDate("time")));
+				item.setOperator(operator.getString("name"));
+				item.setContent(log.getString("logContent"));
+				result.add(item);
+			}
 		}
 		return result;
 	}

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

@@ -18,6 +18,7 @@ import org.springframework.lang.Nullable;
 import com.beecode.amino.core.Amino;
 import com.beecode.bap.staff.service.StaffService;
 import com.beecode.bap.workflow.core.BizProcessState;
+import com.beecode.bcp.core.context.AminoContextHolder;
 import com.beecode.bcp.type.KClass;
 import com.beecode.bcp.type.KObject;
 import com.beecode.bcp.type.Null;
@@ -179,7 +180,7 @@ public class SalesPlanServiceImpl implements SalesPlanService{
 			salesPlanDetail.setPurchaseSandUnit(purchaseSandUnit.getUuid(BaseConstants.ID));
 			salesPlanDetail.setContractName(contract.getString(ContractConstant.CONTRACT_NAME));
 			salesPlanDetail.setProjectName(project.getString(ProjectFiledConstant.PROJECT_NAME));
-			salesPlanDetail.setProjectTypeName(project.get(ProjectFiledConstant.PROJECT_TYPE).getString("name"));
+			salesPlanDetail.setProjectTypeName(project.get(ProjectFiledConstant.PROJECT_TYPE).getString("title"));
 			salesPlanDetail.setDinasTypeName(dinasType.getString(DinasTypeConstant.DINASTYPE_NAME));
 			salesPlanDetail.setPurchaseSandUnitName(purchaseSandUnit.getString(PurchaseSandCompanyConstant.NAME));
 			
@@ -229,7 +230,8 @@ public class SalesPlanServiceImpl implements SalesPlanService{
 		UUID salesPlanId = UUID.fromString(jsonObject.getString("id"));
 		KObject kObject = salesPlanDao.load(salesPlanId);
 		kObject.set("modifyTime", new Date());
-		kObject.set("modifier", staffService.getById(UUID.fromString(jsonObject.getString("modifier"))));
+		
+		kObject.set("modifier",  AminoContextHolder.getContext().getStaff());
 		//kObject.set("requiredTotalAmount", jsonObject.getBigDecimal("requiredTotalAmount"));
 		List<KObject> salesPlanDetails = kObject.get("SalesPlanDetails").toList();
 		JSONArray jsonArray = jsonObject.getJSONArray("salesPlanDetails");
@@ -242,10 +244,10 @@ public class SalesPlanServiceImpl implements SalesPlanService{
 				for (int i = 0; i < salesPlanDetails.size(); i++) {
 					KObject salesPlanDetail = salesPlanDetails.get(i);
 					if (jsonObjectDetails.getString("id").equals(salesPlanDetail.getString("id"))) {
-						if (StringUtils.isNotEmpty(jsonObjectDetails.getString("station"))) {
+						if (!jsonObjectDetails.isNull("station")) {
 							salesPlanDetail.set("station", stationService.getById(UUID.fromString(jsonObjectDetails.getString("station"))));
 						}
-						salesPlanDetail.set("stationName", jsonObjectDetails.getString("stationName"));
+						salesPlanDetail.set("stationName", jsonObjectDetails.isNull("stationName") ? "" : jsonObjectDetails.getString("stationName"));
 						salesPlanDetail.set("stockAmount", jsonObjectDetails.getDouble("stockAmount"));
 						salesPlanDetail.set("planAmount", jsonObjectDetails.getDouble("planAmount"));
 						salesPlanDao.update(salesPlanDetail);

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

@@ -119,11 +119,16 @@ public class SalesPlanController {
 	 * @param saleaPlanId
 	 * @return
 	 */
-	@ResponseBody
-    @RequestMapping(value = "/warehouse/api/salesplan/querySalesPlanDetailsByMasterId", method = RequestMethod.GET)
-    public Object querySalesPlanDetailsByMasterIdWarehouse(@RequestParam("saleaPlanId") String saleaPlanId, @RequestParam("stationId") String stationId) {
-		return ResponseObj.success("success", salesPlanService.querySalesPlanDetailsByMasterIdWarehouse(UUID.fromString(saleaPlanId), UUID.fromString(stationId)));
-    }
+	@PostMapping("/warehouse/api/salesplan/querySalesPlanDetails")
+	public Object querySalesPlanDetailsByWareHouse(@RequestBody SaleaPlanDetailQuery saleaPlanDetailQuery) {
+		Object object = salesPlanService.querySalesPlanDetails(saleaPlanDetailQuery);
+		return ResponseObj.success("success", object);
+	}
+//	@ResponseBody
+//    @RequestMapping(value = "/warehouse/api/salesplan/querySalesPlanDetailsByMasterId", method = RequestMethod.GET)
+//    public Object querySalesPlanDetailsByMasterIdWarehouse(@RequestParam("saleaPlanId") String saleaPlanId, @RequestParam("stationId") String stationId) {
+//		return ResponseObj.success("success", salesPlanService.querySalesPlanDetailsByMasterIdWarehouse(UUID.fromString(saleaPlanId), UUID.fromString(stationId)));
+//    }
 	
 	public static void main(String[] args) {
 		System.out.println(UUID.randomUUID().toString());
@@ -139,7 +144,8 @@ public class SalesPlanController {
 		try {
 			salesPlanService.modify(jsonObject);
 		} catch(Exception e) {
-			return ResponseObj.error(e.getMessage());
+			e.printStackTrace();
+			return ResponseObj.error("操作失败",null);
 		}
 		
 		return ResponseObj.success("操作成功",null);

backend/xyst.dinas.sales/src/main/java/com/xyst/dinas/sales/web/request/SaleaPlanDetailQuery.java

@@ -13,6 +13,8 @@ public class SaleaPlanDetailQuery implements Serializable{
 	
 	private String purchaseSandUnitName;
 	
+	private UUID stationId;
+	
 	public UUID getSalesPlanId() {
 		return salesPlanId;
 	}
@@ -25,6 +27,12 @@ public class SaleaPlanDetailQuery implements Serializable{
 	public void setPurchaseSandUnitName(String purchaseSandUnitName) {
 		this.purchaseSandUnitName = purchaseSandUnitName;
 	}
+	public UUID getStationId() {
+		return stationId;
+	}
+	public void setStationId(UUID stationId) {
+		this.stationId = stationId;
+	}