2022年10月9日17:07:54

blade-service-api/blade-client-api/pom.xml

@@ -29,6 +29,12 @@
             <version>2.8.2.RELEASE</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>org.springblade</groupId>
+            <artifactId>blade-mocha-item-api</artifactId>
+            <version>2.8.2.RELEASE</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
 

blade-service-api/blade-purchase-sales-api/src/main/java/org/springblade/purchase/sales/entity/Order.java

@@ -959,4 +959,10 @@ public class Order implements Serializable {
 	 */
 	@ApiModelProperty(value = "日期说明")
 	private String dateDesc;
+
+	/**
+	 * 日期条款
+	 */
+	@ApiModelProperty(value = "日期条款")
+	private String dateClause;
 }

blade-service-api/blade-purchase-sales-api/src/main/java/org/springblade/purchase/sales/entity/OrderItems.java

@@ -508,4 +508,10 @@ public class OrderItems implements Serializable {
 	 */
 	@ApiModelProperty(value = "毛重")
 	private BigDecimal grossWeight;
+
+	/**
+	 * 货物类型
+	 */
+	@ApiModelProperty(value = "货物类型")
+	private BigDecimal cargoType;
 }

blade-service/trade-finance/src/main/java/org/springblade/finance/controller/AccController.java

@@ -119,9 +119,9 @@ public class AccController extends BladeController {
 	public R<IPage<Acc>> list(Acc acc, Query query) {
 		LambdaQueryWrapper<Acc> accLambdaQueryWrapper = new LambdaQueryWrapper<>();
 		if (acc.getFlag() != null && acc.getFlag() == 1) {
-			accLambdaQueryWrapper.apply(" Amount >= Settlement_Amount");
+			accLambdaQueryWrapper.apply(" Amount > Settlement_Amount");
 		} else if (acc.getFlag() != null && acc.getFlag() == 2) {
-			accLambdaQueryWrapper.apply(" Amount >= Invoice_Amount");
+			accLambdaQueryWrapper.apply(" Amount > Invoice_Amount");
 		}
 		accLambdaQueryWrapper.between(StringUtils.isNotBlank(acc.getCreateStartDate()) && StringUtils.isNotBlank(acc.getCreateEndDate()), Acc::getCreateTime, acc.getCreateStartDate(), acc.getCreateEndDate())
 			.like(StringUtils.isNotBlank(acc.getBillType()), Acc::getBillType, acc.getBillType())
@@ -133,16 +133,13 @@ public class AccController extends BladeController {
 			.eq(acc.getCreateUser() != null, Acc::getCreateUser, acc.getCreateUser())
 			.eq(acc.getSrcParentId() != null, Acc::getSrcParentId, acc.getSrcParentId())
 			.eq(StringUtils.isNotBlank(acc.getDc()), Acc::getDc, acc.getDc());
-		if ("JTMC".equals(acc.getType())) {
-			accLambdaQueryWrapper.eq(Acc::getSettlementAmount, 0);
-		} else {
 			accLambdaQueryWrapper.gt(acc.getCheckStatus() != null && acc.getCheckStatus() == 1, Acc::getCheckAmount, 0)
 				.eq(acc.getCheckStatus() != null && acc.getCheckStatus() == 2, Acc::getCheckAmount, 0)
 				.gt(acc.getCheckStatus() != null && acc.getCheckStatus() == 1, Acc::getSettlementAmount, 0)
 				.eq(acc.getCheckStatus() != null && acc.getCheckStatus() == 2, Acc::getSettlementAmount, 0)
 				.gt(acc.getCheckStatus() != null && acc.getCheckStatus() == 1, Acc::getInvoiceAmount, 0)
 				.eq(acc.getCheckStatus() != null && acc.getCheckStatus() == 2, Acc::getInvoiceAmount, 0);
-		}
+
 		accLambdaQueryWrapper.eq(Acc::getTenantId, SecureUtil.getTenantId())
 			.eq(Acc::getIsDeleted, 0);
 		if (acc.getSettlementStatus() != null && acc.getSettlementStatus() == 1) {

blade-service/trade-purchase/src/main/java/com/trade/purchase/order/service/impl/OrderServiceImpl.java

@@ -1096,10 +1096,10 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 				orderItems.setCreateUser(AuthUtil.getUserId());
 				orderItems.setCreateUserName(AuthUtil.getUserName());
 				orderItems.setTenantId(AuthUtil.getTenantId());
-				orderItems.setBalanceMoney(orderItems.getStorageAmount());
-				orderItems.setBalanceNumber(orderItems.getStorageInQuantity());
+//				orderItems.setBalanceMoney(orderItems.getStorageAmount());
+//				orderItems.setBalanceNumber(orderItems.getStorageInQuantity());
 				orderItemsMapper.insert(orderItems);
-				balanceNumber = balanceNumber.add(orderItems.getStorageInQuantity());
+				balanceNumber = balanceNumber.add(orderItems.getBalanceNumber());
 				balanceMoney = balanceMoney.add(orderItems.getBalanceMoney());
 				goodsName.add(orderItems.getCname());
 			}
@@ -1179,8 +1179,8 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 				orderItems.setWarehouseId(submitDto.getStorageId());
 				orderItems.setPid(submitDto.getId());
 				orderItems.setTenantId(AuthUtil.getTenantId());
-				orderItems.setBalanceNumber(orderItems.getStorageInQuantity());//结余量
-				orderItems.setBalanceMoney(orderItems.getStorageAmount());//结余金额
+//				orderItems.setBalanceNumber(orderItems.getStorageInQuantity());//结余量
+//				orderItems.setBalanceMoney(orderItems.getStorageAmount());//结余金额
 				//判断明细id是否为空 true新增  false修改
 				if (ObjectUtils.isNotNull(orderItems.getId())) {
 					orderItems.setUpdateTime(new Date());
@@ -1193,7 +1193,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 					orderItems.setCreateUserName(AuthUtil.getUserName());
 					orderItemsMapper.insert(orderItems);
 				}
-				balanceNumber = balanceNumber.add(orderItems.getStorageInQuantity());
+				balanceNumber = balanceNumber.add(orderItems.getBalanceNumber());
 				balanceMoney = balanceMoney.add(orderItems.getBalanceMoney());
 				goodsName.add(orderItems.getCname());
 			}
@@ -1259,8 +1259,8 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 			for (OrderItems orderItems : orderItemsList) {
 				orderItems.setPid(submitDto.getId());
 				orderItems.setTenantId(AuthUtil.getTenantId());
-				orderItems.setBalanceNumber(orderItems.getStorageInQuantity());//结余量
-				orderItems.setBalanceMoney(orderItems.getStorageAmount());//结余金额
+//				orderItems.setBalanceNumber(orderItems.getStorageInQuantity());//结余量
+//				orderItems.setBalanceMoney(orderItems.getStorageAmount());//结余金额
 				orderItems.setPurchaserId(submitDto.getPurchaserId());
 				orderItems.setWarehouseId(submitDto.getStorageId());
 				List<OrderItems> orderItemsBillNo = new ArrayList<>();
@@ -1308,7 +1308,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 					orderItems.setCreateUserName(AuthUtil.getUserName());
 					orderItemsMapper.insert(orderItems);
 				}
-				balanceNumber = balanceNumber.add(orderItems.getStorageInQuantity());
+				balanceNumber = balanceNumber.add(orderItems.getBalanceNumber());
 				balanceMoney = balanceMoney.add(orderItems.getBalanceMoney());
 				goodsName.add(orderItems.getCname());
 			}