优化代码

java110-bean/src/main/java/com/java110/po/store/StorehousePo.java

@@ -6,8 +6,6 @@ import java.util.Date;
 public class StorehousePo implements Serializable {
 
     private String shDesc;
-    private String shType;
-    private String shObjId;
     private String shId;
     private String shName;
     private String storeId;
@@ -30,21 +28,7 @@ public class StorehousePo implements Serializable {
         this.shDesc = shDesc;
     }
 
-    public String getShType() {
-        return shType;
-    }
-
-    public void setShType(String shType) {
-        this.shType = shType;
-    }
 
-    public String getShObjId() {
-        return shObjId;
-    }
-
-    public void setShObjId(String shObjId) {
-        this.shObjId = shObjId;
-    }
 
     public String getShId() {
         return shId;

service-api/src/main/java/com/java110/api/bmo/storehouse/impl/StorehouseBMOImpl.java

@@ -29,11 +29,7 @@ public class StorehouseBMOImpl extends ApiBaseBMO implements IStorehouseBMO {
 
         paramInJson.put("shId", "-1");
         StorehousePo storehousePo = BeanConvertUtil.covertBean(paramInJson, StorehousePo.class);
-        if (StorehouseDto.SH_TYPE_GROUP.equals(storehousePo.getShType())) {
-            storehousePo.setShObjId(storehousePo.getStoreId());
-        } else {
-            storehousePo.setShObjId(paramInJson.getString("communityId"));
-        }
+
         super.insert(dataFlowContext, storehousePo, BusinessTypeConstant.BUSINESS_TYPE_SAVE_STOREHOUSE);
     }
 

service-store/src/main/java/com/java110/store/cmd/resourceStore/SaveStorehouseCmd.java

@@ -18,6 +18,7 @@ package com.java110.store.cmd.resourceStore;
 import com.alibaba.fastjson.JSONObject;
 import com.java110.core.annotation.Java110Cmd;
 import com.java110.core.annotation.Java110Transactional;
+import com.java110.core.context.CmdContextUtils;
 import com.java110.core.context.ICmdDataFlowContext;
 import com.java110.core.event.cmd.Cmd;
 import com.java110.core.event.cmd.CmdEvent;
@@ -60,18 +61,31 @@ public class SaveStorehouseCmd extends Cmd {
     @Override
     public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
         Assert.hasKeyAndValue(reqJson, "shName", "请求报文中未包含shName");
-        Assert.hasKeyAndValue(reqJson, "shType", "请求报文中未包含shType");
-        Assert.hasKeyAndValue(reqJson, "storeId", "请求报文中未包含storeId");
+        Assert.hasKeyAndValue(reqJson, "purchaseSwitch", "请求报文中未包含shName");
+        Assert.hasKeyAndValue(reqJson, "useSwitch", "请求报文中未包含shName");
+        Assert.hasKeyAndValue(reqJson, "allocationSwitch", "请求报文中未包含shName");
+        String storeId = CmdContextUtils.getStoreId(cmdDataFlowContext);
+        reqJson.put("storeId", storeId);
 
         StorehouseDto storehouseDto = new StorehouseDto();
         storehouseDto.setShName(reqJson.getString("shName"));
         storehouseDto.setStoreId(reqJson.getString("storeId"));
-        storehouseDto.setShType(reqJson.getString("shType"));
-        int flag  =  storehouseInnerServiceSMOImpl.queryStorehousesCount(storehouseDto);
-
-        if(flag > 0){
+        int flag = storehouseInnerServiceSMOImpl.queryStorehousesCount(storehouseDto);
+        if (flag > 0) {
             throw new IllegalArgumentException("已存在仓库");
         }
+
+        if ("ON".equals(reqJson.getString("purchaseSwitch"))) {
+            Assert.hasKeyAndValue(reqJson, "purchaseRafId", "请求报文中未包含采购流程");
+        }
+
+        if ("ON".equals(reqJson.getString("useSwitch"))) {
+            Assert.hasKeyAndValue(reqJson, "useRafId", "请求报文中未包含领用流程");
+        }
+
+        if ("ON".equals(reqJson.getString("allocationSwitch"))) {
+            Assert.hasKeyAndValue(reqJson, "allocationRafId", "请求报文中未包含调拨流程");
+        }
     }
 
     @Override
@@ -81,11 +95,6 @@ public class SaveStorehouseCmd extends Cmd {
         StorehousePo storehousePo = BeanConvertUtil.covertBean(reqJson, StorehousePo.class);
         storehousePo.setShId(GenerateCodeFactory.getGeneratorId(CODE_PREFIX_ID));
 
-        if (StorehouseDto.SH_TYPE_GROUP.equals(storehousePo.getShType())) {
-            storehousePo.setShObjId(storehousePo.getStoreId());
-        } else {
-            storehousePo.setShObjId(reqJson.getString("communityId"));
-        }
         int flag = storehouseV1InnerServiceSMOImpl.saveStorehouse(storehousePo);
 
         if (flag < 1) {