提交保存

blade-service-api/blade-stock-api/src/main/java/org/springblade/stock/entity/StockGoods.java

@@ -233,7 +233,7 @@ public class StockGoods implements Serializable {
 	/**
 	 * 规格
 	 */
-		@ApiModelProperty(value = "规格")
+		@ApiModelProperty(value = "负荷指数")
 		private String typenoOne;
 	/**
 	 * 供应商名称
@@ -309,6 +309,8 @@ public class StockGoods implements Serializable {
 	private String stockName;
 
 	private String tradeType;
+    //速级
+	private String typenoTwo;
 
 
 

blade-service/blade-deliver-goods/src/main/java/org/springblade/deliver/goods/tool/JdyTool.java

@@ -80,6 +80,26 @@ public class JdyTool
 		return getVoucherResponse.getData();
 	}
 
+	public static List<checkitementry> testGetCheckitementryList(String token,String accountId,String groupName,String number)
+	{
+		String url="http://api.kingdee.com/jdy/gl/account_detail?access_token="+token;
+		HttpRequest httpRequest = new HttpRequest(url,"POST");
+		httpRequest.header("accountId",accountId);
+		httpRequest.header("groupName",groupName);
+		httpRequest.header("Content-Type","application/json");
+		JSONObject data = new JSONObject();
+		data.put("number",number);//科目的编码
+		httpRequest.send(data.toJSONString());
+		String body = httpRequest.body().toString();
+
+		//获取返回对象
+		accountDetailResponse  accountDetailResponse = JSONObject.parseObject(body, accountDetailResponse.class);
+		List<checkitementry> checkitementryList = accountDetailResponse.data.checkitementry;
+		return checkitementryList;
+	}
+
+
+
     @Data
 	public static class JDYSaveResponse implements Serializable
 	{
@@ -167,7 +187,33 @@ public class JdyTool
 		private String voucherno;
 	}
 
+	@Data
+	public static class accountDetailResponse implements Serializable
+	{
+		private accountDetail data;
+		private String  success;
+	}
+
+	@Data
+	public static class accountDetail implements Serializable
+	{
+		private  String name;
+		private  String number;
+		private  List<checkitementry> checkitementry;
+	}
 
+	@Data
+	public static class checkitementry implements Serializable
+	{
+		private String asstactitem_id;
+		private String bd_auxinfo_type_id;
+		private String asstactitem_name;
+		private String id;
+		private String isrequire;
+		private String type;
+		private String seq;
+		private String asstactitem_number;
+	}
 
 
 }

blade-service/blade-project/src/main/java/org/springblade/project/controller/ProjectController.java

@@ -70,8 +70,30 @@ public class ProjectController {
 	)
 	{
 		LambdaQueryWrapper<ServiceProject> serviceProjectLambdaQueryWrapper = new LambdaQueryWrapper<>();
-		serviceProjectLambdaQueryWrapper
-			.between(StringUtils.isNotBlank(createStartDate)&&StringUtils.isNotBlank(createEndDate),ServiceProject::getCreateTime,createStartDate,createEndDate)
+			//只显示未结算的
+			if(flag==2)
+			{
+				LambdaQueryWrapper<ServiceProjectItem> lambdaQueryWrapper=new LambdaQueryWrapper<>();
+				lambdaQueryWrapper
+					.eq(ServiceProjectItem::getStatus,0)
+					.eq(ServiceProjectItem::getIsDeleted,0);
+				List<ServiceProjectItem> list = serviceProjectItemService.list(lambdaQueryWrapper);
+				//如果等于空,直接返回
+                if(CollectionUtils.isEmpty(list))
+                {
+                return R.data(null);
+				}
+				//不为空
+                else
+				{
+					List<Long> ids = list.stream().map(ServiceProjectItem::getPId).collect(Collectors.toList());
+					serviceProjectLambdaQueryWrapper.in(ServiceProject::getId,ids);
+				}
+
+			}
+
+
+		serviceProjectLambdaQueryWrapper.between(StringUtils.isNotBlank(createStartDate)&&StringUtils.isNotBlank(createEndDate),ServiceProject::getCreateTime,createStartDate,createEndDate)
 			.eq(ServiceProject::getTenantId, AuthUtil.getTenantId())
 			.like(StringUtils.isNotBlank(dutyName), ServiceProject::getDutyName, dutyName)
 			.like(StringUtils.isNotBlank(remark), ServiceProject::getRemark, remark)

blade-service/blade-stock/src/main/java/org/springblade/stock/service/impl/StockGoodsServiceImpl.java

@@ -150,6 +150,9 @@ public class StockGoodsServiceImpl extends ServiceImpl<StockGoodsMapper, StockGo
 				if (StringUtils.isNotBlank(goodsDesc.getData().getSpecsOne())){
 					stockGoods.setTypenoOne(goodsDesc.getData().getSpecsOne());
 				}
+				if (StringUtils.isNotBlank(goodsDesc.getData().getSpecsTwo())){
+					stockGoods.setTypenoTwo(goodsDesc.getData().getSpecsTwo());
+				}
 				if (StringUtils.isNotBlank(goodsDesc.getData().getPlaceProduction())){
 					stockGoods.setPlaceProduction(goodsDesc.getData().getPlaceProduction());
 				}

blade-service/trade-finance/src/main/java/org/springblade/finance/tool/JdyTool.java

@@ -70,6 +70,8 @@ public class JdyTool
 
 	}
 
+
+
     //测试-调用金蝶云官方测试数据的凭证列表
     public static String testGetVoucherList (String url,String accountId,String groupName)
 	{
@@ -88,6 +90,25 @@ public class JdyTool
 		return result.toJSONString();
 	}
 
+	public static List<checkitementry> testGetCheckitementryList(String token,String accountId,String groupName,String number)
+	{
+		String url="http://api.kingdee.com/jdy/gl/account_detail?access_token="+token;
+		HttpRequest httpRequest = new HttpRequest(url,"POST");
+		httpRequest.header("accountId",accountId);
+		httpRequest.header("groupName",groupName);
+		httpRequest.header("Content-Type","application/json");
+		JSONObject data = new JSONObject();
+		data.put("number",number);//科目的编码
+		httpRequest.send(data.toJSONString());
+		String body = httpRequest.body().toString();
+
+		//获取返回对象
+		accountDetailResponse  accountDetailResponse = JSONObject.parseObject(body, accountDetailResponse.class);
+		List<checkitementry> checkitementryList = accountDetailResponse.data.checkitementry;
+		return checkitementryList;
+	}
+
+
 	public static List<Employee> testGetEmployeeList(String token,String accountId,String groupName,String search)
 	{
 		String url="http://api.kingdee.com/jdy/basedata/emp_list?access_token="+token;
@@ -111,6 +132,7 @@ public class JdyTool
 	}
 
 
+
 	public static List<Customer> testGetCustomerList(String token,String accountId,String groupName,String search)
 	{
 		String url="http://api.kingdee.com/jdy/basedata/customer_list?access_token="+token;
@@ -379,6 +401,34 @@ public class JdyTool
 		private String id;
 	}
 
+	@Data
+	public static class accountDetailResponse implements Serializable
+	{
+		private accountDetail data;
+		private String  success;
+	}
+
+	@Data
+	public static class accountDetail implements Serializable
+	{
+		private  String name;
+		private  String number;
+		private  List<checkitementry> checkitementry;
+	}
+
+	@Data
+	public static class checkitementry implements Serializable
+	{
+		private String asstactitem_id;
+		private String bd_auxinfo_type_id;
+		private String asstactitem_name;
+		private String id;
+		private String isrequire;
+		private String type;
+		private String seq;
+		private String asstactitem_number;
+	}
+