From 8d4cf0e5a851d2fa768f2a8cbb5b92332f6bda9b Mon Sep 17 00:00:00 2001
From: mahuandong <752432958@qq.com>
Date: Fri, 27 Sep 2019 17:50:48 +0800
Subject: [PATCH] 修改容器新增时容器enable状态

---
 src/main/java/com/huaheng/pc/receipt/receiptContainerHeader/service/ReceiptContainerHeaderServiceImpl.java | 2 ++
 src/main/resources/templates/receipt/receiving/add.html                                                    | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/huaheng/pc/receipt/receiptContainerHeader/service/ReceiptContainerHeaderServiceImpl.java b/src/main/java/com/huaheng/pc/receipt/receiptContainerHeader/service/ReceiptContainerHeaderServiceImpl.java
index a88329a..1802005 100644
--- a/src/main/java/com/huaheng/pc/receipt/receiptContainerHeader/service/ReceiptContainerHeaderServiceImpl.java
+++ b/src/main/java/com/huaheng/pc/receipt/receiptContainerHeader/service/ReceiptContainerHeaderServiceImpl.java
@@ -375,6 +375,7 @@ public class ReceiptContainerHeaderServiceImpl extends ServiceImpl<ReceiptContai
      * 自动生成容器编码
      * @return 容器编码
      */
+    @Transactional
     public String createContainer(){
         String code = MessageFormat.format("{0}{1}",
                 "LS",
@@ -387,6 +388,7 @@ public class ReceiptContainerHeaderServiceImpl extends ServiceImpl<ReceiptContai
         container.setCreatedBy(ShiroUtils.getLoginName());
         container.setLastUpdated(new Date());
         container.setLastUpdatedBy(ShiroUtils.getLoginName());
+        container.setEnable(true);
         container.setStatus("empty");
         if (!containerService.save(container)){
             throw new ServiceException("新增容器失败");
diff --git a/src/main/resources/templates/receipt/receiving/add.html b/src/main/resources/templates/receipt/receiving/add.html
index 2b9cc16..bf1dd02 100644
--- a/src/main/resources/templates/receipt/receiving/add.html
+++ b/src/main/resources/templates/receipt/receiving/add.html
@@ -70,7 +70,7 @@
             <div class="form-group">
                 <label class="col-sm-3 control-label">定位规则:</label>
                 <div class="col-sm-8">
-                    <select id="locatingRule" name="locatingRule" class="form-control" th:with="list=${@FilterConfigDetailService.queryFilterConfigDetail('入库')}">
+                    <select id="locatingRule" name="locatingRule" class="form-control" th:with="list=${@FilterConfigDetailService.queryFilterConfigDetail('locationRule')}">
                         <option value="">请选择</option>
                         <option th:each="item : ${list}" th:text="${item['description']}" th:value="${item['code']}"></option>
                     </select>
--
libgit2 0.22.2