为出库申请添加业务类型选择功能

src/main/java/com/dreamchaser/depository_manage/controller/BusinessTypeController.java

@@ -17,8 +17,7 @@ import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 import java.util.Map;
 
-@Controller
-@Slf4j
+@RestController
 @RequestMapping("/businessType")
 public class BusinessTypeController {
     @Autowired

src/main/java/com/dreamchaser/depository_manage/controller/PageController.java

@@ -830,6 +830,8 @@ public class PageController {
         } else {
             mv.addObject("display", "none");
         }
+        List<BusinessType> businessTypeAll = businessTypeService.findBusinessTypeAll();
+        mv.addObject("btList",businessTypeAll);
         mv.setViewName("pages/application/application-out");
         Integer maindeparment = userToken.getMaindeparment();
         if (PublicConfig.roleAdminorgList.contains(maindeparment)) {
@@ -847,6 +849,9 @@ public class PageController {
     @GetMapping("/application_out_immediately")
     public ModelAndView application_out_immediately(HttpServletRequest request) {
         ModelAndView mv = new ModelAndView();
+        // 获取所有出库业务类别
+        List<BusinessType> businessTypeAll = businessTypeService.findBusinessTypeAll();
+        mv.addObject("btList",businessTypeAll);
         mv.setViewName("pages/applicationForStorageCenter/application-out_admin");
         return mv;
     }
@@ -862,6 +867,8 @@ public class PageController {
     @GetMapping("/application_out_back")
     public ModelAndView application_out_back(String code, String depositoryId, HttpServletRequest request) {
         ModelAndView mv = new ModelAndView();
+        List<BusinessType> businessTypeAll = businessTypeService.findBusinessTypeAll();
+        mv.addObject("btList",businessTypeAll);
         mv.setViewName("pages/application/application-out_back");
         String token = request.getHeader("user-token");
         if (token == null) {
@@ -2593,6 +2600,7 @@ public class PageController {
 
         UserByPort userToken = AuthenticationTokenPool.getUserToken(token);
 
+
         ModelAndView mv = new ModelAndView();
         List<Integer> gidList = new ArrayList<>();
         if ("one".equals(type)) {
@@ -3222,6 +3230,8 @@ public class PageController {
         if (token == null) {
             token = (String) request.getSession().getAttribute("userToken");
         }
+        List<BusinessType> businessTypeAll = businessTypeService.findBusinessTypeAll();
+        mv.addObject("btList",businessTypeAll);
         UserByPort userToken = AuthenticationTokenPool.getUserToken(token);
         List<String> range = redisPool.getRedisTemplateByDb(15).boundListOps("WMS_temporaryValue_Out" + userToken.getNumber()).range(0, -1);
         // 获取当前用户是否存在可见仓库

src/main/java/com/dreamchaser/depository_manage/entity/ApplicationOutRecord.java

@@ -213,7 +213,12 @@ public class ApplicationOutRecord {
     /**
      * 出库类别
      */
-    private String outType;
+    private Integer outType;
+
+    /**
+     * 出库类别名称
+     */
+    private String outTypeName;
 
     /**
      * 最后修改人员

src/main/java/com/dreamchaser/depository_manage/mapper/BusinessTypeMapper.xml

@@ -15,7 +15,7 @@
     </resultMap>
 
     <sql id="allColumns">
-
+        id,typeName,typeDescription,recordTypeName,recordTypeDescription,state,createUid,createTime,updateUid,updateTime
     </sql>
 
     <insert id="addBusinessType" useGeneratedKeys="true" keyProperty="id">

src/main/java/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.xml

@@ -121,7 +121,8 @@
         <result column="pass" property="pass" jdbcType="INTEGER"/>
         <result column="aormUnit" property="unit" jdbcType="VARCHAR"/>
         <result column="abstract" property="abstracts" jdbcType="VARCHAR"/>
-        <result column="outType" property="outType" jdbcType="VARCHAR"/>
+        <result column="outType" property="outType" jdbcType="INTEGER"/>
+        <result column="outTypeName" property="outTypeName" jdbcType="VARCHAR"/>
         <result column="aorconstructionunitid" property="constructionUnitId" jdbcType="INTEGER"/>
         <result column="aoradminorgid" property="adminorgId" jdbcType="INTEGER"/>
         <result column="outTime" property="outTime" jdbcType="INTEGER"/>
@@ -184,7 +185,7 @@
     <sql id="ApplicationOutRecordInfo">
         aorid,mid,mname,depositoryId,dname,applicantId,applicantTime,applyRemark,aorcode,aorpirce,aorquantity,departmenthead,departmentheadPass,departmentHeadTime,departmentheadMessage,
         depositoryManager,depositoryManagerPass,depositoryManagerTime,depositoryManagerMessage,aorstate,istransfer,mcode,placeId,pass,aormUnit,aorconstructionunitid,aoradminorgid,cuname,
-        cuintroduce,cuaddress,outTime,abstract,outType,editUser,mbrand,mversion,flagForOpenDepository,createUid,flagForAgency,balancePoster,balancePosterTime,balancePosterPass,balancePosterMessage
+        cuintroduce,cuaddress,outTime,abstract,outType,editUser,mbrand,mversion,flagForOpenDepository,createUid,flagForAgency,balancePoster,balancePosterTime,balancePosterPass,balancePosterMessage,outTypeName
     </sql>
 
     <sql id="ApplicationOutRecordMinInfo">

src/main/java/com/dreamchaser/depository_manage/pojo/ApplicationOutRecordP.java

@@ -216,7 +216,12 @@ public class ApplicationOutRecordP {
     /**
      * 出库类别
      */
-    private String outType;
+    private Integer outType;
+
+    /**
+     * 出库类别名称
+     */
+    private String outTypeName;
 
     /**
      * 物料品牌
@@ -282,6 +287,7 @@ public class ApplicationOutRecordP {
         this.outTime = aor.getOutTime() == null ? "" : DateUtil.TimeStampToDateTime(Long.valueOf(aor.getOutTime()));
         this.abstracts = aor.getAbstracts();
         this.outType = aor.getOutType();
+        this.outTypeName = aor.getOutTypeName();
         this.mbrand = aor.getMbrand() == null ? "" : aor.getMbrand();
         this.mversion = aor.getMversion() == null ? "" : aor.getMversion();
         this.flagForOpenDepository = aor.getFlagForOpenDepository();

src/main/java/com/dreamchaser/depository_manage/service/impl/BusinessTypeServiceImpl.java

@@ -3,6 +3,7 @@ package com.dreamchaser.depository_manage.service.impl;
 import com.dreamchaser.depository_manage.entity.BusinessType;
 import com.dreamchaser.depository_manage.mapper.BusinessTypeMapper;
 import com.dreamchaser.depository_manage.service.BusinessTypeService;
+import com.dreamchaser.depository_manage.utils.ObjectFormatUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -111,6 +112,20 @@ public class BusinessTypeServiceImpl implements BusinessTypeService {
      */
     @Override
     public List<BusinessType> findBusinessTypeByCondition(Map<String, Object> map) {
+        Integer size = 10, page = 1;
+        if (map.containsKey("size")) {
+            size = ObjectFormatUtil.toInteger(map.get("size"));
+            map.put("size", size);
+        }
+        if (map.containsKey("page")) {
+            page = ObjectFormatUtil.toInteger(map.get("page"));
+            map.put("begin", (page - 1) * size);
+        }
+        Object state = 1;
+        if (map.containsKey("state")) {
+            state = map.get("state");
+        }
+        map.put("state", state);
         return businessTypeMapper.findBusinessTypeByCondition(map);
     }
 
@@ -121,6 +136,11 @@ public class BusinessTypeServiceImpl implements BusinessTypeService {
      */
     @Override
     public Integer findBusinessTypeCountByCondition(Map<String, Object> map) {
+        Object state = 1;
+        if (map.containsKey("state")) {
+            state = map.get("state");
+        }
+        map.put("state", state);
         return businessTypeMapper.findBusinessTypeCountByCondition(map);
     }
 

src/main/java/com/dreamchaser/depository_manage/service/impl/ExcelServiceImpl.java

@@ -583,7 +583,7 @@ public class ExcelServiceImpl implements ExcelService {
 
             if (record.getOutType() != null) {
                 // 设置出库类别
-                excelInfoByWrite.setType(record.getOutType());
+                excelInfoByWrite.setType(record.getOutTypeName());
             } else {
                 excelInfoByWrite.setType("");
 

src/main/resources/templates/pages/applicationForStorageCenter/application-out.html

@@ -122,8 +122,12 @@
                                             <div class="layui-form-item">
                                                 <label class="layui-form-label">出库类别:</label>
                                                 <div class="layui-input-block">
-                                                    <input name="outType" placeholder="请填写相关原因及申请原因" value=""
-                                                           class="layui-input"/>
+                                                    <select name="outType">
+                                                        <option></option>
+                                                        <option th:each="bt,iterStar:${btList}"
+                                                                th:value="${bt?.getId()}"
+                                                                th:text="${bt?.getTypeName()}"></option>
+                                                    </select>
                                                 </div>
                                             </div>
                                             <div class="layui-form-item">
@@ -618,6 +622,9 @@
                     }
                     data.params = remove(data.params, Number(keyNumber));
                 }
+                if(data.outType === ""){
+                    delete data["outType"];
+                }
                 $.ajax({
                     url: "/depositoryRecord/applicationOut",
                     type: 'post',

src/main/resources/templates/pages/applicationForStorageCenter/application-out_admin.html

@@ -109,8 +109,12 @@
                                             <div class="layui-form-item">
                                                 <label class="layui-form-label">出库类别:</label>
                                                 <div class="layui-input-block">
-                                                    <input name="outType" placeholder="请填写相关原因及申请原因" value=""
-                                                           class="layui-input"/>
+                                                    <select name="outType">
+                                                        <option></option>
+                                                        <option th:each="bt,iterStar:${btList}"
+                                                                th:value="${bt?.getId()}"
+                                                                th:text="${bt?.getTypeName()}"></option>
+                                                    </select>
                                                 </div>
                                             </div>
                                             <div class="layui-form-item">
@@ -564,6 +568,9 @@
                         })
                     }
                 }
+                if(data.outType === ""){
+                    delete data["outType"];
+                }
                 if (flagForSubmit) {
                     $.ajax({
                         url: "/depositoryRecord/applicationOutForImmediately",

src/main/resources/templates/pages/applicationForStorageCenter/application-out_back.html

@@ -104,8 +104,12 @@
                                         <div class="layui-form-item">
                                             <label class="layui-form-label">出库类别:</label>
                                             <div class="layui-input-block">
-                                                <input name="outType" placeholder="请填写相关原因及申请原因" value=""
-                                                       class="layui-input"/>
+                                                <select name="outType">
+                                                    <option></option>
+                                                    <option th:each="bt,iterStar:${btList}"
+                                                            th:value="${bt?.getId()}"
+                                                            th:text="${bt?.getTypeName()}"></option>
+                                                </select>
                                             </div>
                                         </div>
                                         <div class="layui-form-item">

src/main/resources/templates/pages/applicationForStorageCenter/application-out_temporaryValue.html

@@ -82,8 +82,12 @@
                                 <div class="layui-form-item">
                                     <label class="layui-form-label">出库类别:</label>
                                     <div class="layui-input-block">
-                                        <input name="outType" placeholder="请填写相关原因及申请原因" value=""
-                                               class="layui-input"/>
+                                        <select name="outType">
+                                            <option></option>
+                                            <option th:each="bt,iterStar:${btList}"
+                                                    th:value="${bt?.getId()}"
+                                                    th:text="${bt?.getTypeName()}"></option>
+                                        </select>
                                     </div>
                                 </div>
                                 <div class="layui-form-item">
@@ -349,6 +353,9 @@
                     }
                     data.params = remove(data.params, Number(keyNumber));
                 }
+                if(data.outType === ""){
+                    delete data["outType"];
+                }
                 $.ajax({
                     url: "/depositoryRecord/applicationOut",
                     type: 'post',

target/classes/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.xml

@@ -121,7 +121,8 @@
         <result column="pass" property="pass" jdbcType="INTEGER"/>
         <result column="aormUnit" property="unit" jdbcType="VARCHAR"/>
         <result column="abstract" property="abstracts" jdbcType="VARCHAR"/>
-        <result column="outType" property="outType" jdbcType="VARCHAR"/>
+        <result column="outType" property="outType" jdbcType="INTEGER"/>
+        <result column="outTypeName" property="outTypeName" jdbcType="VARCHAR"/>
         <result column="aorconstructionunitid" property="constructionUnitId" jdbcType="INTEGER"/>
         <result column="aoradminorgid" property="adminorgId" jdbcType="INTEGER"/>
         <result column="outTime" property="outTime" jdbcType="INTEGER"/>
@@ -184,7 +185,7 @@
     <sql id="ApplicationOutRecordInfo">
         aorid,mid,mname,depositoryId,dname,applicantId,applicantTime,applyRemark,aorcode,aorpirce,aorquantity,departmenthead,departmentheadPass,departmentHeadTime,departmentheadMessage,
         depositoryManager,depositoryManagerPass,depositoryManagerTime,depositoryManagerMessage,aorstate,istransfer,mcode,placeId,pass,aormUnit,aorconstructionunitid,aoradminorgid,cuname,
-        cuintroduce,cuaddress,outTime,abstract,outType,editUser,mbrand,mversion,flagForOpenDepository,createUid,flagForAgency,balancePoster,balancePosterTime,balancePosterPass,balancePosterMessage
+        cuintroduce,cuaddress,outTime,abstract,outType,editUser,mbrand,mversion,flagForOpenDepository,createUid,flagForAgency,balancePoster,balancePosterTime,balancePosterPass,balancePosterMessage,outTypeName
     </sql>
 
     <sql id="ApplicationOutRecordMinInfo">

target/classes/templates/pages/applicationForStorageCenter/application-out.html

@@ -122,8 +122,12 @@
                                             <div class="layui-form-item">
                                                 <label class="layui-form-label">出库类别:</label>
                                                 <div class="layui-input-block">
-                                                    <input name="outType" placeholder="请填写相关原因及申请原因" value=""
-                                                           class="layui-input"/>
+                                                    <select name="outType">
+                                                        <option></option>
+                                                        <option th:each="bt,iterStar:${btList}"
+                                                                th:value="${bt?.getId()}"
+                                                                th:text="${bt?.getTypeName()}"></option>
+                                                    </select>
                                                 </div>
                                             </div>
                                             <div class="layui-form-item">
@@ -618,6 +622,9 @@
                     }
                     data.params = remove(data.params, Number(keyNumber));
                 }
+                if(data.outType === ""){
+                    delete data["outType"];
+                }
                 $.ajax({
                     url: "/depositoryRecord/applicationOut",
                     type: 'post',

target/classes/templates/pages/applicationForStorageCenter/application-out_admin.html

@@ -109,8 +109,12 @@
                                             <div class="layui-form-item">
                                                 <label class="layui-form-label">出库类别:</label>
                                                 <div class="layui-input-block">
-                                                    <input name="outType" placeholder="请填写相关原因及申请原因" value=""
-                                                           class="layui-input"/>
+                                                    <select name="outType">
+                                                        <option></option>
+                                                        <option th:each="bt,iterStar:${btList}"
+                                                                th:value="${bt?.getId()}"
+                                                                th:text="${bt?.getTypeName()}"></option>
+                                                    </select>
                                                 </div>
                                             </div>
                                             <div class="layui-form-item">
@@ -564,6 +568,9 @@
                         })
                     }
                 }
+                if(data.outType === ""){
+                    delete data["outType"];
+                }
                 if (flagForSubmit) {
                     $.ajax({
                         url: "/depositoryRecord/applicationOutForImmediately",

target/classes/templates/pages/applicationForStorageCenter/application-out_back.html

@@ -104,8 +104,12 @@
                                         <div class="layui-form-item">
                                             <label class="layui-form-label">出库类别:</label>
                                             <div class="layui-input-block">
-                                                <input name="outType" placeholder="请填写相关原因及申请原因" value=""
-                                                       class="layui-input"/>
+                                                <select name="outType">
+                                                    <option></option>
+                                                    <option th:each="bt,iterStar:${btList}"
+                                                            th:value="${bt?.getId()}"
+                                                            th:text="${bt?.getTypeName()}"></option>
+                                                </select>
                                             </div>
                                         </div>
                                         <div class="layui-form-item">

target/classes/templates/pages/applicationForStorageCenter/application-out_temporaryValue.html

@@ -82,8 +82,12 @@
                                 <div class="layui-form-item">
                                     <label class="layui-form-label">出库类别:</label>
                                     <div class="layui-input-block">
-                                        <input name="outType" placeholder="请填写相关原因及申请原因" value=""
-                                               class="layui-input"/>
+                                        <select name="outType">
+                                            <option></option>
+                                            <option th:each="bt,iterStar:${btList}"
+                                                    th:value="${bt?.getId()}"
+                                                    th:text="${bt?.getTypeName()}"></option>
+                                        </select>
                                     </div>
                                 </div>
                                 <div class="layui-form-item">
@@ -349,6 +353,9 @@
                     }
                     data.params = remove(data.params, Number(keyNumber));
                 }
+                if(data.outType === ""){
+                    delete data["outType"];
+                }
                 $.ajax({
                     url: "/depositoryRecord/applicationOut",
                     type: 'post',