From 1367d13c3e57d1ea15fb172be0f2089e41601cc5 Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期五, 12 十二月 2025 15:57:38 +0800
Subject: [PATCH] Merge branch 'jsxswms' of http://47.97.1.152:5880/r/zy-asrs into jsxswms
---
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 1 +
src/main/java/com/zy/asrs/entity/BasStationDetl.java | 2 +-
2 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/BasStationDetl.java b/src/main/java/com/zy/asrs/entity/BasStationDetl.java
index c9d117b..ea3c34d 100644
--- a/src/main/java/com/zy/asrs/entity/BasStationDetl.java
+++ b/src/main/java/com/zy/asrs/entity/BasStationDetl.java
@@ -32,7 +32,7 @@
private static final long serialVersionUID = 1L;
@ApiModelProperty(value= "")
- @TableId(value = "id", type = IdType.INPUT)
+ @TableId(value = "id", type = IdType.AUTO)
private Long id;
/**
diff --git a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
index a23997d..afa3d1e 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -1827,6 +1827,7 @@
Mat mat = matService.selectByMatnr(combMat.getMatnr());
BeanUtils.copyProperties(mat, basStationDetl);
basStationDetl
+ .setId(null)
.setOrderNo(orderPakin.getOrderNo())
.setDevNo(basStation.getDevNo())
.setBarcode(params.getTarBarcode())
--
Gitblit v1.9.1