物品编码 设置为可空

Api/src/main/java/com/java110/api/listener/resourceStore/SaveResourceStoreListener.java

@@ -30,7 +30,7 @@ public class SaveResourceStoreListener extends AbstractServiceApiListener {
 
         Assert.hasKeyAndValue(reqJson, "resName", "必填，请填写物品名称");
         Assert.hasKeyAndValue(reqJson, "storeId", "必填，请填写商户信息");
-        Assert.hasKeyAndValue(reqJson, "resCode", "必填，请填写物品编码");
+        //Assert.hasKeyAndValue(reqJson, "resCode", "必填，请填写物品编码");
         Assert.hasKeyAndValue(reqJson, "price", "必填，请填写物品价格");
         Assert.hasKeyAndValue(reqJson, "stock", "必填，请填写物品库存");
         Assert.hasKeyAndValue(reqJson, "description", "必填，请填写描述");
@@ -92,6 +92,7 @@ public class SaveResourceStoreListener extends AbstractServiceApiListener {
         JSONObject businessResourceStore = new JSONObject();
         businessResourceStore.putAll(paramInJson);
         businessResourceStore.put("resId", "-1");
+        businessResourceStore.put("stock", "0");
         //计算 应收金额
         business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessResourceStore", businessResourceStore);
         return business;

Api/src/main/java/com/java110/api/listener/resourceStore/UpdateResourceStoreListener.java

@@ -27,7 +27,7 @@ public class UpdateResourceStoreListener extends AbstractServiceApiListener {
 
         Assert.hasKeyAndValue(reqJson, "resId", "物品ID不能为空");
         Assert.hasKeyAndValue(reqJson, "resName", "必填，请填写物品名称");
-        Assert.hasKeyAndValue(reqJson, "resCode", "必填，请填写物品编码");
+        //Assert.hasKeyAndValue(reqJson, "resCode", "必填，请填写物品编码");
         Assert.hasKeyAndValue(reqJson, "price", "必填，请填写物品价格");
         Assert.hasKeyAndValue(reqJson, "stock", "必填，请填写物品库存");
         Assert.hasKeyAndValue(reqJson, "description", "必填，请填写描述");

WebService/src/main/java/com/java110/web/smo/resourceStore/impl/AddResourceStoreSMOImpl.java

@@ -32,7 +32,7 @@ public class AddResourceStoreSMOImpl extends AbstractComponentSMO implements IAd
 
         //Assert.hasKeyAndValue(paramIn, "xxx", "xxx");
         Assert.hasKeyAndValue(paramIn, "resName", "必填，请填写物品名称");
-        Assert.hasKeyAndValue(paramIn, "resCode", "必填，请填写物品编码");
+        //Assert.hasKeyAndValue(paramIn, "resCode", "必填，请填写物品编码");
         Assert.hasKeyAndValue(paramIn, "price", "必填，请填写物品价格");
         Assert.hasKeyAndValue(paramIn, "stock", "必填，请填写物品库存");
         Assert.hasKeyAndValue(paramIn, "description", "必填，请填写描述");

WebService/src/main/java/com/java110/web/smo/resourceStore/impl/EditResourceStoreSMOImpl.java

@@ -1,5 +1,6 @@
 package com.java110.web.smo.resourceStore.impl;
 
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.java110.core.context.IPageData;
 import com.java110.entity.component.ComponentValidateResult;
@@ -10,10 +11,14 @@ import com.java110.web.core.AbstractComponentSMO;
 import com.java110.web.smo.resourceStore.IEditResourceStoreSMO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpMethod;
+import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
 import org.springframework.web.client.RestTemplate;
 
+import java.util.HashMap;
+import java.util.Map;
+
 /**
  * 添加物品管理服务实现类
  * add by wuxw 2019-06-30
@@ -31,7 +36,7 @@ public class EditResourceStoreSMOImpl extends AbstractComponentSMO implements IE
 
         Assert.hasKeyAndValue(paramIn, "resId", "物品ID不能为空");
         Assert.hasKeyAndValue(paramIn, "resName", "必填，请填写物品名称");
-        Assert.hasKeyAndValue(paramIn, "resCode", "必填，请填写物品编码");
+        //Assert.hasKeyAndValue(paramIn, "resCode", "必填，请填写物品编码");
         Assert.hasKeyAndValue(paramIn, "price", "必填，请填写物品价格");
         Assert.hasKeyAndValue(paramIn, "stock", "必填，请填写物品库存");
         Assert.hasKeyAndValue(paramIn, "description", "必填，请填写描述");
@@ -48,6 +53,27 @@ public class EditResourceStoreSMOImpl extends AbstractComponentSMO implements IE
         ComponentValidateResult result = super.validateStoreStaffCommunityRelationship(pd, restTemplate);
         paramIn.put("storeId",result.getStoreId());
 
+        Map newParamIn = new HashMap();
+        newParamIn.put("storeId",result.getStoreId());
+        newParamIn.put("resId",paramIn.getString("resId"));
+
+        String apiUrl = ServiceConstant.SERVICE_API_URL + "/api/resourceStore.listResourceStores" + mapToUrlParam(paramIn);
+
+
+        responseEntity = this.callCenterService(restTemplate, pd, "",
+                apiUrl,
+                HttpMethod.GET);
+
+        if(responseEntity.getStatusCode() != HttpStatus.OK){
+            return responseEntity;
+        }
+
+        JSONArray resourceStores = JSONObject.parseObject(responseEntity.getBody()).getJSONArray("resourceStores");
+
+        Assert.isOne(resourceStores,"查询物品数据存在多条或0条");
+
+        paramIn.put("stock", resourceStores.getJSONObject(0).getString("stock"));
+
         responseEntity = this.callCenterService(restTemplate, pd, paramIn.toJSONString(),
                 ServiceConstant.SERVICE_API_URL + "/api/resourceStore.updateResourceStore",
                 HttpMethod.POST);

WebService/src/main/resources/components/resourceStorePackage/add-resourceStore/addResourceStore.html

@@ -1,8 +1,9 @@
-<div id = "addResourceStoreModel" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="true" >
+<div id="addResourceStoreModel" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel"
+     aria-hidden="true">
     <div class="modal-dialog modal-lg">
         <div class="modal-content">
             <div class="modal-body">
-                <h3 class="m-t-none m-b ">添加物品管理</h3>
+                <h3 class="m-t-none m-b ">添加物品</h3>
                 <div class="ibox-content">
                     <div>
                         <div>
@@ -20,38 +21,40 @@
                             </div>-->
 
                             <div class="form-group row">
-         <label class="col-sm-2 col-form-label">物品名称</label>
-         <div class="col-sm-10">
-           <input v-model="addResourceStoreInfo.resName"                   type="text" placeholder="必填，请填写物品名称" class="form-control">
-         </div>
-</div>
-<div class="form-group row">
-         <label class="col-sm-2 col-form-label">物品编码</label>
-         <div class="col-sm-10">
-           <input v-model="addResourceStoreInfo.resCode"                   type="text" placeholder="必填，请填写物品编码" class="form-control">
-         </div>
-</div>
-<div class="form-group row">
-         <label class="col-sm-2 col-form-label">物品价格</label>
-         <div class="col-sm-10">
-           <input v-model="addResourceStoreInfo.price"                   type="text" placeholder="必填，请填写物品价格" class="form-control">
-         </div>
-</div>
-<div class="form-group row">
-         <label class="col-sm-2 col-form-label">物品库存</label>
-         <div class="col-sm-10">
-           <input v-model="addResourceStoreInfo.stock"                   type="text" placeholder="必填，请填写物品库存" class="form-control">
-         </div>
-</div>
-<div class="form-group row">
-         <label class="col-sm-2 col-form-label">描述</label>
-         <div class="col-sm-10">
-<textarea  placeholder="必填，请填写描述" class="form-control" v-model="addResourceStoreInfo.description"></textarea>         </div>
-</div>
+                                <label class="col-sm-2 col-form-label">物品名称</label>
+                                <div class="col-sm-10">
+                                    <input v-model="addResourceStoreInfo.resName" type="text" placeholder="必填，请填写物品名称"
+                                           class="form-control">
+                                </div>
+                            </div>
+                            <div class="form-group row">
+                                <label class="col-sm-2 col-form-label">物品编码</label>
+                                <div class="col-sm-10">
+                                    <input v-model="addResourceStoreInfo.resCode" type="text" placeholder="必填，请填写物品编码"
+                                           class="form-control">
+                                </div>
+                            </div>
+                            <div class="form-group row">
+                                <label class="col-sm-2 col-form-label">物品价格</label>
+                                <div class="col-sm-10">
+                                    <input v-model="addResourceStoreInfo.price" type="text" placeholder="必填，请填写物品价格"
+                                           class="form-control">
+                                </div>
+                            </div>
+                            <div class="form-group row">
+                                <label class="col-sm-2 col-form-label">描述</label>
+                                <div class="col-sm-10">
+                                    <textarea placeholder="选填，请填写描述" class="form-control"
+                                              v-model="addResourceStoreInfo.description"></textarea></div>
+                            </div>
 
                             <div class="ibox-content">
-                                <button class="btn btn-primary float-right" type="button" v-on:click="saveResourceStoreInfo()" ><i class="fa fa-check"></i>&nbsp;保存</button>
-                                <button type="button" class="btn btn-warning float-right" style="margin-right:20px;" data-dismiss="modal">取消</button>
+                                <button class="btn btn-primary float-right" type="button"
+                                        v-on:click="saveResourceStoreInfo()"><i class="fa fa-check"></i>&nbsp;保存
+                                </button>
+                                <button type="button" class="btn btn-warning float-right" style="margin-right:20px;"
+                                        data-dismiss="modal">取消
+                                </button>
                             </div>
                         </div>
                     </div>

WebService/src/main/resources/components/resourceStorePackage/add-resourceStore/addResourceStore.js

@@ -9,10 +9,9 @@
             addResourceStoreInfo:{
                 resId:'',
                 resName:'',
-resCode:'',
-price:'',
-stock:'',
-description:'',
+                resCode:'',
+                price:'',
+                description:'',
 
             }
         },
@@ -42,15 +41,10 @@ description:'',
                         },
                     ],
 'addResourceStoreInfo.resCode':[
-{
-                            limit:"required",
-                            param:"",
-                            errInfo:"物品编码不能为空"
-                        },
  {
-                            limit:"maxin",
-                            param:"2,50",
-                            errInfo:"物品编码必须在2至50字符之间"
+                            limit:"maxLength",
+                            param:"50",
+                            errInfo:"物品编码不能超过50位"
                         },
                     ],
 'addResourceStoreInfo.price':[
@@ -65,24 +59,7 @@ description:'',
                             errInfo:"物品价格格式错误"
                         },
                     ],
-'addResourceStoreInfo.stock':[
-{
-                            limit:"required",
-                            param:"",
-                            errInfo:"物品库存不能为空"
-                        },
- {
-                            limit:"num",
-                            param:"",
-                            errInfo:"物品库存不是有效数字"
-                        },
-                    ],
 'addResourceStoreInfo.description':[
-{
-                            limit:"required",
-                            param:"",
-                            errInfo:"描述不能为空"
-                        },
  {
                             limit:"maxLength",
                             param:"200",
@@ -139,13 +116,11 @@ description:'',
             },
             clearAddResourceStoreInfo:function(){
                 vc.component.addResourceStoreInfo = {
-                                            resName:'',
-resCode:'',
-price:'',
-stock:'',
-description:'',
-
-                                        };
+                        resName:'',
+                        resCode:'',
+                        price:'',
+                        description:'',
+                };
             }
         }
     });

WebService/src/main/resources/components/resourceStorePackage/edit-resourceStore/editResourceStore.html

@@ -1,4 +1,5 @@
-<div id = "editResourceStoreModel" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="true" >
+<div id="editResourceStoreModel" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel"
+     aria-hidden="true">
     <div class="modal-dialog modal-lg">
         <div class="modal-content">
             <div class="modal-body">
@@ -7,38 +8,41 @@
                     <div>
                         <div>
                             <div class="form-group row">
-         <label class="col-sm-2 col-form-label">物品名称</label>
-         <div class="col-sm-10">
-           <input v-model="editResourceStoreInfo.resName"                   type="text" placeholder="必填，请填写物品名称" class="form-control">
-         </div>
-</div>
-<div class="form-group row">
-         <label class="col-sm-2 col-form-label">物品编码</label>
-         <div class="col-sm-10">
-           <input v-model="editResourceStoreInfo.resCode"                   type="text" placeholder="必填，请填写物品编码" class="form-control">
-         </div>
-</div>
-<div class="form-group row">
-         <label class="col-sm-2 col-form-label">物品价格</label>
-         <div class="col-sm-10">
-           <input v-model="editResourceStoreInfo.price"                   type="text" placeholder="必填，请填写物品价格" class="form-control">
-         </div>
-</div>
-<div class="form-group row">
-         <label class="col-sm-2 col-form-label">物品库存</label>
-         <div class="col-sm-10">
-           <input v-model="editResourceStoreInfo.stock"                   type="text" placeholder="必填，请填写物品库存" class="form-control">
-         </div>
-</div>
-<div class="form-group row">
-         <label class="col-sm-2 col-form-label">描述</label>
-         <div class="col-sm-10">
-<textarea  placeholder="必填，请填写描述" class="form-control" v-model="editResourceStoreInfo.description"></textarea>         </div>
-</div>
+                                <label class="col-sm-2 col-form-label">物品名称</label>
+                                <div class="col-sm-10">
+                                    <input v-model="editResourceStoreInfo.resName" type="text" placeholder="必填，请填写物品名称"
+                                           class="form-control">
+                                </div>
+                            </div>
+                            <div class="form-group row">
+                                <label class="col-sm-2 col-form-label">物品编码</label>
+                                <div class="col-sm-10">
+                                    <input v-model="editResourceStoreInfo.resCode" type="text" placeholder="必填，请填写物品编码"
+                                           class="form-control">
+                                </div>
+                            </div>
+                            <div class="form-group row">
+                                <label class="col-sm-2 col-form-label">物品价格</label>
+                                <div class="col-sm-10">
+                                    <input v-model="editResourceStoreInfo.price" type="text" placeholder="必填，请填写物品价格"
+                                           class="form-control">
+                                </div>
+                            </div>
+
+                            <div class="form-group row">
+                                <label class="col-sm-2 col-form-label">描述</label>
+                                <div class="col-sm-10">
+                                    <textarea placeholder="选填，请填写描述" class="form-control"
+                                              v-model="editResourceStoreInfo.description"></textarea></div>
+                            </div>
 
                             <div class="ibox-content">
-                                <button class="btn btn-primary float-right" type="button" v-on:click="editResourceStore()" ><i class="fa fa-check"></i>&nbsp;保存</button>
-                                <button type="button" class="btn btn-warning float-right" style="margin-right:20px;" data-dismiss="modal">取消</button>
+                                <button class="btn btn-primary float-right" type="button"
+                                        v-on:click="editResourceStore()"><i class="fa fa-check"></i>&nbsp;保存
+                                </button>
+                                <button type="button" class="btn btn-warning float-right" style="margin-right:20px;"
+                                        data-dismiss="modal">取消
+                                </button>
                             </div>
                         </div>
                     </div>

WebService/src/main/resources/components/resourceStorePackage/edit-resourceStore/editResourceStore.js

@@ -4,11 +4,10 @@
         data:{
             editResourceStoreInfo:{
                 resId:'',
-resName:'',
-resCode:'',
-price:'',
-stock:'',
-description:'',
+                resName:'',
+                resCode:'',
+                price:'',
+                description:'',
 
             }
         },
@@ -41,15 +40,10 @@ description:'',
                         },
                     ],
 'editResourceStoreInfo.resCode':[
-{
-                            limit:"required",
-                            param:"",
-                            errInfo:"物品编码不能为空"
-                        },
  {
-                            limit:"maxin",
-                            param:"2,50",
-                            errInfo:"物品编码必须在2至50字符之间"
+                            limit:"maxLength",
+                            param:"50",
+                            errInfo:"物品编码不能超过50位"
                         },
                     ],
 'editResourceStoreInfo.price':[
@@ -64,24 +58,8 @@ description:'',
                             errInfo:"物品价格格式错误"
                         },
                     ],
-'editResourceStoreInfo.stock':[
-{
-                            limit:"required",
-                            param:"",
-                            errInfo:"物品库存不能为空"
-                        },
- {
-                            limit:"num",
-                            param:"",
-                            errInfo:"物品库存不是有效数字"
-                        },
-                    ],
+
 'editResourceStoreInfo.description':[
-{
-                            limit:"required",
-                            param:"",
-                            errInfo:"描述不能为空"
-                        },
  {
                             limit:"maxLength",
                             param:"200",
@@ -129,11 +107,10 @@ description:'',
             refreshEditResourceStoreInfo:function(){
                 vc.component.editResourceStoreInfo= {
                   resId:'',
-resName:'',
-resCode:'',
-price:'',
-stock:'',
-description:'',
+                    resName:'',
+                    resCode:'',
+                    price:'',
+                    description:'',
 
                 }
             }