1.修复部分bug

src/main/java/com/glxp/udi/admin/dao/inout/UnitMaintainDao.java

@@ -14,8 +14,6 @@ public interface UnitMaintainDao extends BaseMapper<UnitMaintainEntity> {
 
     boolean insertUnitMaintain(UnitMaintainEntity unitMaintainEntity);
 
-    boolean deleteById(@Param("id") String id);
-
     boolean updateUnit(UnitMaintainEntity unitMaintainEntity);
 
     UnitMaintainEntity selectByName(@Param("name") String fromCorp);

src/main/java/com/glxp/udi/admin/dao/inout/WarehouseBussinessTypeDao.java

@@ -35,5 +35,7 @@ public interface WarehouseBussinessTypeDao extends BaseMapper<WarehouseBussiness
 
     Page<WarehouseBussinessTypeEntity> selectListByCode(Page<WarehouseBussinessTypeEntity> page, @Param("code") String code);
 
+    List<WarehouseBussinessTypeEntity> selectByCode(String code);
+
     void deleteByCode(@Param("code") String code);
 }

src/main/java/com/glxp/udi/admin/dao/inventory/InvStockPrintDao.java

@@ -26,8 +26,6 @@ public interface InvStockPrintDao extends BaseMapper<StockPrintEntity> {
 
     boolean updateStockPrint(StockPrintEntity udiInfoEntity);
 
-    boolean deleteById(@Param("id") String id);
-
     boolean deleteByGenKey(@Param("genKey") String genKey);
 
     boolean deleteByOrderId(@Param("sOrderId") String sOrderId);

src/main/java/com/glxp/udi/admin/entity/inout/UdiInfoEntity.java

@@ -84,6 +84,11 @@ public class UdiInfoEntity {
 
     private Boolean isDisable;
 
+    /**
+     * 第三方系统编码
+     */
+    private String thirdId;
+
     //本地生成信息
     @TableField(exist = false)
     private String batchNo;

src/main/java/com/glxp/udi/admin/service/auth/DeviceKeyService.java

@@ -33,8 +33,7 @@ public class DeviceKeyService  {
     public DeviceKeyEntity findDeviceByImei(String imei) {
         FilterDeviceKeyRequest filterDeviceKeyRequest = new FilterDeviceKeyRequest();
         filterDeviceKeyRequest.setImei(imei);
-        DeviceKeyEntity deviceKeyEntity = deviceKeyDao.findDeviceByImei(filterDeviceKeyRequest);
+        return deviceKeyDao.findDeviceByImei(filterDeviceKeyRequest);
-        return deviceKeyEntity;
     }
 
     public void insertDeviceKey(DeviceKeyEntity deviceKeyEntity) {

src/main/java/com/glxp/udi/admin/service/inout/UdiInfoService.java

@@ -105,6 +105,10 @@ public class UdiInfoService {
 
     public boolean updateUdiInfo(UdiInfoEntity udiInfoEntity) {
         udiInfoEntity.setLastUpdateTime(new Date());
+        if (StrUtil.isBlank(udiInfoEntity.getThirdId())) {
+            //当第三方系统编码为空时，置空此参数，更新时将此字段更新为null
+            udiInfoEntity.setThirdId("empty");
+        }
         return udiInfoDao.updateUdiInfo(udiInfoEntity);
     }
 

src/main/java/com/glxp/udi/admin/service/inout/UnitMaintainService.java

@@ -39,7 +39,8 @@ public class UnitMaintainService {
     }
 
     public boolean deleteById(String id) {
-        return unitMaintainDao.deleteById(id);
+        int i = unitMaintainDao.deleteById(id);
+        return i > 0;
     }
 
     public UnitMaintainEntity selectById(String id) {

src/main/java/com/glxp/udi/admin/service/inout/WarehouseBussinessTypeService.java

@@ -30,12 +30,11 @@ public class WarehouseBussinessTypeService {
      * @return
      */
     public List<WarehouseBussinessTypeEntity> getListByCode(String code) {
-        Page<WarehouseBussinessTypeEntity> page = new Page<>(-1, -1);
+        List<WarehouseBussinessTypeEntity> list = warehouseBussinessTypeDao.selectByCode(code);
-        Page<WarehouseBussinessTypeEntity> pageResult = warehouseBussinessTypeDao.selectListByCode(page, code);
+        if (CollUtil.isNotEmpty(list)) {
-        if (pageResult.getTotal() == 0) {
+            return list;
-            return Collections.emptyList();
         }
-        return pageResult.getRecords();
+        return Collections.emptyList();
     }
 
     /**

src/main/java/com/glxp/udi/admin/service/inventory/InvStockPrintService.java

@@ -51,7 +51,8 @@ public class InvStockPrintService {
     }
 
     public boolean deleteById(String id) {
-        return stockPrintDao.deleteById(id);
+        int i = stockPrintDao.deleteById(id);
+        return i > 0;
     }
 
 }

src/main/resources/mybatis/mapper/inout/UdiInfoDao.xml

@@ -174,6 +174,7 @@
             <if test="manufactory != null">manufactory=#{manufactory},</if>
             <if test="lastUpdateTime != null">lastUpdateTime=#{lastUpdateTime},</if>
             <if test="thirdId != null and thirdId != ''">thirdId=#{thirdId},</if>
+            <if test="thirdId == 'empty'">thirdId = null,</if>
         </set>
         WHERE id = #{id}
     </update>

src/main/resources/mybatis/mapper/inout/UnitMaintainDao.xml

@@ -40,10 +40,6 @@
                 #{mobile}, #{pinyinCode})
     </insert>
 
-    <delete id="deleteById" parameterType="Map">
-        DELETE FROM io_unit_maintain  WHERE id =  #{id}
-    </delete>
-
     <update id="updateUnit" parameterType="com.glxp.udi.admin.entity.inout.UnitMaintainEntity">
         UPDATE io_unit_maintain
         <set>

src/main/resources/mybatis/mapper/inout/WarehouseBussinessTypeDao.xml

@@ -237,6 +237,12 @@
                  inner join basic_bussiness_type on inv_warehouse_bussiness_type.action = basic_bussiness_type.action
         where code = #{code}
     </select>
+    <select id="selectByCode" resultType="com.glxp.udi.admin.entity.inout.WarehouseBussinessTypeEntity">
+        select inv_warehouse_bussiness_type.id, inv_warehouse_bussiness_type.code, inv_warehouse_bussiness_type.action, basic_bussiness_type.name
+        from inv_warehouse_bussiness_type
+                 inner join basic_bussiness_type on inv_warehouse_bussiness_type.action = basic_bussiness_type.action
+        where code = #{code}
+    </select>
 
     <delete id="deleteByCode">
         delete

src/main/resources/mybatis/mapper/inventory/InvStockPrintDao.xml

@@ -186,12 +186,6 @@
         </foreach>
     </insert>
 
-    <delete id="deleteById" parameterType="Map">
-        DELETE
-        FROM inv_stockprint
-        WHERE id = #{id}
-    </delete>
-
     <delete id="deleteByGenKey" parameterType="Map">
         DELETE
         FROM inv_stockprint