From e2ac14937662f7f79f6e0622aa06538ee9d13c4c Mon Sep 17 00:00:00 2001 From: icewint Date: Wed, 5 Mar 2025 09:32:18 +0800 Subject: [PATCH] =?UTF-8?q?pms=E5=87=BA=E5=BA=93=E5=8D=95=E8=A1=A8?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=AE=B0=E5=BD=95=E5=8F=B7=E4=BD=9C=E4=B8=BA?= =?UTF-8?q?=E4=B8=BB=E9=94=AE=EF=BC=9B=E6=B7=BB=E5=8A=A0=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E8=B5=8B=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/controller/app/AppPmsController.java | 2 ++ .../com/ruoyi/app/domain/AppPmsOrderOut.java | 16 ++++++++++++--- .../app/mapper/AppPmsOrderOutMapper.java | 12 +++++------ .../mapper/app/AppPmsOrderOutMapper.xml | 20 +++++++++++-------- 4 files changed, 33 insertions(+), 17 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppPmsController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppPmsController.java index 42a97a29..339c0c74 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppPmsController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppPmsController.java @@ -115,12 +115,14 @@ public class AppPmsController extends BaseController { return error("出库单号重复。"); } AppPmsOrderOut appPmsOrderOut = new AppPmsOrderOut(); + appPmsOrderOut.setRecordId(UUID.randomUUID().toString()); appPmsOrderOut.setListId(orderOutRequest.getListId()); appPmsOrderOut.setOrderType(Long.valueOf(orderOutRequest.getOrderType())); appPmsOrderOut.setCustomerId(orderOutRequest.getCustomerId()); appPmsOrderOut.setGoodsId(orderOutRequest.getGoodsId()); appPmsOrderOut.setGoodsNum(BigDecimal.valueOf(orderOutRequest.getGoodsNum())); appPmsOrderOut.setGoodsDesc(orderOutRequest.getGoodsDesc()); + appPmsOrderOut.setOrderStatus(0); appPmsOrderOut.setCreateTime(new Date()); appPmsOrderOut.setUpdateTime(new Date()); insertRow += appPmsOrderOutService.insertAppPmsOrderOut(appPmsOrderOut); diff --git a/ruoyi-system/src/main/java/com/ruoyi/app/domain/AppPmsOrderOut.java b/ruoyi-system/src/main/java/com/ruoyi/app/domain/AppPmsOrderOut.java index 7c46206b..ebbf5844 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/app/domain/AppPmsOrderOut.java +++ b/ruoyi-system/src/main/java/com/ruoyi/app/domain/AppPmsOrderOut.java @@ -16,6 +16,16 @@ public class AppPmsOrderOut extends BaseEntity { private static final long serialVersionUID = 1L; + private String recordId; + + public String getRecordId() { + return recordId; + } + + public void setRecordId(String recordId) { + this.recordId = recordId; + } + /** 出库单号 */ private String listId; @@ -48,7 +58,7 @@ public class AppPmsOrderOut extends BaseEntity private String spare2; @Excel(name = "订单状态") - private String orderStatus; + private Integer orderStatus; public void setListId(String listId) { @@ -123,11 +133,11 @@ public class AppPmsOrderOut extends BaseEntity return spare2; } - public String getOrderStatus() { + public Integer getOrderStatus() { return orderStatus; } - public void setOrderStatus(String orderStatus) { + public void setOrderStatus(Integer orderStatus) { this.orderStatus = orderStatus; } diff --git a/ruoyi-system/src/main/java/com/ruoyi/app/mapper/AppPmsOrderOutMapper.java b/ruoyi-system/src/main/java/com/ruoyi/app/mapper/AppPmsOrderOutMapper.java index 5e73ef12..21075c0d 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/app/mapper/AppPmsOrderOutMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/app/mapper/AppPmsOrderOutMapper.java @@ -15,10 +15,10 @@ public interface AppPmsOrderOutMapper /** * 查询【请填写功能名称】 * - * @param listId 【请填写功能名称】主键 + * @param recordId 【请填写功能名称】主键 * @return 【请填写功能名称】 */ - public AppPmsOrderOut selectAppPmsOrderOutByListId(String listId); + public AppPmsOrderOut selectAppPmsOrderOutByListId(String recordId); /** * 查询【请填写功能名称】列表 @@ -47,16 +47,16 @@ public interface AppPmsOrderOutMapper /** * 删除【请填写功能名称】 * - * @param listId 【请填写功能名称】主键 + * @param recordId 【请填写功能名称】主键 * @return 结果 */ - public int deleteAppPmsOrderOutByListId(String listId); + public int deleteAppPmsOrderOutByListId(String recordId); /** * 批量删除【请填写功能名称】 * - * @param listIds 需要删除的数据主键集合 + * @param recordIds 需要删除的数据主键集合 * @return 结果 */ - public int deleteAppPmsOrderOutByListIds(String[] listIds); + public int deleteAppPmsOrderOutByListIds(String[] recordIds); } diff --git a/ruoyi-system/src/main/resources/mapper/app/AppPmsOrderOutMapper.xml b/ruoyi-system/src/main/resources/mapper/app/AppPmsOrderOutMapper.xml index 792b3ce1..7ae54287 100644 --- a/ruoyi-system/src/main/resources/mapper/app/AppPmsOrderOutMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/app/AppPmsOrderOutMapper.xml @@ -5,6 +5,7 @@ + @@ -16,7 +17,7 @@ - select list_id, order_type, customer_id, goods_id, goods_num, goods_desc, spare1, spare2 from app_pms_order_out + select record_id, list_id, order_type, customer_id, goods_id, goods_num, goods_desc, spare1, spare2 from app_pms_order_out - where list_id = #{listId} + where record_id = #{recordId} insert into app_pms_order_out + record_id, list_id, order_type, customer_id, @@ -51,6 +53,7 @@ order_status, + #{recordId}, #{listId}, #{orderType}, #{customerId}, @@ -66,6 +69,7 @@ update app_pms_order_out + list_id = #{listId}, order_type = #{orderType}, customer_id = #{customerId}, goods_id = #{goodsId}, @@ -74,17 +78,17 @@ spare1 = #{spare1}, spare2 = #{spare2}, - where list_id = #{listId} + where record_id = #{recordId} - delete from app_pms_order_out where list_id = #{listId} + delete from app_pms_order_out where record_id = #{recordId} - delete from app_pms_order_out where list_id in - - #{listId} + delete from app_pms_order_out where record_id in + + #{recordId} - \ No newline at end of file +