From f36a3b517945953d8ab452b1b0ea7131faf3420a Mon Sep 17 00:00:00 2001
From: ZY <zc857179121@qq.com>
Date: 星期三, 07 八月 2024 12:54:52 +0800
Subject: [PATCH] 页面调整

---
 src/main/java/com/zy/asrs/entity/WaitPakinLog.java            |   16 +++++
 src/main/java/com/zy/asrs/entity/WaitPakin.java               |   13 ++++
 src/main/resources/mapper/ViewWorkInMapper.xml                |   22 +++---
 src/main/java/com/zy/asrs/entity/ViewStayTimeBean.java        |   38 ++++++++++++
 src/main/resources/mapper/ViewStayTimeMapper.xml              |    4 
 src/main/java/com/zy/asrs/entity/ViewWorkInBean.java          |   37 ++++++++++++
 src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java |    8 ++
 7 files changed, 125 insertions(+), 13 deletions(-)

diff --git a/src/main/java/com/zy/asrs/entity/ViewStayTimeBean.java b/src/main/java/com/zy/asrs/entity/ViewStayTimeBean.java
index 0a172e0..5b344b5 100644
--- a/src/main/java/com/zy/asrs/entity/ViewStayTimeBean.java
+++ b/src/main/java/com/zy/asrs/entity/ViewStayTimeBean.java
@@ -144,6 +144,44 @@
 	@ApiModelProperty(value= "澶囨敞")
 	private String memo;
 
+	/**
+	 * 璁㈠崟鍙�
+	 */
+	@TableField("out_order_no")
+	private String outOrderNo;
+
+	/**
+	 * 鐐夊彿\瀹㈡埛鍥惧彿
+	 */
+	@TableField("lu_hao")
+	private String luHao;
+
+	/**
+	 * 宸ュ崟鍙�
+	 */
+	@TableField("pg_no")
+	private String sPgNO;
+
+
+	private String temp1;
+
+
+	private String temp2;
+
+	private String temp3;
+
+	@TableField("i_no")
+	private Integer iNo;
+
+	@TableField("packing")
+	private String packing;
+
+	@TableField("ware_id")
+	private String wareId;
+
+	@TableField("ware_name")
+	private String wareName;
+
 	public String getModiUser$(){
 		UserService service = SpringUtils.getBean(UserService.class);
 		User user = service.selectById(this.modi_user);
diff --git a/src/main/java/com/zy/asrs/entity/ViewWorkInBean.java b/src/main/java/com/zy/asrs/entity/ViewWorkInBean.java
index 58187d0..68306cc 100644
--- a/src/main/java/com/zy/asrs/entity/ViewWorkInBean.java
+++ b/src/main/java/com/zy/asrs/entity/ViewWorkInBean.java
@@ -1,6 +1,7 @@
 package com.zy.asrs.entity;
 
 import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.annotations.TableName;
 import com.core.common.Cools;
 import com.core.common.SpringUtils;
 import com.zy.system.entity.User;
@@ -16,6 +17,7 @@
  * @author admin
  * @date 2018骞�11鏈�26鏃�
  */
+@TableName("asr_wrkin_view")
 @Data
 public class ViewWorkInBean {
 
@@ -155,10 +157,45 @@
 	@ApiModelProperty(value= "澶囨敞")
 	private String memo;
 
+	/**
+	 * 璁㈠崟鍙�
+	 */
+	@TableField("out_order_no")
 	private String outOrderNo;
 
+	/**
+	 * 鐐夊彿\瀹㈡埛鍥惧彿
+	 */
+	@TableField("lu_hao")
+	private String luHao;
+
+	/**
+	 * 宸ュ崟鍙�
+	 */
+	@TableField("pg_no")
 	private String sPgNO;
 
+
+	private String temp1;
+
+
+	private String temp2;
+
+	private String temp3;
+
+	@TableField("i_no")
+	private Integer iNo;
+
+	@TableField("packing")
+	private String packing;
+
+	@TableField("ware_id")
+	private String wareId;
+
+	@TableField("ware_name")
+	private String wareName;
+
+
 	public String getModiUser$(){
 		UserService service = SpringUtils.getBean(UserService.class);
 		User user = service.selectById(this.modi_user);
diff --git a/src/main/java/com/zy/asrs/entity/WaitPakin.java b/src/main/java/com/zy/asrs/entity/WaitPakin.java
index 21a45ed..dc1d4eb 100644
--- a/src/main/java/com/zy/asrs/entity/WaitPakin.java
+++ b/src/main/java/com/zy/asrs/entity/WaitPakin.java
@@ -151,6 +151,19 @@
 
     @ApiModelProperty(value= "澶囨敞")
     private String memo;
+    /**
+     * 璁㈠崟鍙�
+     */
+    @TableField("out_order_no")
+    private String outOrderNo;
+
+
+    /**
+     * 宸ュ崟鍙�
+     */
+    @TableField("pg_no")
+    private String sPgNO;
+
 
     public String getBeBatch$(){
         if (null == this.beBatch){ return null; }
diff --git a/src/main/java/com/zy/asrs/entity/WaitPakinLog.java b/src/main/java/com/zy/asrs/entity/WaitPakinLog.java
index 2d0e335..6da8e74 100644
--- a/src/main/java/com/zy/asrs/entity/WaitPakinLog.java
+++ b/src/main/java/com/zy/asrs/entity/WaitPakinLog.java
@@ -151,6 +151,22 @@
     @ApiModelProperty(value= "澶囨敞")
     private String memo;
 
+    /**
+     * 璁㈠崟鍙�
+     */
+    @TableField("out_order_no")
+    private String outOrderNo;
+
+
+    /**
+     * 宸ュ崟鍙�
+     */
+    @TableField("pg_no")
+    private String sPgNO;
+
+
+
+
     public String getBeBatch$(){
         if (null == this.beBatch){ return null; }
         switch (this.beBatch){
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 37ae3a6..57496a8 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -194,6 +194,14 @@
                 waitPakin.setAppeTime(now);
                 waitPakin.setModiUser(userId);
                 waitPakin.setModiTime(now);
+                OrderDetl orderDetl = orderDetlService.selectItem(order.getOrderNo(), waitPakin.getMatnr(), waitPakin.getBatch());
+                if (orderDetl == null) {
+                    orderDetl = orderDetlService.selectItem(order.getOrderNo(), waitPakin.getMatnr(), null);
+                }
+                if (orderDetl!=null){
+                    waitPakin.setSPgNO(orderDetl.getSPgNO());
+                    waitPakin.setOutOrderNo(orderDetl.getOutOrderNo());
+                }
                 if (!waitPakinService.insert(waitPakin)) {
                     throw new CoolException("淇濆瓨鍏ュ簱閫氱煡妗eけ璐�");
                 }
diff --git a/src/main/resources/mapper/ViewStayTimeMapper.xml b/src/main/resources/mapper/ViewStayTimeMapper.xml
index 2b01a4f..39f3e4e 100644
--- a/src/main/resources/mapper/ViewStayTimeMapper.xml
+++ b/src/main/resources/mapper/ViewStayTimeMapper.xml
@@ -42,7 +42,7 @@
 <!-- 鍒嗛〉鏌ヨ鎵�鏈変俊鎭� -->
 <select id="queryViewStayTimeList" parameterType="com.zy.asrs.entity.ViewStayTimeBean" resultType="com.zy.asrs.entity.ViewStayTimeBean">
 	select
-	*
+	*,out_order_no outOrderNo,pg_no sPgNO
 	from (
 		select
 		ROW_NUMBER() over (order by stay_time desc) as row
@@ -85,7 +85,7 @@
 <!-- 涓嶅垎椤垫煡璇㈡墍鏈変俊鎭紝鐢ㄤ簬excel瀵煎嚭 -->
 <select id="getViewStayTimeAll" parameterType="com.zy.asrs.entity.ViewStayTimeBean" resultType="com.zy.asrs.entity.ViewStayTimeBean">
 	select
-	*
+	*,out_order_no outOrderNo,pg_no sPgNO
 	from (
 		select
 		ROW_NUMBER() over (order by stay_time desc) as row
diff --git a/src/main/resources/mapper/ViewWorkInMapper.xml b/src/main/resources/mapper/ViewWorkInMapper.xml
index 6340944..3104cb0 100644
--- a/src/main/resources/mapper/ViewWorkInMapper.xml
+++ b/src/main/resources/mapper/ViewWorkInMapper.xml
@@ -94,7 +94,7 @@
 <!-- 鍒嗛〉鏌ヨ鎵�鏈変俊鎭� -->
 <select id="queryViewWorkInList" parameterType="com.zy.asrs.entity.ViewWorkInBean" resultType="com.zy.asrs.entity.ViewWorkInBean">
 	select
-	*
+	*,out_order_no outOrderNo,pg_no sPgNO
 	from (
 		select
 		ROW_NUMBER() OVER(Order by t.io_time desc) as row
@@ -132,17 +132,17 @@
 
 
 	select
-	*
+	*,out_order_no outOrderNo,pg_no sPgNO
 	from (
-		select
-		ROW_NUMBER() OVER(Order by t.io_time desc) as row
-		, *
-		from (
-			select *
-			from asr_wrkout_view
-			where 1=1
-			<include refid="viewWorkInConditionSql"></include>
-		) t
+	select
+	ROW_NUMBER() OVER(Order by t.io_time desc) as row
+	, *
+	from (
+	select *
+	from asr_wrkout_view
+	where 1=1
+	<include refid="viewWorkInConditionSql"></include>
+	) t
 	) a where 1=1 and a.row between ((#{pageNumber}-1)*#{pageSize}+1) and (#{pageNumber}*#{pageSize})
 
 </select>

--
Gitblit v1.9.1