修改库存提交

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

@@ -308,6 +308,8 @@ public class StockGoods implements Serializable {
 	@TableField(exist = false)
 	private String stockName;
 
+	private String tradeType;
+
 
 
 }

blade-service/blade-client/src/main/java/org/springblade/client/message/controller/MessageController.java

@@ -25,6 +25,7 @@ import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import lombok.AllArgsConstructor;
 import javax.validation.Valid;
 
+import org.springblade.client.dto.UnReadDTO;
 import org.springblade.client.entity.Message;
 import org.springblade.client.message.service.IMessageService;
 import org.springblade.client.vo.MessageVO;
@@ -59,9 +60,21 @@ public class MessageController extends BladeController {
 	@ApiOperation(value = "详情", notes = "传入message")
 	public R<Message> detail(Message message) {
 		Message detail = messageService.getOne(Condition.getQueryWrapper(message));
+		detail.setIsRead(1);
+		messageService.updateById(detail);
 		return R.data(detail);
 	}
 
+    //备用接口: socket辅助接口, 防止socket掉线
+	@GetMapping("/getUserMessage")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "详情", notes = "传入message")
+	public String getUserMessage()
+	{
+		UnReadDTO readDTO = messageService.getUserMessage(AuthUtil.getUserId());
+		return readDTO.toString();
+	}
+
 	/**
 	 * 分页
 	 */
@@ -72,7 +85,10 @@ public class MessageController extends BladeController {
 		LambdaQueryWrapper<Message> messageLambdaQueryWrapper=new LambdaQueryWrapper<>();
 		messageLambdaQueryWrapper
 			.like(Message::getToUserId, AuthUtil.getUserId())
-			.eq(Message::getTenantId,AuthUtil.getTenantId());
+			.eq(Message::getTenantId,AuthUtil.getTenantId())
+		     .orderByDesc(Message::getCreateTime)
+		         .orderByAsc(Message::getIsRead)
+		;
 		IPage<Message> pages = messageService.page(Condition.getPage(query), messageLambdaQueryWrapper);
 		return R.data(pages);
 	}

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

@@ -491,16 +491,22 @@ public class DeliveryItemsServiceImpl extends ServiceImpl<DeliveryItemsMapper, D
 			stockGoods.setOutVolumn(new BigDecimal(0.00));//出库码单重量
 			stockGoods.setLockingVolumn(new BigDecimal(0.00));//锁定码单重量
 			stockGoods.setBalanceVolumn(deliveryItems.getBillWeight());//结余码单重量
+
+			stockGoods.setTradeType("JK");
 		}
 		//国内
 		else if(tradeType.equals(OrderTypeEnum.DOMESTIC.getType()))
 		{
+			stockGoods.setCorpId(corpId);
+			stockGoods.setStorageId(storageId);
 			stockGoods.setItemType(deliveryItems.getSpecificationAndModel());//规格明细
-
+			stockGoods.setTradeType("GN");
+            //商品 规格 供应商 仓库
 		}
 		//出口
 		else if(tradeType.equals(OrderTypeEnum.EXPORT.getType()))
 		{
+			stockGoods.setTradeType("CK");
 			stockGoods.setItemType(deliveryItems.getSpecificationAndModel());//规格明细
 		}
 		stockGoods.setCreateUser(SecureUtil.getUserId());

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

@@ -295,15 +295,18 @@ public class DeliveryServiceImpl extends ServiceImpl<DeliveryMapper, Delivery> i
 				/*	model.setCorpId(delivery.getCorpId());*/
 					model.setStorageId(delivery.getStorageId());//仓库
 					model.setContractNumber(e.getContractNumber());//采购订单号
+					model.setTradeType("JK");
 				}
 				else if(delivery.getTradeType().equals("CK"))
 				{
-
+					model.setTradeType("CK");
 					model.setItemType(e.getSpecificationAndModel());
 				}
 				else if(delivery.getTradeType().equals("GN"))
 				{
-
+					model.setTradeType("GN");
+					model.setCorpId(delivery.getCorpId());
+					model.setStorageId(delivery.getStorageId());//仓库
 					model.setItemType(e.getSpecificationAndModel());
 				}
 				else