From c6fb95d1be6057a569a3e2ba8c983c1de72c3264 Mon Sep 17 00:00:00 2001
From: mrzhssss <pro6@qq.com>
Date: 星期四, 17 三月 2022 09:19:58 +0800
Subject: [PATCH] #

---
 src/main/webapp/views/receiveDetl/receiveDetl.html                       |   39 +++++++++++--------
 src/main/java/zy/cloud/wms/manager/controller/ReceiveDetlController.java |    4 +-
 src/main/java/zy/cloud/wms/manager/entity/ReceiveDetl.java               |   29 ++++++++++----
 src/main/webapp/static/js/receiveDetl/receiveDetl.js                     |    2 
 src/main/java/zy/cloud/wms/manager/entity/Receive.java                   |    2 +
 5 files changed, 48 insertions(+), 28 deletions(-)

diff --git a/src/main/java/zy/cloud/wms/manager/controller/ReceiveDetlController.java b/src/main/java/zy/cloud/wms/manager/controller/ReceiveDetlController.java
index 10bc7c4..89685a7 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/ReceiveDetlController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/ReceiveDetlController.java
@@ -141,7 +141,7 @@
         /**
          * 鎺х涓庢暟鎹垵濮嬪寲
          */
-        if (Cools.isEmpty(putShelfDTO.getId(),putShelfDTO.getBatch(),putShelfDTO.getRemain(),putShelfDTO.getSelect())){
+        if (Cools.isEmpty(putShelfDTO.getId(),putShelfDTO.getRemain(),putShelfDTO.getSelect())){
             return R.error("杈撳叆鏁版嵁鏈夎,璇烽噸鏂拌緭鍏�");
         }
         Date date = new Date();
@@ -241,7 +241,7 @@
                 .eq("matnr", receiveDetl.getMatnr())
                 .eq("batch", receiveDetl.getBatch())
                 .eq("io_type", 1));
-        if (!Cools.isEmpty(receiveLogs)) {
+        if (Cools.isEmpty(receiveLogs)) {
             return R.error("鎵句笉鍒板叆搴撹褰�");
         }
         for (ReceiveLog receiveLog : receiveLogs) {
diff --git a/src/main/java/zy/cloud/wms/manager/entity/Receive.java b/src/main/java/zy/cloud/wms/manager/entity/Receive.java
index 65e4f83..09e69df 100644
--- a/src/main/java/zy/cloud/wms/manager/entity/Receive.java
+++ b/src/main/java/zy/cloud/wms/manager/entity/Receive.java
@@ -7,6 +7,7 @@
 import com.core.common.Cools;
 import com.core.common.SpringUtils;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 import zy.cloud.wms.manager.service.CstmrService;
 import zy.cloud.wms.manager.service.DocTypeService;
 import zy.cloud.wms.manager.service.ItemService;
@@ -20,6 +21,7 @@
 import java.text.SimpleDateFormat;
 import java.util.Date;
 
+@Data
 @TableName("man_receive")
 public class Receive implements Serializable {
 
diff --git a/src/main/java/zy/cloud/wms/manager/entity/ReceiveDetl.java b/src/main/java/zy/cloud/wms/manager/entity/ReceiveDetl.java
index 01777ee..544c36b 100644
--- a/src/main/java/zy/cloud/wms/manager/entity/ReceiveDetl.java
+++ b/src/main/java/zy/cloud/wms/manager/entity/ReceiveDetl.java
@@ -1,5 +1,6 @@
 package zy.cloud.wms.manager.entity;
 
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.core.common.Cools;import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiModelProperty;
 import com.baomidou.mybatisplus.annotations.TableField;
@@ -26,6 +27,7 @@
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiModelProperty;
 import com.core.common.SpringUtils;
+import zy.cloud.wms.manager.service.ReceiveService;
 import zy.cloud.wms.system.service.UserService;
 import zy.cloud.wms.system.entity.User;
 import java.text.SimpleDateFormat;
@@ -234,6 +236,17 @@
 //            null    // 澶囨敞
 //    );
 
+    public String getOrderId$(){
+        ReceiveService receiveService = SpringUtils.getBean(ReceiveService.class);
+        Receive receive = receiveService.selectOne(new EntityWrapper<Receive>()
+                .eq("id", orderId));
+        if (!Cools.isEmpty(receive)) {
+            return receive.getOrderNo();
+        }else {
+            return orderId + "";
+        }
+
+    }
     public Long getId() {
         return id;
     }
@@ -254,14 +267,14 @@
         return orderId;
     }
 
-    public String getOrderId$(){
-        OrderService service = SpringUtils.getBean(OrderService.class);
-        Order order = service.selectById(this.orderId);
-        if (!Cools.isEmpty(order)){
-            return String.valueOf(order.getId());
-        }
-        return null;
-    }
+//    public String getOrderId$(){
+//        OrderService service = SpringUtils.getBean(OrderService.class);
+//        Order order = service.selectById(this.orderId);
+//        if (!Cools.isEmpty(order)){
+//            return String.valueOf(order.getId());
+//        }
+//        return null;
+//    }
 
     public String getState$(){
         if (this.inQty == 0){
diff --git a/src/main/webapp/static/js/receiveDetl/receiveDetl.js b/src/main/webapp/static/js/receiveDetl/receiveDetl.js
index 46ba744..0efd159 100644
--- a/src/main/webapp/static/js/receiveDetl/receiveDetl.js
+++ b/src/main/webapp/static/js/receiveDetl/receiveDetl.js
@@ -25,7 +25,7 @@
             {type: 'checkbox'}
             ,{field: 'id', align: 'center',title: 'ID', hide:true}
             ,{field: 'hostId', align: 'center',title: '', hide:true}
-            ,{field: 'orderId$', align: 'center',title: '璁㈠崟鍐呯爜', width: 100}
+            ,{field: 'orderId$', align: 'center',title: '璁㈠崟', width: 185}
             ,{field: 'anfme', align: 'center',title: '搴斿叆搴撻噺', width: 100}
             ,{field: 'inQty', align: 'center',title: '宸插叆搴撻噺', width: 100}
             ,{field: 'matnr', align: 'center',title: '鍟嗗搧缂栫爜'}
diff --git a/src/main/webapp/views/receiveDetl/receiveDetl.html b/src/main/webapp/views/receiveDetl/receiveDetl.html
index 2dd6569..8797b58 100644
--- a/src/main/webapp/views/receiveDetl/receiveDetl.html
+++ b/src/main/webapp/views/receiveDetl/receiveDetl.html
@@ -10,6 +10,7 @@
     <link rel="stylesheet" href="../../static/css/admin.css?v=318" media="all">
     <link rel="stylesheet" href="../../static/css/cool.css" media="all">
     <link rel="stylesheet" href="../../static/css/common.css" media="all">
+
 </head>
 <body>
 
@@ -97,6 +98,16 @@
             <div class="layui-col-md6">
                 <div class="layui-form-item">
                     <label class="layui-form-label">
+                        鎵瑰彿:
+                    </label>
+                    <div class="layui-input-block">
+                        <input type="text" class="layui-input"  name="batch" placeholder="璇ヨ鍗曟棤鎵瑰彿" disabled>
+                    </div>
+                </div>
+            </div>
+            <div class="layui-col-md6">
+                <div class="layui-form-item">
+                    <label class="layui-form-label">
                         搴斿叆搴撻噺:
                     </label>
                     <div class="layui-input-block">
@@ -104,29 +115,20 @@
                     </div>
                 </div>
             </div>
+
             <div class="layui-col-md6">
                 <div class="layui-form-item">
-                    <label class="layui-form-label">
-                        宸插叆搴撻噺:
+                    <label class="layui-form-label layui-form-required" >
+                        鏈鍏ュ簱:
                     </label>
                     <div class="layui-input-block">
-                        <input class="layui-input" name="inQty" disabled>
+                        <input type="number" class="layui-input"  name="remain" placeholder="璇疯緭鍏�"  lay-vertype="tips" required>
                     </div>
                 </div>
             </div>
             <div class="layui-col-md6">
                 <div class="layui-form-item">
-                    <label class="layui-form-label">
-                        鏈鍏ュ簱閲�:
-                    </label>
-                    <div class="layui-input-block">
-                        <input type="number" class="layui-input"  name="remain" placeholder="璇疯緭鍏�" required>
-                    </div>
-                </div>
-            </div>
-            <div class="layui-col-md6">
-                <div class="layui-form-item">
-                    <label class="layui-form-label">
+                    <label class="layui-form-label layui-form-required">
                         鍏ュ簱浣嶇疆:
                     </label>
                     <div class="layui-input-block">
@@ -135,17 +137,20 @@
                     </div>
                 </div>
             </div>
+
             <div class="layui-col-md6">
                 <div class="layui-form-item">
                     <label class="layui-form-label">
-                        鎵瑰彿:
+                        宸插叆搴撻噺:
+                        <span>
+
+                        </span>
                     </label>
                     <div class="layui-input-block">
-                        <input type="text" class="layui-input"  name="batch" placeholder="璇疯緭鍏�" required>
+                        <input class="layui-input" name="inQty" disabled>
                     </div>
                 </div>
             </div>
-
             <hr class="layui-bg-gray">
             <div class="layui-form-item text-right">
 <!--                <button class="layui-btn" lay-filter="recommendIn" lay-submit="">鑷姩鍏ュ簱</button>-->

--
Gitblit v1.9.1