2023年1月29 17:45

blade-service-api/blade-client-api/src/main/java/org/springblade/client/entity/CorpsDesc.java

@@ -459,5 +459,10 @@ public class CorpsDesc implements Serializable {
 	@TableField(exist = false)
 	private String billType;
 
+	/**
+	 * 期初金额
+	 */
+	@ApiModelProperty("期初金额")
+	private BigDecimal openingAmount;
 
 }

blade-service-api/blade-client-api/src/main/java/org/springblade/client/feign/IWechatClient.java

@@ -42,7 +42,7 @@ public interface IWechatClient {
 	 * 中标推送消息
 	 */
 	@GetMapping(BID_WINNING_PUSH)
-	String bidWinningPush(@RequestParam("unionId") String unionId,
+	String bidWinningPush(@RequestParam("openid") String openid,
 					@RequestParam("contractNo") String contractNo,
 					@RequestParam("departureHarbor") String departureHarbor,
 					@RequestParam("objectiveHarbor") String objectiveHarbor,

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

@@ -177,7 +177,8 @@ public class DeliveryServiceImpl extends ServiceImpl<DeliveryMapper, Delivery> i
 					temp.setCreateFreight(1);
 					temp.setCreateFreightUser(AuthUtil.getUserName());
 					temp.setCreateFreightTime(new Date());
-					temp.setOrderStatus("待发货");
+					temp.setOrderStatus("未完成");
+					temp.setReceivingStatus("待收货");
 					temp.setDeliverQuantity(BigDecimal.ZERO);
 					temp.setReceiveQuantity(BigDecimal.ZERO);
 					orderDescClient.updateOrder(temp);
@@ -411,13 +412,16 @@ public class DeliveryServiceImpl extends ServiceImpl<DeliveryMapper, Delivery> i
 				delivery.setFreightQuantity(delivery.getTotalQuantity());
 				delivery.setFreightTime(date);
 				delivery.setFreightUser(AuthUtil.getUserName());
-
-				orderTemp.setOrderStatus("完成");
+				if("681169".equals(AuthUtil.getTenantId())){
+					orderTemp.setReceivingStatus("已收货");
+				}else{
+					orderTemp.setOrderStatus("已完成");
+				}
 				orderTemp.setDeliverQuantity(delivery.getTotalQuantity());
 				orderTemp.setDeliverTime(date);
 			} else {
 				if("681169".equals(AuthUtil.getTenantId())){
-					orderTemp.setOrderStatus("待收货");
+					orderTemp.setReceivingStatus("已收货");
 				}else{
 					orderTemp.setOrderStatus("待发货");
 				}
@@ -497,10 +501,13 @@ public class DeliveryServiceImpl extends ServiceImpl<DeliveryMapper, Delivery> i
 			delivery.setArrivalTime(new Date());
 			baseMapper.updateById(delivery);
 
+			Order orderTemp = orderDescClient.getById(delivery.getOrgId());
 			if (DeliveryEnum.TAKE.getType().equals(delivery.getDeliveryType())) {
 				Order order = new Order();
 				order.setId(delivery.getOrgId());
-				order.setOrderStatus("已完成");
+				if (ObjectUtil.isNotEmpty(orderTemp.getPurchaseStatus()) && "已发货".equals(orderTemp.getPurchaseStatus())){
+					order.setOrderStatus("已完成");
+				}
 				order.setArrivalTime(delivery.getArrivalTime());
 				orderDescClient.updateOrder(order);
 			} else if (DeliveryEnum.REVOCATION.getType().equals(delivery.getDeliveryType())) {
@@ -792,7 +799,7 @@ public class DeliveryServiceImpl extends ServiceImpl<DeliveryMapper, Delivery> i
 		}
 
 		Date date = new Date();
-
+		Order orderStatus = orderDescClient.getById(select.getOrgId());
 		if("681169".equals(AuthUtil.getTenantId())){
 			delivery.setDeliveryStatus("已发货");
 			delivery.setFreightQuantity(select.getTotalQuantity());
@@ -802,7 +809,10 @@ public class DeliveryServiceImpl extends ServiceImpl<DeliveryMapper, Delivery> i
 
 			Order temp = new Order();
 			temp.setId(select.getOrgId());//销售主表id
-			temp.setOrderStatus("待收货");
+			if (ObjectUtil.isNotEmpty(orderStatus.getReceivingStatus()) && "已收货".equals(orderStatus.getReceivingStatus())){
+				temp.setOrderStatus("已完成");
+			}
+			temp.setPurchaseStatus("已发货");
 			temp.setCreateDeliver(1);
 			temp.setCreateDeliverUser(AuthUtil.getUserId().toString());
 			temp.setCreateDeliverTime(date);

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

@@ -247,7 +247,7 @@ public class BidingItemsServiceImpl extends ServiceImpl<BidingItemsMapper, Bidin
 				R<User> user = userClient.userInfoById(corpsAttn.getUserId());
 				if (ObjectUtil.isNotEmpty(user.getData())){
 					if (ObjectUtil.isNotEmpty(user.getData().getOaOpenId())){
-						wechatClient.bidWinningPush(user.getData().getUnionId(),biding.getContractNo(), departureHarbor, objectiveHarbor, boxTypeQuantity, offer);
+						wechatClient.bidWinningPush(user.getData().getOaOpenId(),biding.getContractNo(), departureHarbor, objectiveHarbor, boxTypeQuantity, offer);
 					}
 				}
 			});

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

@@ -837,7 +837,8 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 		temp.setCreatePurchase(1);
 		temp.setCreatePurchaseUser(AuthUtil.getUserName());
 		temp.setCreatePurchaseTime(new Date());
-		temp.setOrderStatus("待采购");
+		temp.setOrderStatus("未完成");
+		temp.setPurchaseStatus("待发货");
 		baseMapper.updateById(temp);
 		return R.data(order);
 	}

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

@@ -32,6 +32,7 @@ import org.springblade.client.entity.CorpsDesc;
 import org.springblade.client.entity.FeesDesc;
 import org.springblade.client.feign.ICorpsDescClient;
 import org.springblade.client.feign.IFeesDescClient;
+import org.springblade.common.annotation.RepeatSubmit;
 import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.excel.util.ExcelUtil;
 import org.springblade.core.mp.support.Condition;
@@ -333,6 +334,7 @@ public class SettlementController extends BladeController {
 	 */
 	@PostMapping("/apply")
 	@ApiOperationSupport(order = 8)
+	@RepeatSubmit
 	@ApiOperation(value = "请货款(收费/付费)", notes = "传入Finance_items")
 	public R apply(@RequestBody ApplyDTO dto) throws Exception {
 		if (CollectionUtils.isEmpty(dto.getItemsList())) {
@@ -346,6 +348,7 @@ public class SettlementController extends BladeController {
 	 */
 	@PostMapping("/applyList")
 	@ApiOperationSupport(order = 8)
+	@RepeatSubmit
 	@ApiOperation(value = "批量财务申请", notes = "传入Finance_items")
 	public R applyList(@RequestBody ApplyDTO dto) {
 		if (CollectionUtils.isEmpty(dto.getItemsList())) {
@@ -362,6 +365,7 @@ public class SettlementController extends BladeController {
 	@PostMapping("/check")
 	@ApiOperationSupport(order = 8)
 	@ApiOperation(value = "付款申请-清核", notes = "传入付款申请对象")
+	@RepeatSubmit
 	public R check(@RequestBody Settlement settlement) throws Exception {
 		settlementService.check(settlement);
 		R<Settlement> detail = this.detail(settlement);