中继服务同步

api-admin/src/main/java/com/glxp/api/admin/controller/auth/LoginController.java

@@ -66,6 +66,9 @@ public class LoginController {
         if (!PasswordUtils.authAdminPwd(loginRequest.getPassword()).equals(authAdmin.getPassWord())) {
             throw new JsonException(ResultEnum.DATA_NOT, "用户名或密码错误");
         }
+        if (authAdmin.getUserFlag() == 0) {
+            throw new JsonException(ResultEnum.DATA_NOT, "该用户已被禁用！");
+        }
 
         // 更新登录状态
         AuthAdmin authAdminUp = new AuthAdmin();

api-admin/src/main/java/com/glxp/api/admin/controller/business/StockOrderDetailController.java

@@ -425,8 +425,10 @@ public class StockOrderDetailController {
             }
         }
         filterUdiInfoRequest.setDiType(1);
+        filterUdiInfoRequest.setIsDisable(false);
         CompanyProductRelevanceRequest companyProductRelevanceRequest = new CompanyProductRelevanceRequest();
         BeanUtils.copyProperties(filterUdiInfoRequest, companyProductRelevanceRequest);
+        companyProductRelevanceRequest.setIsDisable(false);
         List<CompanyProductRelevanceResponse> basicInstrumentMaintainRelevanceResponses = null;
         BussinessLocalTypeEntity bussinessTypeEntity = bussinessLocalTypeService.findBTByAction(filterUdiInfoRequest.getBillType());
         if (bussinessTypeEntity.getCorpType() == ConstantStatus.CORP_TYPE_OUT) {

api-admin/src/main/java/com/glxp/api/admin/req/basic/CompanyProductRelevanceRequest.java

@@ -17,7 +17,7 @@ public class CompanyProductRelevanceRequest extends ListPageRequest {
     private String thirdId2;
     private String thirdId3;
     private String thirdId4;
-
+    private Boolean isDisable;
 
     private String thirdCode;
     private String thirdSys;

api-admin/src/main/java/com/glxp/api/admin/req/basic/FilterUdiInfoRequest.java

@@ -27,7 +27,7 @@ public class FilterUdiInfoRequest extends ListPageRequest {
     private String zczbhhzbapzbh;
     private Integer diType;
 
-
+    private Boolean isDisable;
     private String unionCode;
     private String udiCode;
     private String thrPiId;

api-admin/src/main/java/com/glxp/api/admin/res/info/CompanyProductRelevanceResponse.java

@@ -33,7 +33,7 @@ public class CompanyProductRelevanceResponse {
     private String sydycpbs;
     private int versionNumber;
     private int diType;
-
+    private Boolean isDisable;
     private String thirdId1;
     private String thirdId2;
     private String thirdId3;

api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/BussinessTypeServiceImpl.java

@@ -135,6 +135,12 @@ public class BussinessTypeServiceImpl implements BussinessTypeService {
 
     @Override
     public boolean insertBussinessType(BussinessTypeEntity bussinessTypeEntity) {
+        if (!StrUtil.isEmpty(bussinessTypeEntity.getSupplementOrderType())){
+            BussinessTypeEntity correspondType = bussinessTypeDao.selectByAction(bussinessTypeEntity.getSupplementOrderType());
+            if (correspondType != null && correspondType.getCorpType() == 1) {
+                bussinessTypeDao.updateSupplementOrderType(bussinessTypeEntity.getSupplementOrderType(), bussinessTypeEntity.getAction());
+            }
+        }
         return bussinessTypeDao.insertBussinessType(bussinessTypeEntity);
     }
 

api-admin/src/main/resources/mybatis/mapper/basic/BussinessLocalTypeDao.xml

@@ -8,10 +8,10 @@
         SELECT * FROM basic_bustype_local
         <where>
             <if test="name != ''and name != null">
-                AND name LIKE concat(#{name},'%')
+                AND basic_bustype_local.name LIKE concat('%',#{name},'%')
             </if>
             <if test="action != ''and action != null">
-                AND action LIKE concat(#{action},'%')
+                AND action LIKE concat('%',#{action},'%')
             </if>
             <if test="originAction != ''and originAction != null">
                 AND originAction =#{originAction}
@@ -27,10 +27,10 @@
         <where>
             localAction is NULL
             <if test="name != ''and name != null">
-                AND name LIKE concat(#{name},'%')
+                AND basic_bustype_local.name LIKE concat('%',#{name},'%')
             </if>
             <if test="action != ''and action != null">
-                AND action LIKE concat(#{action},'%')
+                AND action LIKE concat('%',#{action},'%')
             </if>
             <if test="originAction != ''and originAction != null">
                 AND originAction =#{originAction}
@@ -51,10 +51,10 @@
         on basic_bustype_local.action = basic_bussiness_type.localAction
         <where>
             <if test="name != ''and name != null">
-                AND basic_bustype_local.name LIKE concat(#{name},'%')
+                AND basic_bustype_local.name LIKE concat('%',#{name},'%')
             </if>
             <if test="action != ''and action != null">
-                AND basic_bustype_local.action LIKE concat(#{action},'%')
+                AND basic_bustype_local.action LIKE concat('%',#{action},'%')
             </if>
             <if test="enabled != ''and enabled != null">
                 AND basic_bussiness_type.enable =#{enabled}
@@ -104,10 +104,10 @@
         INNER JOIN inv_warehouse_user on inv_warehouse.`code` =inv_warehouse_user.`code`
         <where>
             <if test="name != ''and name != null">
-                AND basic_bustype_local.name LIKE concat(#{name},'%')
+                AND basic_bustype_local.name LIKE concat('%',#{name},'%')
             </if>
             <if test="action != ''and action != null">
-                AND basic_bustype_local.action LIKE concat(#{action},'%')
+                AND basic_bustype_local.action LIKE concat('%',#{action},'%')
             </if>
             <if test="enabled != ''and enabled != null">
                 AND basic_bussiness_type.enable =#{enabled}
@@ -134,10 +134,10 @@
         LEFT JOIN basic_bussiness_type on basic_bussiness_type.localAction = basic_bustype_local.action
         <where>
             <if test="name != ''and name != null">
-                AND basic_bustype_local.name LIKE concat(#{name},'%')
+                AND basic_bustype_local.name LIKE concat('%',#{name},'%')
             </if>
             <if test="action != ''and action != null">
-                AND basic_bustype_local.action LIKE concat(#{action},'%')
+                AND basic_bustype_local.action LIKE concat('%',#{action},'%')
             </if>
             <if test="spUse != ''and spUse != null">
                 AND spUse =#{spUse}

api-admin/src/main/resources/mybatis/mapper/basic/BussinessTypeDao.xml

@@ -20,13 +20,13 @@
         on basic_bussiness_type.localAction = basic_bustype_local.action
         <where>
             <if test="name != ''and name != null">
-                AND basic_bussiness_type.name LIKE concat(#{name},'%')
+                AND basic_bussiness_type.name LIKE concat('%',#{name},'%')
             </if>
             <if test="action != ''and action != null">
-                AND basic_bussiness_type.action LIKE concat(#{action},'%')
+                AND basic_bussiness_type.action LIKE concat('%',#{action},'%')
             </if>
             <if test="mainAction != ''and mainAction != null">
-                AND basic_bussiness_type.mainAction LIKE concat(#{mainAction},'%')
+                AND basic_bussiness_type.mainAction LIKE concat('%',#{mainAction},'%')
             </if>
             <if test="enabled != ''and enabled != null">
                 AND basic_bussiness_type.enable =#{enabled}
@@ -52,13 +52,13 @@
         basic_bustype_local.action
         <where>
             <if test="name != ''and name != null">
-                AND name LIKE concat(#{name},'%')
+                AND name LIKE concat('%',#{name},'%')
             </if>
             <if test="action != ''and action != null">
-                AND basic_bussiness_type.`action` LIKE concat(#{action},'%')
+                AND basic_bussiness_type.`action` LIKE concat('%',#{action},'%')
             </if>
             <if test="mainAction != ''and mainAction != null">
-                AND mainAction LIKE concat(#{mainAction},'%')
+                AND mainAction LIKE concat('%',#{mainAction},'%')
             </if>
             <if test="enabled != ''and enabled != null">
                 AND basic_bussiness_type.enable =#{enabled}
@@ -102,13 +102,13 @@
         INNER JOIN inv_warehouse_user on inv_warehouse.`code` =inv_warehouse_user.`code`
         <where>
             <if test="name != ''and name != null">
-                AND basic_bussiness_type.name LIKE concat(#{name},'%')
+                AND basic_bussiness_type.name LIKE concat('%',#{name},'%')
             </if>
             <if test="action != ''and action != null">
-                AND basic_bussiness_type.action LIKE concat(#{action},'%')
+                AND basic_bussiness_type.action LIKE concat('%',#{action},'%')
             </if>
             <if test="mainAction != ''and mainAction != null">
-                AND basic_bussiness_type.mainAction LIKE concat(#{mainAction},'%')
+                AND basic_bussiness_type.mainAction LIKE concat('%',#{mainAction},'%')
             </if>
             <if test="enabled != ''and enabled != null">
                 AND basic_bussiness_type.enable =#{enabled}

api-admin/src/main/resources/mybatis/mapper/basic/CompanyProductRelevanceDao.xml

@@ -131,6 +131,9 @@
             <if test="unitFk != null and unitFk != ''">
                 and unitFk = #{unitFk}
             </if>
+            <if test="isDisable == false">
+                AND (basic_udirel.isDisable is null or basic_udirel.isDisable = false )
+            </if>
         </where>
         ORDER BY updateTime DESC
     </select>