修改 实时绑定界面

bgs-admin/src/main/resources/application-druid.yml

@@ -6,12 +6,12 @@ spring:
         druid:
             # 主库数据源
             master:
-#                url: jdbc:mysql://175.27.215.92:3306/bgs_wms_2024?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                url: jdbc:mysql://175.27.215.92:3306/bgs_wms_2024?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-#                username: root
-#                password: haiwei@123
-                url: jdbc:mysql://10.32.128.150:6606/bgs-rfid-track?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true
                 username: root
-                password: Haiwei@123 #150
+                password: haiwei@123
+#                url: jdbc:mysql://10.32.128.150:6606/bgs-rfid-track?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true
+#                username: root
+#                password: Haiwei@123 #150
             # 从库数据源
             slave:
                 # 从数据源开关/默认关闭

bgs-admin/src/main/resources/templates/base/LedgerInstant/LedgerInstant.html

@@ -20,13 +20,17 @@
                         </li>
                         <li class="select-time">
                             <label>绑定时间：</label>
-                                <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginCrateTime]"/>
+                            <input type="text" class="time-input" id="startTime" placeholder="开始时间"
+                                   name="params[beginCrateTime]"/>
                             <span>-</span>
-                                <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endCrateTime]"/>
+                            <input type="text" class="time-input" id="endTime" placeholder="结束时间"
+                                   name="params[endCrateTime]"/>
                         </li>
                         <li>
-                                <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
+                            <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i
-                                <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
+                                    class="fa fa-search"></i>&nbsp;搜索</a>
+                            <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i
+                                    class="fa fa-refresh"></i>&nbsp;重置</a>
                         </li>
                     </ul>
                 </div>
@@ -37,10 +41,12 @@
             <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="base:LedgerInstant:add">
                 <i class="fa fa-plus"></i> 添加
             </a>
-                <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="base:LedgerInstant:edit">
+            <a class="btn btn-primary single disabled" onclick="$.operate.edit()"
+               shiro:hasPermission="base:LedgerInstant:edit">
                 <i class="fa fa-edit"></i> 修改
             </a>
-                <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="base:LedgerInstant:remove">
+            <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()"
+               shiro:hasPermission="base:LedgerInstant:remove">
                 <i class="fa fa-remove"></i> 删除
             </a>
             <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="base:LedgerInstant:export">
@@ -83,6 +89,9 @@
                     title: '运单号'
                 },
                 {
+                    field: 'createBy',
+                    title: '绑定人'
+                }, {
                     field: 'crateTime',
                     title: '绑定时间'
                 },

bgs-system/src/main/java/com/bgs/system/service/impl/LedgerInstantBindingServiceImpl.java

@@ -44,9 +44,9 @@ public class LedgerInstantBindingServiceImpl implements ILedgerInstantBindingSer
     @Override
     public List<LedgerInstantBinding> selectLedgerInstantBindingList(LedgerInstantBinding ledgerInstantBinding)
     {
-        if(StringUtils.isEmpty(ledgerInstantBinding.getCargoFrameEpc())){
+        // if(StringUtils.isEmpty(ledgerInstantBinding.getCargoFrameEpc())){
-            return new ArrayList<LedgerInstantBinding>();
+        //     return new ArrayList<LedgerInstantBinding>();
-        }
+        // }
         return ledgerInstantBindingMapper.selectLedgerInstantBindingList(ledgerInstantBinding);
     }
 

bgs-system/src/main/resources/mapper/system/LedgerInstantBindingMapper.xml

@@ -11,6 +11,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="crateTime"    column="crate_time"    />
         <result property="locationCode"    column="location_code"    />
         <result property="basketCode"    column="basket_code"    />
+        <result property="createBy"    column="create_by"    />
     </resultMap>
 
     <sql id="selectLedgerInstantBindingVo">
@@ -18,9 +19,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
 
     <select id="selectLedgerInstantBindingList" parameterType="LedgerInstantBinding" resultMap="LedgerInstantBindingResult">
-        select t2.objid, t2.cargo_frame_epc, t1.basket_code, t3.location_code, t2.waybill_number, t2.crate_time
+        select t2.objid, t2.cargo_frame_epc, t1.basket_code, t3.location_code, t2.waybill_number, t2.crate_time,t2.create_by
         from base_basket_info t1
-        left join ledger_instant_binding t2 on t1.basket_epc = t2.cargo_frame_epc
+        right join ledger_instant_binding t2 on t1.basket_epc = t2.cargo_frame_epc
         left join base_location_info t3 on t1.basket_epc = t3.remark
         <where>
             <if test="cargoFrameEpc != null  and cargoFrameEpc != ''"> and t1.basket_code = #{cargoFrameEpc}</if>