open_platform/ss-common-storage
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

12.19

Browse Source
This commit is contained in:
wangpengfei
2024-12-19 14:50:03 +08:00
parent 2b04e7e364
commit 0e12cf10e5
7 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/yxt/warehouse/apiadmin/WarehouseInfoRest.java
View File

@@ -54,7 +54,7 @@ public class WarehouseInfoRest {
@ApiOperation("保存修改")
@PostMapping("/saveOrUpdate")
public ResultBean<String> saveOrUpdate(@RequestBody WarehouseInfoDto dto) {
public ResultBean<WarehouseInfo> saveOrUpdate(@RequestBody WarehouseInfoDto dto) {
return wmsWarehouseService.saveOrUpdate(dto);
}

2
src/main/java/com/yxt/warehouse/biz/warehouseinfo/WarehouseInfoDto.java
View File

@@ -21,6 +21,8 @@ public class WarehouseInfoDto implements Dto {
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date modifyTime;
private String remarks;
private String createBySid;
private String updateBySid;
private Integer isEnable;
private Integer state;
private Integer isDelete;

2
src/main/java/com/yxt/warehouse/biz/warehouseinfo/WarehouseInfoMapper.java
View File

@@ -25,7 +25,7 @@ public interface WarehouseInfoMapper extends BaseMapper<WarehouseInfo> {
int updateBySidIsDelete(List<String> list);
@Select("select * from wms_warehouse_info")
List<WarehouseAreaAllVo> selectAll();
List<WarehouseInfoVo> listAll(@Param("orgPath")String orgPath);
List<WarehouseInfoVo> listAll(@Param("orgPath")String orgPath,@Param("name")String name);
List<WarehouseInfoVoSheng> getAddressGroup(@Param("orgPath")String orgPath);
List<WarehouseInfoVo> getAddressGroupByGSD(@Param("belongingPlace")String belongingPlace);

3
src/main/java/com/yxt/warehouse/biz/warehouseinfo/WarehouseInfoMapper.xml
View File

@@ -44,6 +44,9 @@
LEFT JOIN ss_user.sys_organization as s ON a.useOrgSid = s.sid
<where>
s.orgSidPath like concat('%',#{orgPath},'%') and a.isDelete !='1' and a.isEnable ='1' and usageStatus='1'
<if test="name!=null and name!=''">
and a.warehouseName like concat('%',#{name},'%')
</if>
</where>
</select>
<select id="getAddressGroup" resultType="com.yxt.warehouse.biz.warehouseinfo.WarehouseInfoVoSheng">

9
src/main/java/com/yxt/warehouse/biz/warehouseinfo/WarehouseInfoService.java
View File

@@ -245,11 +245,11 @@ public class WarehouseInfoService extends MybatisBaseService<WarehouseInfoMapper
public ResultBean<List<WarehouseInfo>> listAll(OrgPathQuery query) {
ResultBean rb = ResultBean.fireFail();
List<WarehouseInfoVo> pagging = baseMapper.listAll(query.getOrgPath());
List<WarehouseInfoVo> pagging = baseMapper.listAll(query.getOrgPath(),query.getName());
return rb.success().setData(pagging);
}
public ResultBean<String> saveOrUpdate(WarehouseInfoDto dto) {
public ResultBean<WarehouseInfo> saveOrUpdate(WarehouseInfoDto dto) {
ResultBean rb = ResultBean.fireFail();
String sid = "";
@@ -268,6 +268,7 @@ public class WarehouseInfoService extends MybatisBaseService<WarehouseInfoMapper
dto.getWmsWarehouseExtendDto().setWarehouseSid(wmsWarehouse.getSid());
wmsWarehouseExtendService.saveOrUpdate(dto.getWmsWarehouseExtendDto());
}
return rb.success().setMsg("成功").setData(wmsWarehouse);
} else {
WarehouseInfo wmsWarehouse = new WarehouseInfo();
sid = wmsWarehouse.getSid();
@@ -284,10 +285,8 @@ public class WarehouseInfoService extends MybatisBaseService<WarehouseInfoMapper
dto.getWmsWarehouseExtendDto().setWarehouseSid(wmsWarehouse.getSid());
wmsWarehouseExtendService.saveOrUpdate(dto.getWmsWarehouseExtendDto());
}
return rb.success().setMsg("成功").setData(wmsWarehouse);
}
return rb.success().setMsg("成功");
}
public ResultBean<WarehouseInfoVo> initialization(String sid) {

2
src/main/java/com/yxt/warehouse/biz/warehouseinfo/WarehouseInfoVo.java
View File

@@ -22,6 +22,8 @@ public class WarehouseInfoVo implements Vo {
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date modifyTime;
private String remarks;
private String createBySid;
private String updateBySid;
private Integer isEnable;
private Integer state;
private Integer isDelete;

1
src/main/java/com/yxt/warehouse/utils/OrgPathQuery.java
View File

@@ -11,4 +11,5 @@ import lombok.Data;
public class OrgPathQuery {
private String orgPath;
private String userOrgSid;
private String name;
}