存放地点编码调整

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmwarehouse/ScmWarehouse.java

@@ -57,9 +57,6 @@ public class ScmWarehouse extends BaseEntity {
 	@ApiModelProperty("使用组织sid")
     private String useOrgSid; // 使用组织sid
     
-	@ApiModelProperty("编码")
-    private String warehouseCode; // 编码
-    
 	@ApiModelProperty("名称")
     private String warehouseName; // 名称
     

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmwarehouse/ScmWarehouseDto.java

@@ -56,9 +56,6 @@ public class ScmWarehouseDto implements Dto {
 	@ApiModelProperty("使用组织sid")
     private String useOrgSid; // 使用组织sid
     
-	@ApiModelProperty("编码")
-    private String warehouseCode; // 编码
-    
 	@ApiModelProperty("名称")
     private String warehouseName; // 名称
     

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmwarehouse/ScmWarehouseQuery.java

@@ -52,8 +52,8 @@ public class ScmWarehouseQuery implements Query {
 	@ApiModelProperty("使用组织sid")
     private String useOrgSid; // 使用组织sid
 
-	@ApiModelProperty("编码")
-    private String warehouseCode; // 编码
+    @ApiModelProperty("库存地点编号")
+    private String gressionCode;
     
 	@ApiModelProperty("名称")
     private String warehouseName; // 名称

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmwarehouse/ScmWarehouseVo.java

@@ -58,9 +58,6 @@ public class ScmWarehouseVo implements Vo {
 	@ApiModelProperty("使用组织sid")
     private String[][] useOrgSid; // 使用组织sid
     
-	@ApiModelProperty("编码")
-    private String warehouseCode; // 编码
-    
 	@ApiModelProperty("名称")
     private String warehouseName; // 名称
     

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinbound/ScmVehicleInboundMapper.xml

@@ -17,7 +17,7 @@
                sw.warehouseContract,
                DATE_FORMAT(si.inboundDate, '%Y-%m-%d')    as inboundDate
         from scm_vehicle_inbound si
-                 left join scm_warehouse sw on si.warehouseCode = sw.warehouseCode
+                 left join scm_warehouse sw on si.warehouseCode = sw.gressionCode
             ${ew.customSqlSegment}
     </select>
 

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmwarehouse/ScmWarehouseService.java

@@ -64,8 +64,8 @@ public class ScmWarehouseService extends MybatisBaseService<ScmWarehouseMapper,
             qw.eq("useOrgSid", query.getUseOrgSid());
         }
 
-        if (StringUtils.isNotBlank(query.getWarehouseCode())) {
-            qw.eq("warehouseCode", query.getWarehouseCode());
+        if (StringUtils.isNotBlank(query.getGressionCode())) {
+            qw.eq("gressionCode", query.getGressionCode());
         }
 
         if (StringUtils.isNotBlank(query.getWarehouseName())) {
@@ -107,7 +107,6 @@ public class ScmWarehouseService extends MybatisBaseService<ScmWarehouseMapper,
     public void saveOrUpdateDto(ScmWarehouseDto dto) {
         ScmWarehouse entity = new ScmWarehouse();
         dto.fillEntity(entity);
-        entity.setWarehouseCode(dto.getGressionCode());
         this.saveOrUpdate(entity);
     }