2022年10月10日 18:23

blade-service-api/blade-user-api/src/main/java/org/springblade/system/user/entity/User.java

@@ -95,5 +95,16 @@ public class User extends TenantEntity {
 	 * 顶级部门id
 	 */
 	private String deptPid;
-
+	/**
+	 * 开户行
+	 */
+	private String bankDeposit;
+	/**
+	 * 银行户头
+	 */
+	private String bankAccount;
+	/**
+	 * 报销人银行账号
+	 */
+	private String reimburseNumber;
 }

blade-service/blade-deliver-goods/src/main/java/org/springblade/deliver/goods/service/impl/DeliveryServiceImpl.java

@@ -171,6 +171,8 @@ public class DeliveryServiceImpl extends ServiceImpl<DeliveryMapper, Delivery> i
 					temp.setCreateFreightUser(AuthUtil.getUserName());
 					temp.setCreateFreightTime(new Date());
 					temp.setOrderStatus("待发货");
+					temp.setDeliverQuantity(BigDecimal.ZERO);
+					temp.setReceiveQuantity(BigDecimal.ZERO);
 					orderDescClient.updateOrder(temp);
 				} else {
 					Order orderTemp = new Order();
@@ -178,6 +180,8 @@ public class DeliveryServiceImpl extends ServiceImpl<DeliveryMapper, Delivery> i
 					orderTemp.setCreateFreight(1);
 					orderTemp.setCreateFreightUser(AuthUtil.getUserName());
 					orderTemp.setCreateFreightTime(new Date());
+					orderTemp.setDeliverQuantity(BigDecimal.ZERO);
+					orderTemp.setReceiveQuantity(BigDecimal.ZERO);
 					orderDescClient.updateOrder(orderTemp);
 				}
 			}

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/service/impl/OrderServiceImpl.java

@@ -553,6 +553,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 				selectById.setIfInvoice("否");
 				selectById.setBillType(order.getBillType());
 				selectById.setTradeType(order.getTradeType());
+				selectById.setCreateFreight(0);
 				if (order.getBusinesDate() == null) {
 					selectById.setBusinesDate(new Date());
 				}

blade-service/blade-user/src/main/java/org/springblade/system/user/mapper/UserMapper.xml

@@ -76,7 +76,10 @@
          SELECT
             id,
             name,
-            real_name as realName
+            real_name as realName,
+            bank_deposit as bankDeposit,
+            bank_account as bankAccount,
+            reimburse_number as reimburseNumber
         FROM
             blade_user
         WHERE