仓库管理的新增

src/main/java/com/boco/nbd/wios/manage/entity/bo/Warehouse.java

 package com.boco.nbd.wios.manage.entity.bo;
 
 import com.ihidea.core.base.CoreEntity;
+import io.swagger.annotations.ApiModelProperty;
 
 import java.util.Date;
 
@@ -36,6 +37,14 @@ public class Warehouse extends CoreEntity {
 
     private Integer isEnabled;
 
+    private String superiorWarehouse;
+
+    private String receivePeople;
+
+    private String receivePhone;
+
+    private String receiveAddress;
+
     public String getId() {
         return id;
     }
@@ -148,6 +157,38 @@ public class Warehouse extends CoreEntity {
         this.isEnabled = isEnabled;
     }
 
+    public String getSuperiorWarehouse() {
+        return superiorWarehouse;
+    }
+
+    public void setSuperiorWarehouse(String superiorWarehouse) {
+        this.superiorWarehouse = superiorWarehouse;
+    }
+
+    public String getReceivePeople() {
+        return receivePeople;
+    }
+
+    public void setReceivePeople(String receivePeople) {
+        this.receivePeople = receivePeople;
+    }
+
+    public String getReceivePhone() {
+        return receivePhone;
+    }
+
+    public void setReceivePhone(String receivePhone) {
+        this.receivePhone = receivePhone;
+    }
+
+    public String getReceiveAddress() {
+        return receiveAddress;
+    }
+
+    public void setReceiveAddress(String receiveAddress) {
+        this.receiveAddress = receiveAddress;
+    }
+
     @Override
     public boolean equals(Object that) {
         if (this == that) {
@@ -161,19 +202,23 @@ public class Warehouse extends CoreEntity {
         }
         Warehouse other = (Warehouse) that;
         return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId()))
-            && (this.getWarehouseLevenId() == null ? other.getWarehouseLevenId() == null : this.getWarehouseLevenId().equals(other.getWarehouseLevenId()))
-            && (this.getName() == null ? other.getName() == null : this.getName().equals(other.getName()))
-            && (this.getArea() == null ? other.getArea() == null : this.getArea().equals(other.getArea()))
-            && (this.getServiceProvider() == null ? other.getServiceProvider() == null : this.getServiceProvider().equals(other.getServiceProvider()))
-            && (this.getWarehouseAttribution() == null ? other.getWarehouseAttribution() == null : this.getWarehouseAttribution().equals(other.getWarehouseAttribution()))
-            && (this.getMsg() == null ? other.getMsg() == null : this.getMsg().equals(other.getMsg()))
-            && (this.getStatus() == null ? other.getStatus() == null : this.getStatus().equals(other.getStatus()))
-            && (this.getCreateTime() == null ? other.getCreateTime() == null : this.getCreateTime().equals(other.getCreateTime()))
-            && (this.getCreateAccount() == null ? other.getCreateAccount() == null : this.getCreateAccount().equals(other.getCreateAccount()))
-            && (this.getModifyAccount() == null ? other.getModifyAccount() == null : this.getModifyAccount().equals(other.getModifyAccount()))
-            && (this.getModifyTime() == null ? other.getModifyTime() == null : this.getModifyTime().equals(other.getModifyTime()))
-            && (this.getAppkey() == null ? other.getAppkey() == null : this.getAppkey().equals(other.getAppkey()))
-            && (this.getIsEnabled() == null ? other.getIsEnabled() == null : this.getIsEnabled().equals(other.getIsEnabled()));
+                && (this.getWarehouseLevenId() == null ? other.getWarehouseLevenId() == null : this.getWarehouseLevenId().equals(other.getWarehouseLevenId()))
+                && (this.getName() == null ? other.getName() == null : this.getName().equals(other.getName()))
+                && (this.getArea() == null ? other.getArea() == null : this.getArea().equals(other.getArea()))
+                && (this.getServiceProvider() == null ? other.getServiceProvider() == null : this.getServiceProvider().equals(other.getServiceProvider()))
+                && (this.getWarehouseAttribution() == null ? other.getWarehouseAttribution() == null : this.getWarehouseAttribution().equals(other.getWarehouseAttribution()))
+                && (this.getMsg() == null ? other.getMsg() == null : this.getMsg().equals(other.getMsg()))
+                && (this.getStatus() == null ? other.getStatus() == null : this.getStatus().equals(other.getStatus()))
+                && (this.getCreateTime() == null ? other.getCreateTime() == null : this.getCreateTime().equals(other.getCreateTime()))
+                && (this.getCreateAccount() == null ? other.getCreateAccount() == null : this.getCreateAccount().equals(other.getCreateAccount()))
+                && (this.getModifyAccount() == null ? other.getModifyAccount() == null : this.getModifyAccount().equals(other.getModifyAccount()))
+                && (this.getModifyTime() == null ? other.getModifyTime() == null : this.getModifyTime().equals(other.getModifyTime()))
+                && (this.getAppkey() == null ? other.getAppkey() == null : this.getAppkey().equals(other.getAppkey()))
+                && (this.getSuperiorWarehouse() == null ? other.getSuperiorWarehouse() == null : this.getSuperiorWarehouse().equals(other.getSuperiorWarehouse()))
+                && (this.getReceivePeople() == null ? other.getReceivePeople() == null : this.getReceivePeople().equals(other.getReceivePeople()))
+                && (this.getReceivePhone() == null ? other.getReceivePhone() == null : this.getReceivePhone().equals(other.getReceivePhone()))
+                && (this.getReceiveAddress() == null ? other.getReceiveAddress() == null : this.getReceiveAddress().equals(other.getReceiveAddress()))
+                && (this.getIsEnabled() == null ? other.getIsEnabled() == null : this.getIsEnabled().equals(other.getIsEnabled()));
     }
 
     @Override
@@ -194,6 +239,10 @@ public class Warehouse extends CoreEntity {
         result = prime * result + ((getModifyTime() == null) ? 0 : getModifyTime().hashCode());
         result = prime * result + ((getAppkey() == null) ? 0 : getAppkey().hashCode());
         result = prime * result + ((getIsEnabled() == null) ? 0 : getIsEnabled().hashCode());
+        result = prime * result + ((getSuperiorWarehouse() == null) ? 0 : getSuperiorWarehouse().hashCode());
+        result = prime * result + ((getReceivePeople() == null) ? 0 : getReceivePeople().hashCode());
+        result = prime * result + ((getReceivePhone() == null) ? 0 : getReceivePhone().hashCode());
+        result = prime * result + ((getReceiveAddress() == null) ? 0 : getReceiveAddress().hashCode());
         return result;
     }
 }
\ No newline at end of file

src/main/java/com/boco/nbd/wios/manage/entity/dto/WarehouseSaveQuery.java

@@ -45,6 +45,14 @@ public class WarehouseSaveQuery {
 
     @ApiModelProperty(value = "用户ID",required = true)
     private String accountId;
+    @ApiModelProperty(value = "上级仓库")
+    private String superiorWarehouse;
+    @ApiModelProperty(value = "收件人")
+    private String receivePeople;
+    @ApiModelProperty(value = "收件电话")
+    private String receivePhone;
+    @ApiModelProperty(value = "收件地址")
+    private String receiveAddress;
 
     public String getId() {
         return id;
@@ -126,4 +134,36 @@ public class WarehouseSaveQuery {
     public void setAccountId(String accountId) {
         this.accountId = accountId;
     }
+
+    public String getSuperiorWarehouse() {
+        return superiorWarehouse;
+    }
+
+    public void setSuperiorWarehouse(String superiorWarehouse) {
+        this.superiorWarehouse = superiorWarehouse;
+    }
+
+    public String getReceivePeople() {
+        return receivePeople;
+    }
+
+    public void setReceivePeople(String receivePeople) {
+        this.receivePeople = receivePeople;
+    }
+
+    public String getReceivePhone() {
+        return receivePhone;
+    }
+
+    public void setReceivePhone(String receivePhone) {
+        this.receivePhone = receivePhone;
+    }
+
+    public String getReceiveAddress() {
+        return receiveAddress;
+    }
+
+    public void setReceiveAddress(String receiveAddress) {
+        this.receiveAddress = receiveAddress;
+    }
 }

src/main/resources/mybatis/mapper/def/common/SupplierMapper.xml

@@ -354,7 +354,7 @@
         a.account as accountName from t_supplier t
         left join wb_account a on a.id=t.account_id
         <if test="hasContract != null"><!-- 是否签了合同 -->
-            left join t_supplier_contract sc on sc.supplier_id=t.id
+            left join T_SUPPLIER_CONTRACT sc on sc.supplier_id=t.id
             <if test="hasContract == 1">
                 and sc.status=2
             </if>

src/main/resources/mybatis/mapper/extdb/common/WarehouseMapperEx.xml

@@ -59,9 +59,9 @@
 
 
     <insert id="insertWarehouse" parameterType="com.boco.nbd.wios.manage.entity.bo.Warehouse">
-        insert  into t_warehouse(id,appkey,warehouse_leven_id,name,area,service_provider,warehouse_attribution,msg,status,create_time,create_account,modify_account,modify_time,is_enabled)
-        values (#{id},#{appkey},#{warehouseLevenId},#{name},#{area},#{serviceProvider},#{warehouseAttribution},#{msg},#{status},#{createTime},#{createAccount},#{modifyAccount},#{modifyTime},#{isEnabled})
-        ON DUPLICATE KEY UPDATE  warehouse_leven_id = values(warehouse_leven_id),name = values(name),area=values(area),service_provider = values(service_provider),warehouse_attribution = values(warehouse_attribution),msg = values(msg),is_enabled = values(is_enabled)
+        insert  into t_warehouse(id,appkey,warehouse_leven_id,name,area,service_provider,warehouse_attribution,msg,status,create_time,create_account,modify_account,modify_time,is_enabled,superior_warehouse,receive_people,receive_phone,receive_address)
+        values (#{id},#{appkey},#{warehouseLevenId},#{name},#{area},#{serviceProvider},#{warehouseAttribution},#{msg},#{status},#{createTime},#{createAccount},#{modifyAccount},#{modifyTime},#{isEnabled},#{superiorWarehouse},#{receivePeople},#{receivePhone},#{receiveAddress})
+        ON DUPLICATE KEY UPDATE  warehouse_leven_id = values(warehouse_leven_id),name = values(name),area=values(area),service_provider = values(service_provider),warehouse_attribution = values(warehouse_attribution),msg = values(msg),is_enabled = values(is_enabled),superior_warehouse = values(superior_warehouse),receive_people = values(receive_people),receive_phone = values(receive_phone),receive_address = values(receive_address)
     </insert>