From 8f35633b9f7471176565216e301af73cb163ca04 Mon Sep 17 00:00:00 2001
From: hai_c <3038696639@qq.com>
Date: Sun, 15 Sep 2019 15:05:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=93=E5=BA=93=E7=AE=A1=E7=90=86=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=20=20=E4=BF=AE=E6=94=B9=E4=BB=A3=E7=A0=81=E6=A0=BC?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/skyeye/dao/StoreHouseDao.java    |  4 ++
 .../service/impl/StoreHouseServiceImpl.java   | 11 ++--
 .../dbmapper/erp/StoreHouseMapper.xml         | 65 +++++++++++++------
 erp-web/src/main/resources/mapping/erp.xml    | 10 +--
 .../template/js/storehouse/storehouseadd.js   |  2 +-
 .../template/js/storehouse/storehouseedit.js  |  4 +-
 .../template/js/storehouse/storehouselist.js  | 14 ++--
 .../tpl/storehouse/storehouseadd.html         | 14 ++--
 .../tpl/storehouse/storehouseeditTemplate.tpl | 12 ++--
 .../tpl/storehouse/storehouselist.html        |  2 +-
 10 files changed, 85 insertions(+), 53 deletions(-)

diff --git a/erp-modular/src/main/java/com/skyeye/dao/StoreHouseDao.java b/erp-modular/src/main/java/com/skyeye/dao/StoreHouseDao.java
index 77730dfd..238280e9 100644
--- a/erp-modular/src/main/java/com/skyeye/dao/StoreHouseDao.java
+++ b/erp-modular/src/main/java/com/skyeye/dao/StoreHouseDao.java
@@ -19,4 +19,8 @@ public interface StoreHouseDao {
     public Map<String, Object> queryStoreHouseById(Map<String, Object> params) throws Exception;
 
     public void editStoreHouseById(Map<String, Object> params) throws Exception;
+
+    public void editStoreHouseBydeleteFlag(Map<String, Object> params) throws Exception;
+
+    public void editStoreHouseByDefault(Map<String, Object> params) throws Exception;
 }
diff --git a/erp-modular/src/main/java/com/skyeye/service/impl/StoreHouseServiceImpl.java b/erp-modular/src/main/java/com/skyeye/service/impl/StoreHouseServiceImpl.java
index 450ca281..a3d3fe03 100644
--- a/erp-modular/src/main/java/com/skyeye/service/impl/StoreHouseServiceImpl.java
+++ b/erp-modular/src/main/java/com/skyeye/service/impl/StoreHouseServiceImpl.java
@@ -31,7 +31,6 @@ public class StoreHouseServiceImpl implements StoreHouseService {
     @Override
     public void queryStoreHouseByList(InputObject inputObject, OutputObject outputObject) throws Exception {
         Map<String, Object> params = inputObject.getParams();
-        params.put("deleteFlag", "0");
         List<Map<String, Object>> beans = storeHouseDao.queryStoreHouseByList(params);
         if(!beans.isEmpty()){
             outputObject.setBeans(beans);
@@ -89,9 +88,8 @@ public class StoreHouseServiceImpl implements StoreHouseService {
     @Override
     public void deleteStoreHouseById(InputObject inputObject, OutputObject outputObject) throws Exception {
         Map<String, Object> params = inputObject.getParams();
-        Map<String, Object> user = inputObject.getLogParams();
-        params.put("deleteFlag", 1);
-        storeHouseDao.editStoreHouseById(params);
+        params.put("userId", inputObject.getLogParams().get("id"));
+        storeHouseDao.editStoreHouseBydeleteFlag(params);
     }
 
     /**
@@ -103,6 +101,7 @@ public class StoreHouseServiceImpl implements StoreHouseService {
     @Override
     public void editStoreHouseById(InputObject inputObject, OutputObject outputObject) throws Exception {
         Map<String, Object> params = inputObject.getParams();
+        params.put("userId", inputObject.getLogParams().get("id"));
         storeHouseDao.editStoreHouseById(params);
     }
 
@@ -115,7 +114,7 @@ public class StoreHouseServiceImpl implements StoreHouseService {
     @Override
     public void editStoreHouseByDefault(InputObject inputObject, OutputObject outputObject) throws Exception {
         Map<String, Object> params = inputObject.getParams();
-        params.put("isDefault", "1");//默认状态
-        storeHouseDao.editStoreHouseById(params);
+        params.put("userId", inputObject.getLogParams().get("id"));
+        storeHouseDao.editStoreHouseByDefault(params);
     }
 }
diff --git a/erp-web/src/main/resources/dbmapper/erp/StoreHouseMapper.xml b/erp-web/src/main/resources/dbmapper/erp/StoreHouseMapper.xml
index f0c6a5ac..86873bcd 100644
--- a/erp-web/src/main/resources/dbmapper/erp/StoreHouseMapper.xml
+++ b/erp-web/src/main/resources/dbmapper/erp/StoreHouseMapper.xml
@@ -12,12 +12,12 @@
             d.remark,
             d.principal,
             d.tenant_id,
-            d.is_default,
+            d.is_default isDefault,
             CONVERT (d.create_time, CHAR) createTime
         FROM
             erp_depot d
         WHERE
-            d.delete_Flag = #{deleteFlag}
+            d.delete_Flag = 0
         <if test="name != '' and name != null">
             AND d.name LIKE '%${name}%'
         </if>
@@ -35,7 +35,6 @@
         AND
             d.delete_Flag = 0
         ORDER BY d.create_time DESC LIMIT 0,1
-
     </select>
 
     <insert id="insertStoreHouse" parameterType="java.util.Map">
@@ -57,16 +56,16 @@
             <if test="principal != '' and principal != null">
                 principal,
             </if>
-	        tenant_id,
-	        is_default,
-	        create_time
-	    )VALUES(
-	        #{id},
-	        #{name},
-            <if test="address != '' and address != null">
-                #{address},
-            </if>
-            <if test="warehousing != '' and warehousing != null">
+        tenant_id,
+        is_default,
+        create_time
+        )VALUES(
+        #{id},
+        #{name},
+        <if test="address != '' and address != null">#{address},
+        </if>
+            <if test="
+        warehousing != '' and warehousing != null">
                 #{warehousing},
             </if>
             <if test="truckage != '' and truckage != null">
@@ -79,8 +78,9 @@
                 #{principal},
             </if>
 	        #{tenantId},
-	        #{isDefault},
+	        #{is_default},
 	        #{createTime}
+        )
     </insert>
 
     <select id="queryStoreHouseById" parameterType="java.util.Map" resultType="java.util.Map">
@@ -93,7 +93,7 @@
             d.remark,
             d.principal,
             d.tenant_id,
-            d.is_default,
+            d.is_default isDefault,
             CONVERT (d.create_time, CHAR) createTime
         FROM
             erp_depot d
@@ -122,16 +122,41 @@
             <if test="principal != '' and principal != null">
                 principal = #{principal},
             </if>
-            <if test="deleteFlag !='' and deleteFlag != null">
-                delete_Flag = #{deleteFlag},
+            <if test="delete_Flag !='' and delete_Flag != null">
+                delete_Flag = #{delete_Flag},
             </if>
-            <if test="isDefault != '' and isDefault != null">
-                is_default = #{isDefault},
+            <if test="is_default != '' and is_default != null">
+                is_default = #{is_default},
+            </if>
+            <if test="name != '' and name != null">
+                name = #{name},
             </if>
-            name = #{name},
         </set>
         WHERE
             id = #{id}
+        AND
+            tenant_id = #{userId}
     </update>
 
+    <update id="editStoreHouseBydeleteFlag" parameterType="java.util.Map">
+        UPDATE erp_depot
+        <set>
+            delete_Flag = #{delete_Flag}
+        </set>
+        WHERE
+          id = #{id}
+        AND
+          tenant_id = #{userId}
+    </update>
+
+    <update id="editStoreHouseByDefault" parameterType="java.util.Map">
+        UPDATE erp_depot
+        <set>
+            is_default = #{is_default}
+        </set>
+        WHERE
+          id = #{id}
+        AND
+          tenant_id = #{userId}
+    </update>
 </mapper>
\ No newline at end of file
diff --git a/erp-web/src/main/resources/mapping/erp.xml b/erp-web/src/main/resources/mapping/erp.xml
index e6478826..c975b3f0 100644
--- a/erp-web/src/main/resources/mapping/erp.xml
+++ b/erp-web/src/main/resources/mapping/erp.xml
@@ -7,6 +7,8 @@
 	<!-- 仓库管理开始 -->
 	<url id="storehouse001" path="/post/StoreHouseController/queryStoreHouseByList" val="获取仓库信息" allUse="1">
 		<property id="houseName" name="name" ref="" var="仓库名称"></property>
+		<property id="limit" name="limit" ref="required,num" var="分页参数,每页多少条数据" />
+		<property id="page" name="page" ref="required,num" var="分页参数,第几页"/>
 	</url>
 	<url id="storehouse002" path="/post/StoreHouseController/insertStoreHouse" val="添加仓库信息" allUse="1">
 		<property id="houseName" name="name" ref="required" var="仓库名称"></property>
@@ -15,14 +17,14 @@
 		<property id="truckage" name="truckage" ref="" var="搬运费"></property>
 		<property id="remark" name="remark" ref="" var="描述"></property>
 		<property id="principal" name="principal" ref="" var="负责人"></property>
-		<property id="is_default" name="isDefault" ref="required" var="是否默认"></property>
+		<property id="isDefault" name="is_default" ref="required" var="是否默认"></property>
 	</url>
 	<url id="storehouse003" path="/post/StoreHouseController/queryStoreHouseById" val="查询单个仓库信息，用于数据回显" allUse="2">
 		<property id="rowId" name="id" ref="required" var="仓库ID"></property>
 	</url>
 	<url id="storehouse004" path="/post/StoreHouseController/deleteStoreHouseById" val="删除仓库信息" allUse="1">
 		<property id="rowId" name="id" ref="required" var="仓库ID"></property>
-		<property id="houseName" name="name" ref="required" var="仓库名称"></property>
+		<property id="deleteFlag" name="delete_Flag" ref="required" var="是否删除"></property>
 	</url>
 	<url id="storehouse005" path="/post/StoreHouseController/editStoreHouseById" val="编辑仓库信息" allUse="1">
 		<property id="rowId" name="id" ref="required" var="仓库ID"></property>
@@ -32,11 +34,11 @@
 		<property id="truckage" name="truckage" ref="" var="搬运费"></property>
 		<property id="remark" name="remark" ref="" var="描述"></property>
 		<property id="principal" name="principal" ref="" var="负责人"></property>
-		<property id="is_default" name="isDefault" ref="required" var="是否默认"></property>
+		<property id="isDefault" name="is_default" ref="required" var="是否默认"></property>
 	</url>
 	<url id="storehouse006" path="/post/StoreHouseController/editStoreHouseByDefault" val="设置仓库为默认状态" allUse="1">
 		<property id="rowId" name="id" ref="required" var="仓库ID"></property>
-		<property id="houseName" name="name" ref="required" var="仓库名称"></property>
+		<property id="isDefault" name="is_default" ref="required" var="是否默认"></property>
 	</url>
 	<!-- 仓库管理结束 -->
 </controller>
\ No newline at end of file
diff --git a/erp-web/src/main/resources/template/js/storehouse/storehouseadd.js b/erp-web/src/main/resources/template/js/storehouse/storehouseadd.js
index 66d1ff90..93c3159b 100644
--- a/erp-web/src/main/resources/template/js/storehouse/storehouseadd.js
+++ b/erp-web/src/main/resources/template/js/storehouse/storehouseadd.js
@@ -22,7 +22,7 @@ layui.config({
                     address: $("#address").val(),
                     warehousing: $("#warehousing").val(),
                     truckage: $("#truckage").val(),
-                    is_default: $("input[name='is_default']:checked").val(),
+                    isDefault: $("input[name='isDefault']:checked").val(),
                     principal: $("#principal").val(),
                     remark: $("#remark").val(),
                 };
diff --git a/erp-web/src/main/resources/template/js/storehouse/storehouseedit.js b/erp-web/src/main/resources/template/js/storehouse/storehouseedit.js
index 8fed9f37..4d912dda 100644
--- a/erp-web/src/main/resources/template/js/storehouse/storehouseedit.js
+++ b/erp-web/src/main/resources/template/js/storehouse/storehouseedit.js
@@ -20,7 +20,7 @@ layui.config({
             },
             ajaxSendAfter:function(json){
                 //设置是否默认
-                $("input:radio[name=is_default][value=" + json.bean.is_default + "]").attr("checked", true);
+                $("input:radio[name=isDefault][value=" + json.bean.isDefault + "]").attr("checked", true);
                 form.render();
                 form.on('submit(formEditBean)', function (data) {
                     //表单验证
@@ -35,7 +35,7 @@ layui.config({
                             address: $("#address").val(),
                             warehousing: $("#warehousing").val(),
                             truckage: $("#truckage").val(),
-                            is_default: $("input[name='is_default']:checked").val(),
+                            isDefault: $("input[name='isDefault']:checked").val(),
                             principal: $("#principal").val(),
                             remark: $("#remark").val(),
                         };
diff --git a/erp-web/src/main/resources/template/js/storehouse/storehouselist.js b/erp-web/src/main/resources/template/js/storehouse/storehouselist.js
index 308968b2..cf4a77b3 100644
--- a/erp-web/src/main/resources/template/js/storehouse/storehouselist.js
+++ b/erp-web/src/main/resources/template/js/storehouse/storehouselist.js
@@ -29,10 +29,10 @@ layui.config({
             { field: 'warehousing', title: '仓储费', width: 130},
             { field: 'truckage', title: '搬运费', width: 130},
             { field: 'principal', title: '负责人', width: 150},
-            { field: 'is_default', title: '是否默认', width: 100, templet: function(d){
-                    if(d.is_default == '1'){
+            { field: 'isDefault', title: '是否默认', width: 100, templet: function(d){
+                    if(d.isDefault == '1'){
                         return "是";
-                    }else if(d.is_default == '2'){
+                    }else if(d.isDefault == '2'){
                         return "否";
                     }else{
                         return "参数错误";
@@ -87,11 +87,11 @@ layui.config({
     function deleteHouse(data){
         var params = {
             rowId: data.id,
-            houseName: data.houseName
+            deleteFlag: '1'
         };
         AjaxPostUtil.request({url:reqBasePath + "storehouse004", params:params, type:'json', callback:function(json){
             if(json.returnCode == 0){
-                winui.window.msg("设置成功。", {icon: 1,time: 2000});
+                winui.window.msg("删除成功。", {icon: 1,time: 2000});
                 loadTable();
             }else{
                 winui.window.msg(json.returnMessage, {icon: 2,time: 2000});
@@ -103,11 +103,11 @@ layui.config({
     function defaultHouse(data){
         var params = {
             rowId: data.id,
-            houseName: data.houseName,
+            isDefault: "1",
         };
         AjaxPostUtil.request({url:reqBasePath + "storehouse006", params:params, type:'json', callback:function(json){
                 if(json.returnCode == 0){
-                    winui.window.msg("该仓库已删除成功。", {icon: 1,time: 2000});
+                    winui.window.msg("设置成功。", {icon: 1,time: 2000});
                     loadTable();
                 }else{
                     winui.window.msg(json.returnMessage, {icon: 2,time: 2000});
diff --git a/erp-web/src/main/resources/template/tpl/storehouse/storehouseadd.html b/erp-web/src/main/resources/template/tpl/storehouse/storehouseadd.html
index e0df1533..9a57d4d4 100644
--- a/erp-web/src/main/resources/template/tpl/storehouse/storehouseadd.html
+++ b/erp-web/src/main/resources/template/tpl/storehouse/storehouseadd.html
@@ -10,7 +10,7 @@
 <body>
 <div style="padding:20px; margin:0 auto;">
     <form class="layui-form" action="" id="showForm">
-        <div class="layui-form-item layui-col-xs12">
+        <div class="layui-form-item layui-col-xs6">
             <label class="layui-form-label">仓库名称<i class="red">*</i></label>
             <div class="layui-input-block">
                 <input type="text" id="houseName" name="houseName" win-verify="required" placeholder="请输入仓库名称" class="layui-input" maxlength="25"/>
@@ -22,18 +22,20 @@
                 <input type="text" id="address" name="address" placeholder="请输入仓库地址" class="layui-input"/>
             </div>
         </div>
-        <div class="layui-form-item layui-col-xs12">
+        <div class="layui-form-item layui-col-xs6">
             <label class="layui-form-label">仓储费</label>
             <div class="layui-input-block">
                 <input type="text" id="warehousing" name="warehousing" lay-verify="warehousing" placeholder="请输入仓储费" class="layui-input"/>
             </div>
         </div>
-        <div class="layui-form-item layui-col-xs12">
+        <div class="layui-form-item layui-col-xs6">
             <label class="layui-form-label">搬运费</label>
             <div class="layui-input-block">
                 <input type="text" id="truckage" name="truckage" lay-verify="truckage" placeholder="请输入搬运费" class="layui-input"/>
             </div>
         </div>
+
+
         <div class="layui-form-item layui-col-xs12">
             <label class="layui-form-label">负责人</label>
             <div class="layui-input-block">
@@ -43,14 +45,14 @@
         <div class="layui-form-item layui-col-xs12">
             <label class="layui-form-label">是否默认<i class="red">*</i></label>
             <div class="layui-input-block winui-radio">
-                <input type="radio" name="is_default" value="1" title="是" checked="checked"/>
-                <input type="radio" name="is_default" value="2" title="否" />
+                <input type="radio" name="isDefault" value="1" title="是" checked="checked"/>
+                <input type="radio" name="isDefault" value="2" title="否" />
             </div>
         </div>
         <div class="layui-form-item layui-col-xs12">
             <label class="layui-form-label">备注</label>
             <div class="layui-input-block">
-                <textarea id="remark" name="remark" placeholder="请输入备注信息" class="layui-input" maxlength="200"></textarea>
+                <textarea id="remark" name="remark" placeholder="请输入备注信息" maxlength="200" class="layui-textarea" style="height: 100px;"></textarea>
             </div>
         </div>
 
diff --git a/erp-web/src/main/resources/template/tpl/storehouse/storehouseeditTemplate.tpl b/erp-web/src/main/resources/template/tpl/storehouse/storehouseeditTemplate.tpl
index 6dcb7de1..7bca14ff 100644
--- a/erp-web/src/main/resources/template/tpl/storehouse/storehouseeditTemplate.tpl
+++ b/erp-web/src/main/resources/template/tpl/storehouse/storehouseeditTemplate.tpl
@@ -1,5 +1,5 @@
 {{#bean}}
-    <div class="layui-form-item layui-col-xs12">
+    <div class="layui-form-item layui-col-xs6">
         <label class="layui-form-label">仓库名称<i class="red">*</i></label>
         <div class="layui-input-block">
             <input type="text" id="houseName" name="houseName" win-verify="required" placeholder="请输入仓库名称" class="layui-input" maxlength="25" value="{{houseName}}"/>
@@ -11,13 +11,13 @@
             <input type="text" id="address" name="address" placeholder="请输入仓库地址" class="layui-input" value="{{address}}"/>
         </div>
     </div>
-    <div class="layui-form-item layui-col-xs12">
+    <div class="layui-form-item layui-col-xs6">
         <label class="layui-form-label">仓储费</label>
         <div class="layui-input-block">
             <input type="text" id="warehousing" name="warehousing" lay-verify="warehousing" placeholder="请输入仓储费" class="layui-input" value="{{warehousing}}"/>
         </div>
     </div>
-    <div class="layui-form-item layui-col-xs12">
+    <div class="layui-form-item layui-col-xs6">
         <label class="layui-form-label">搬运费</label>
         <div class="layui-input-block">
             <input type="text" id="truckage" name="truckage" lay-verify="truckage" placeholder="请输入搬运费" class="layui-input" value="{{truckage}}"/>
@@ -32,14 +32,14 @@
     <div class="layui-form-item layui-col-xs12">
         <label class="layui-form-label">是否默认<i class="red">*</i></label>
         <div class="layui-input-block winui-radio">
-            <input type="radio" name="is_default" value="1" title="是" />
-            <input type="radio" name="is_default" value="2" title="否" />
+            <input type="radio" name="isDefault" value="1" title="是" />
+            <input type="radio" name="isDefault" value="2" title="否" />
         </div>
     </div>
     <div class="layui-form-item layui-col-xs12">
         <label class="layui-form-label">备注</label>
         <div class="layui-input-block">
-            <textarea id="remark" name="remark" placeholder="请输入备注信息" class="layui-input" maxlength="200">{{remark}}</textarea>
+            <textarea id="remark" name="remark" placeholder="请输入备注信息" maxlength="200" class="layui-textarea" style="height: 100px;">{{remark}}</textarea>
         </div>
     </div>
 
diff --git a/erp-web/src/main/resources/template/tpl/storehouse/storehouselist.html b/erp-web/src/main/resources/template/tpl/storehouse/storehouselist.html
index f362e247..1021cb82 100644
--- a/erp-web/src/main/resources/template/tpl/storehouse/storehouselist.html
+++ b/erp-web/src/main/resources/template/tpl/storehouse/storehouselist.html
@@ -37,7 +37,7 @@
         {{# if(auth('1568523987812')){ }}
         <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="delete">删除</a>
         {{# } }}
-        {{# if(d.is_default == 2 && auth('1568526024398')){ }}
+        {{# if(d.isDefault == 2 && auth('1568526024398')){ }}
         <a class="layui-btn layui-btn-xs" lay-event="default">设置默认</a>
         {{# } }}
     </script>