Merge branch 'dev-cq' into dev

sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/LeaseOutDetails.java

@@ -153,7 +153,9 @@ public class LeaseOutDetails implements Serializable {
      */
     @ApiModelProperty(value = "数据所属组织")
     private Integer companyId;
-    @ApiModelProperty(value = "出库类型")
+    @ApiModelProperty(value = "出库类型 0编码出库  1数量出库")
     private Integer manageType;
+    @ApiModelProperty(value = "数量出库-出库数量")
+    private Integer inputNum;
 
 }

sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/TmTaskController.java

@@ -493,6 +493,7 @@ public class TmTaskController extends BaseController {
             Long userid = SecurityUtils.getLoginUser().getUserid();
             task.setUserId(String.valueOf(userid));
         }
+
         List<TmTask> leaseAuditList = tmTaskService.getLeaseOutListByUser(task);
         List<TmTaskDto> tmTaskDtos = Convert.toList(TmTaskDto.class, leaseAuditList);
         ExcelUtil<TmTaskDto> util = new ExcelUtil<TmTaskDto>(TmTaskDto.class);

sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/TmTask.java

@@ -59,6 +59,11 @@ public class TmTask implements Serializable {
     */
     @ApiModelProperty(value="已出库数量")
     private Integer alNum;
+    /**
+    * 库存
+    */
+    @ApiModelProperty(value="库存")
+    private Integer num;
 
     /**
     * 编号

sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/LeaseOutDetailsServiceImpl.java

@@ -147,6 +147,9 @@ public class LeaseOutDetailsServiceImpl implements LeaseOutDetailsService {
             // 1、判断是否重复提交
             res = checkRepeatSubmit(record);
             if (res > 0) {
+                if (record.getManageType() == 1 && record.getInputNum() != null) {
+                    record.setOutNum(record.getInputNum().doubleValue());
+                }
                 //2、判断库存是否足够
                 res = checkStorageNum(record);
                 if (res > 0) {

sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml

@@ -945,6 +945,7 @@
       mt2.type_name as typeName,
       mt.type_name as typeModelName,
       mt.manage_type as manageType,
+      mt.num as num,
       su.user_name as userName,
       lad.type_id as typeId
     FROM
@@ -959,5 +960,11 @@
     <if test="userId != 1">
       and mtk.user_id = #{userId}
     </if>
+    <if test="userName != null and userName != ''">
+      and su.user_name = #{userName}
+    </if>
+    <if test="typeId != null and typeId != ''">
+      and lad.type_id = #{typeId}
+    </if>
   </select>
 </mapper>

sgzb-ui/src/views/dashboard.vue

@@ -16,7 +16,7 @@
     },
     methods: {
         openNewWindow() {
-            window.open('http://112.29.103.165:21624/index01.html?token='+localStorage.getItem('token'), '_blank');
+            window.open('http://112.29.103.165:21626/index01.html?token='+localStorage.getItem('token'), '_blank');
         }
     }
   };