业务单据类型，扫码单据类型bug修复，新增用户bug修复，

单据打印bug修复；
仓库，添加用户，添加单据类型界面优化；

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

@@ -245,6 +245,15 @@ public class AuthAdminController {
         // 插入角色
         if (authAdminSaveRequest.getRoles() != null) {
             authRoleAdminService.insertRolesAdminIdAll(authAdminSaveRequest.getRoles(), authAdmin.getId());
+        } else {
+            List<AuthRoleAdmin> authRoleAdmins = authRoleAdminService.listByAdminId(curUser.getId());
+            List<Long> roles = new ArrayList<>();
+            if (!authRoleAdmins.isEmpty()) {
+                for (AuthRoleAdmin authRoleAdmin : authRoleAdmins) {
+                    roles.add(authRoleAdmin.getRole_id());
+                }
+                authRoleAdminService.insertRolesAdminIdAll(roles, authAdmin.getId());
+            }
         }
 
         Map<String, Long> res = new HashMap<>();

api-admin/src/main/java/com/glxp/sale/admin/controller/inout/StockQRCodeTextController.java

@@ -3,6 +3,7 @@ package com.glxp.sale.admin.controller.inout;
 import com.github.pagehelper.PageInfo;
 import com.glxp.sale.admin.annotation.AuthRuleAnnotation;
 import com.glxp.sale.admin.constant.Constant;
+import com.glxp.sale.admin.entity.basic.BussinessLocalTypeEntity;
 import com.glxp.sale.admin.entity.basic.StockPrintEntity;
 import com.glxp.sale.admin.entity.info.CompanyEntity;
 import com.glxp.sale.admin.entity.inout.StockOrderDetailEntity;
@@ -23,6 +24,7 @@ import com.glxp.sale.admin.req.itextpdf.StockQRCodeTextPDFTemplateRequest;
 import com.glxp.sale.admin.req.itextpdf.SystemPDFTemplateRelevanceRequest;
 import com.glxp.sale.admin.res.PageSimpleResponse;
 import com.glxp.sale.admin.res.param.SystemPDFTemplateRelevanceResponse;
+import com.glxp.sale.admin.service.basic.BussinessLocalTypeService;
 import com.glxp.sale.admin.service.info.CompanyService;
 import com.glxp.sale.admin.service.inout.StockOrderDetailService;
 import com.glxp.sale.admin.service.inout.StockOrderService;
@@ -80,6 +82,8 @@ public class StockQRCodeTextController {
     private StockPrintTempService stockPrintTempService;
     @Resource
     private JaspaperService jaspaperService;
+    @Resource
+    private BussinessLocalTypeService bussinessLocalTypeService;
 
     @AuthRuleAnnotation("")
     @GetMapping("/udiwms/stock/qrcode/text/filter")
@@ -335,13 +339,18 @@ public class StockQRCodeTextController {
         if (stockOrderEntity == null) {
             return ResultVOUtils.error(ResultEnum.DATA_NOT, "未找到该订单");
         }
-
-        SystemPDFModuleEntity systemPDFModuleEntity = systemPDFModuleService.selectById(2 + "");
-        if (systemPDFModuleEntity == null) return ResultVOUtils.error(ResultEnum.DATA_NOT, "所属模块错误");
+        SystemPDFTemplateRelevanceRequest systemPDFTemplateRelevanceRequest = new SystemPDFTemplateRelevanceRequest();
+        systemPDFTemplateRelevanceRequest.setModuleId(2);
+        systemPDFTemplateRelevanceRequest.setLocalAction(stockOrderEntity.getBillType());
+        List<SystemPDFTemplateRelevanceResponse> systemPDFTemplateRelevanceResponses = systemPDFTemplateRelevanceService.filterList(systemPDFTemplateRelevanceRequest);
+        if (systemPDFTemplateRelevanceResponses.isEmpty()) {
+            return ResultVOUtils.error(ResultEnum.DATA_NOT, "所属模块错误");
+        } else {
+            SystemPDFTemplateRelevanceResponse systemPDFTemplateRelevanceResponse = systemPDFTemplateRelevanceResponses.get(0);
             SystemPDFTemplateEntity systemPDFTemplateEntity =
-                systemPDFTemplateService.selectById(String.valueOf(systemPDFModuleEntity.getTemplateId()));
+                    systemPDFTemplateService.selectById(String.valueOf(systemPDFTemplateRelevanceResponse.getTemplateId()));
             if (systemPDFTemplateEntity == null) return ResultVOUtils.error(ResultEnum.DATA_NOT, "模板错误");
-
+        }
         return ResultVOUtils.success();
     }
 

api-admin/src/main/java/com/glxp/sale/admin/entity/inout/WarehouseUserEntity.java

@@ -32,4 +32,6 @@ public class WarehouseUserEntity {
      */
     private boolean isDirector;
 
+    private String employeeName;
+
 }

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

@@ -14,5 +14,6 @@ public class BussinessLocalTypeFilterRequest extends ListPageRequest {
     private Boolean changeEnable;
     private Boolean spUse;
     private Boolean isFilter;
+    private String code;
 
 }

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

@@ -46,4 +46,10 @@ public class FilterUdiInfoRequest extends ListPageRequest {
     private String corpId;
     private String billType;
 
+    private String ybbm;
+    private String sptm;
+    private String unionFilterStr;//产品名称，规格，批文，生产厂家联合查询
+
+
+
 }

api-admin/src/main/java/com/glxp/sale/admin/req/inout/OrderFilterRequest.java

@@ -30,5 +30,6 @@ public class OrderFilterRequest extends ListPageRequest {
     private Integer reviewUser;
 
     private Integer userId;
+    private String locStorageCode;
 
 }

api-admin/src/main/resources/mybatis/mapper/auth/AuthAdminDao.xml

@@ -134,6 +134,8 @@
     </delete>
 
     <select id="selectHospitalUser" resultType="com.glxp.sale.admin.entity.auth.AuthAdmin">
-        select id, userName from auth_user where CustomerId = 110
+        select *
+        from auth_user
+        where CustomerId = 110
     </select>
 </mapper>

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

@@ -35,7 +35,8 @@
         basic_bussiness_type.action,basic_bussiness_type.checkEnable,basic_bustype_local.advanceType,basic_bustype_local.changeEnable,
         basic_bustype_local.spUse,basic_bussiness_type.storageCode,basic_bussiness_type.corpType,basic_bussiness_type.mainAction
         FROM basic_bustype_local
-        inner join basic_bussiness_type on basic_bustype_local.action = basic_bussiness_type.localAction
+        inner join basic_bussiness_type
+        on basic_bustype_local.action = basic_bussiness_type.localAction
         <where>
             <if test="name != ''and name != null">
                 AND basic_bustype_local.name LIKE concat(#{name},'%')
@@ -84,6 +85,9 @@
             <if test="spUse != ''and spUse != null">
                 AND spUse =#{spUse}
             </if>
+            <if test="code != ''and code != null">
+                AND inv_warehouse_user.`code` = #{code}
+            </if>
         </where>
     </select>
 

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

@@ -125,7 +125,8 @@
         (action,name,enable,remark,mainAction,localAction,thirdSysFk,
         checkEnable,genUnit,innerOrder,secCheckEnable,
         checkUdims,checkPdaEd,checkPdaUn,checkPc,checkWebNew,checkChange
-        ,secCheckUdims,secCheckPdaEd,secCheckPdaUn,secCheckPc,secCheckWebNew,secCheckChange,corpType,basic_bussiness_type.storageCode)
+        ,secCheckUdims,secCheckPdaEd,secCheckPdaUn,secCheckPc,secCheckWebNew,
+        secCheckChange,corpType,basic_bussiness_type.storageCode)
         values
             (
         #{action},

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

@@ -65,6 +65,12 @@
             <if test="mainId != '' and mainId != null">
                 AND mainId = #{mainId}
             </if>
+            <if test="unionFilterStr != '' and unionFilterStr != null">
+                or basic_products.cpmctymc LIKE concat('%',#{unionFilterStr},'%')
+                or basic_products.ylqxzcrbarmc LIKE concat('%',#{unionFilterStr},'%')
+                or basic_products.ggxh LIKE concat('%',#{unionFilterStr},'%')
+                or basic_products.zczbhhzbapzbh LIKE concat('%',#{unionFilterStr},'%')
+            </if>
             <if test="isAdavence != '' and isAdavence != null">
                 AND isAdavence = #{isAdavence}
             </if>

api-admin/src/main/resources/mybatis/mapper/inout/OrderDao.xml

@@ -144,7 +144,7 @@
         INNER JOIN inv_warehouse_user on io_order.locStorageCode = inv_warehouse_user.`code`
         <where>
             <if test="id != '' and id!=null">
-                and id =#{id}
+                and io_order.id =#{id}
             </if>
             <if test="mainAction != '' and mainAction!=null">
                 and mainAction =#{mainAction}
@@ -194,10 +194,10 @@
             <if test="customerId != '' and customerId!=null">
                 and customerId =#{customerId}
             </if>
-            <if test=" createUser!=null">
+            <if test="createUser!=null">
                 and createUser =#{createUser}
             </if>
-            <if test=" reviewUser!=null">
+            <if test="reviewUser!=null">
                 and reviewUser =#{reviewUser}
             </if>
             <if test="ullageSupNo != '' and ullageSupNo!=null">
@@ -206,6 +206,10 @@
             <if test="userId!=null">
                 and inv_warehouse_user.userId =#{userId}
             </if>
+            <if test="locStorageCode!=null">
+                and locStorageCode =#{locStorageCode}
+            </if>
+
         </where>
         ORDER BY actDate DESC
 
@@ -217,7 +221,7 @@
         INNER JOIN inv_warehouse_user on io_order.locStorageCode = inv_warehouse_user.`code`
         <where>
             <if test="id != '' and id!=null">
-                and id =#{id}
+                and io_order.id =#{id}
             </if>
             <if test="mainAction != '' and mainAction!=null">
                 and mainAction =#{mainAction}
@@ -273,6 +277,9 @@
             <if test="userId!=null">
                 and inv_warehouse_user.userId =#{userId}
             </if>
+            <if test="locStorageCode!=null">
+                and locStorageCode =#{locStorageCode}
+            </if>
         </where>
         ORDER BY actDate DESC
     </select>
@@ -284,7 +291,7 @@
         INNER JOIN inv_warehouse_user on io_order.locStorageCode = inv_warehouse_user.`code`
         <where>
             <if test="id != '' and id!=null">
-                and id =#{id}
+                and io_order.id =#{id}
             </if>
             <if test="mainAction != '' and mainAction!=null">
                 and mainAction =#{mainAction}
@@ -340,17 +347,20 @@
             <if test="userId!=null">
                 and inv_warehouse_user.userId =#{userId}
             </if>
+            <if test="locStorageCode!=null">
+                and locStorageCode =#{locStorageCode}
+            </if>
         </where>
         ORDER BY actDate DESC
     </select>
 
     <select id="filterNoSort" parameterType="com.glxp.sale.admin.req.inout.OrderFilterRequest"
             resultType="com.glxp.sale.admin.entity.inout.OrderEntity">
-        SELECT * FROM io_order
+        SELECT io_order.* FROM io_order
         INNER JOIN inv_warehouse_user on io_order.locStorageCode = inv_warehouse_user.`code`
         <where>
             <if test="id != '' and id!=null">
-                and id =#{id}
+                and io_order.id =#{id}
             </if>
             <if test="mainAction != '' and mainAction!=null">
                 and mainAction =#{mainAction}
@@ -400,6 +410,9 @@
             <if test="userId!=null">
                 and inv_warehouse_user.userId =#{userId}
             </if>
+            <if test="locStorageCode!=null">
+                and locStorageCode =#{locStorageCode}
+            </if>
         </where>
 
     </select>

api-admin/src/main/resources/mybatis/mapper/inout/WarehouseBussinessTypeDao.xml

@@ -4,10 +4,10 @@
     <resultMap id="BaseResultMap" type="com.glxp.sale.admin.entity.inout.WarehouseBussinessTypeEntity">
         <!--@mbg.generated-->
         <!--@Table inv_warehouse_bussiness_type-->
-    <id column="id" jdbcType="INTEGER" property="id" />
-    <result column="code" jdbcType="VARCHAR" property="code" />
-    <result column="action" jdbcType="VARCHAR" property="action" />
-    <result column="name" jdbcType="VARCHAR" property="name" />
+        <id column="id" jdbcType="INTEGER" property="id"/>
+        <result column="code" jdbcType="VARCHAR" property="code"/>
+        <result column="action" jdbcType="VARCHAR" property="action"/>
+        <result column="name" jdbcType="VARCHAR" property="name"/>
     </resultMap>
     <sql id="Base_Column_List">
         <!--@mbg.generated-->
@@ -16,7 +16,7 @@
     <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
         <!--@mbg.generated-->
         select
-    <include refid="Base_Column_List" />
+        <include refid="Base_Column_List"/>
         from inv_warehouse_bussiness_type
         where id = #{id,jdbcType=INTEGER}
     </select>
@@ -25,14 +25,16 @@
         delete from inv_warehouse_bussiness_type
         where id = #{id,jdbcType=INTEGER}
     </delete>
-  <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.glxp.sale.admin.entity.inout.WarehouseBussinessTypeEntity" useGeneratedKeys="true">
+    <insert id="insert" keyColumn="id" keyProperty="id"
+            parameterType="com.glxp.sale.admin.entity.inout.WarehouseBussinessTypeEntity" useGeneratedKeys="true">
         <!--@mbg.generated-->
         insert into inv_warehouse_bussiness_type (code, `action`, `name`
         )
         values (#{code,jdbcType=VARCHAR}, #{action,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}
         )
     </insert>
-  <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.glxp.sale.admin.entity.inout.WarehouseBussinessTypeEntity" useGeneratedKeys="true">
+    <insert id="insertSelective" keyColumn="id" keyProperty="id"
+            parameterType="com.glxp.sale.admin.entity.inout.WarehouseBussinessTypeEntity" useGeneratedKeys="true">
         <!--@mbg.generated-->
         insert into inv_warehouse_bussiness_type
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -58,7 +60,8 @@
             </if>
         </trim>
     </insert>
-  <update id="updateByPrimaryKeySelective" parameterType="com.glxp.sale.admin.entity.inout.WarehouseBussinessTypeEntity">
+    <update id="updateByPrimaryKeySelective"
+            parameterType="com.glxp.sale.admin.entity.inout.WarehouseBussinessTypeEntity">
         <!--@mbg.generated-->
         update inv_warehouse_bussiness_type
         <set>
@@ -148,7 +151,8 @@
             )
         </foreach>
     </insert>
-  <insert id="insertOrUpdate" keyColumn="id" keyProperty="id" parameterType="com.glxp.sale.admin.entity.inout.WarehouseBussinessTypeEntity" useGeneratedKeys="true">
+    <insert id="insertOrUpdate" keyColumn="id" keyProperty="id"
+            parameterType="com.glxp.sale.admin.entity.inout.WarehouseBussinessTypeEntity" useGeneratedKeys="true">
         <!--@mbg.generated-->
         insert into inv_warehouse_bussiness_type
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -178,7 +182,8 @@
             `name` = #{name,jdbcType=VARCHAR},
         </trim>
     </insert>
-  <insert id="insertOrUpdateSelective" keyColumn="id" keyProperty="id" parameterType="com.glxp.sale.admin.entity.inout.WarehouseBussinessTypeEntity" useGeneratedKeys="true">
+    <insert id="insertOrUpdateSelective" keyColumn="id" keyProperty="id"
+            parameterType="com.glxp.sale.admin.entity.inout.WarehouseBussinessTypeEntity" useGeneratedKeys="true">
         <!--@mbg.generated-->
         insert into inv_warehouse_bussiness_type
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -228,10 +233,15 @@
     </insert>
 
     <select id="selectListByCode" resultMap="BaseResultMap">
-    select * from inv_warehouse_bussiness_type where code = #{code}
+        select 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 from inv_warehouse_bussiness_type where code = #{code}
+        delete
+        from inv_warehouse_bussiness_type
+        where code = #{code}
     </delete>
 </mapper>

api-admin/src/main/resources/mybatis/mapper/inout/WarehouseUserDao.xml

@@ -4,11 +4,11 @@
     <resultMap id="BaseResultMap" type="com.glxp.sale.admin.entity.inout.WarehouseUserEntity">
         <!--@mbg.generated-->
         <!--@Table inv_warehouse_user-->
-    <id column="id" jdbcType="INTEGER" property="id" />
-    <result column="code" jdbcType="VARCHAR" property="code" />
-    <result column="userId" jdbcType="BIGINT" property="userid" />
-    <result column="userName" jdbcType="VARCHAR" property="username" />
-    <result column="isDirector" javaType="boolean" property="isDirector" />
+        <id column="id" jdbcType="INTEGER" property="id"/>
+        <result column="code" jdbcType="VARCHAR" property="code"/>
+        <result column="userId" jdbcType="BIGINT" property="userid"/>
+        <result column="userName" jdbcType="VARCHAR" property="username"/>
+        <result column="isDirector" javaType="boolean" property="isDirector"/>
     </resultMap>
     <sql id="Base_Column_List">
         <!--@mbg.generated-->
@@ -17,7 +17,7 @@
     <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
         <!--@mbg.generated-->
         select
-    <include refid="Base_Column_List" />
+        <include refid="Base_Column_List"/>
         from inv_warehouse_user
         where id = #{id,jdbcType=INTEGER}
     </select>
@@ -26,14 +26,16 @@
         delete from inv_warehouse_user
         where id = #{id,jdbcType=INTEGER}
     </delete>
-  <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.glxp.sale.admin.entity.inout.WarehouseUserEntity" useGeneratedKeys="true">
+    <insert id="insert" keyColumn="id" keyProperty="id"
+            parameterType="com.glxp.sale.admin.entity.inout.WarehouseUserEntity" useGeneratedKeys="true">
         <!--@mbg.generated-->
         insert into inv_warehouse_user (code, userId, userName, isDirector
         )
         values (#{code,jdbcType=VARCHAR}, #{userid,jdbcType=BIGINT}, #{username,jdbcType=VARCHAR}, #{isDirector}
         )
     </insert>
-  <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.glxp.sale.admin.entity.inout.WarehouseUserEntity" useGeneratedKeys="true">
+    <insert id="insertSelective" keyColumn="id" keyProperty="id"
+            parameterType="com.glxp.sale.admin.entity.inout.WarehouseUserEntity" useGeneratedKeys="true">
         <!--@mbg.generated-->
         insert into inv_warehouse_user
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -149,11 +151,13 @@
         (code, userId, userName, isDirector)
         values
         <foreach collection="list" item="item" separator=",">
-      (#{item.code,jdbcType=VARCHAR}, #{item.userid,jdbcType=BIGINT}, #{item.username,jdbcType=VARCHAR}, #{item.isDirector}
+            (#{item.code,jdbcType=VARCHAR}, #{item.userid,jdbcType=BIGINT}, #{item.username,jdbcType=VARCHAR},
+            #{item.isDirector}
             )
         </foreach>
     </insert>
-  <insert id="insertOrUpdate" keyColumn="id" keyProperty="id" parameterType="com.glxp.sale.admin.entity.inout.WarehouseUserEntity" useGeneratedKeys="true">
+    <insert id="insertOrUpdate" keyColumn="id" keyProperty="id"
+            parameterType="com.glxp.sale.admin.entity.inout.WarehouseUserEntity" useGeneratedKeys="true">
         <!--@mbg.generated-->
         insert into inv_warehouse_user
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -185,7 +189,8 @@
             userName = #{username,jdbcType=VARCHAR},
         </trim>
     </insert>
-  <insert id="insertOrUpdateSelective" keyColumn="id" keyProperty="id" parameterType="com.glxp.sale.admin.entity.inout.WarehouseUserEntity" useGeneratedKeys="true">
+    <insert id="insertOrUpdateSelective" keyColumn="id" keyProperty="id"
+            parameterType="com.glxp.sale.admin.entity.inout.WarehouseUserEntity" useGeneratedKeys="true">
         <!--@mbg.generated-->
         insert into inv_warehouse_user
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -235,18 +240,27 @@
     </insert>
 
     <select id="selectListByCode" resultMap="BaseResultMap">
-    select * from inv_warehouse_user where code = #{code}
+        select inv_warehouse_user.*, auth_user.employeeName
+        from inv_warehouse_user
+        inner join auth_user on auth_user.id = inv_warehouse_user.userId
+        where code = #{code}
     </select>
 
     <delete id="deleteByCode">
-    delete from inv_warehouse_user where code = #{code}
+        delete
+        from inv_warehouse_user
+        where code = #{code}
     </delete>
 
     <update id="updateDirector">
-    update inv_warehouse_user set isDirector = #{isDirector} where code = #{code}
+        update inv_warehouse_user
+        set isDirector = #{isDirector}
+        where code = #{code}
     </update>
 
     <update id="updateDirectorById">
-    update inv_warehouse_user set isDirector = #{isDirector} where id = #{id}
+        update inv_warehouse_user
+        set isDirector = #{isDirector}
+        where id = #{id}
     </update>
 </mapper>