yxt_develop
/
anrui
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge remote-tracking branch 'origin/master'

zhanglei
God 1 year ago
parent
fe78eb73fb 24dd1770c6
commit
2f5bcb811b
12 changed files with 54 additions and 44 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 7
      yxt-as-ui/src/api/goods/brand.js
  2. 7
      yxt-as-ui/src/api/goods/category.js
  3. 7
      yxt-as-ui/src/api/goods/factory.js
  4. 7
      yxt-as-ui/src/api/goods/unit.js
  5. 4
      yxt-as-ui/src/api/warehouse/warehouse.js
  6. 10
      yxt-as-ui/src/api/warehouse/warehouseArea.js
  7. 12
      yxt-as-ui/src/api/warehouse/warehouseAreaType.js
  8. 2
      yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/base/WmsWarehouseAreaRest.java
  9. 2
      yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/base/WmsWarehouseAreaTypeRest.java
  10. 2
      yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/base/WmsWarehouseInfoRest.java
  11. 2
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseinfo/WmsWarehouseInfoMapper.java
  12. 36
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseinfo/WmsWarehouseInfoService.java

7
yxt-as-ui/src/api/goods/brand.js
View File

@ -18,8 +18,11 @@ export default {
getAllBrand: function(params) {
return request({
url: '/yxtbase/apiadmin/base/basegoodsbrand/listAll',
method: 'get',
data: params,
method: 'post',
data: params,
headers: {
'Content-Type': 'application/json'
}
})
},

7
yxt-as-ui/src/api/goods/category.js
View File

@ -18,8 +18,11 @@ export default {
getAllType: function(params) {
return request({
url: '/yxtbase/apiadmin/base/basegoodstype/listAll',
method: 'get',
data: params,
method: 'post',
data: params,
headers: {
'Content-Type': 'application/json'
}
})
},

7
yxt-as-ui/src/api/goods/factory.js
View File

@ -18,8 +18,11 @@ export default {
getAllFacturer: function(params) {
return request({
url: '/yxtbase/apiadmin/base/basemanufacturer/listAll',
method: 'get',
data: params,
method: 'post',
data: params,
headers: {
'Content-Type': 'application/json'
}
})
},

7
yxt-as-ui/src/api/goods/unit.js
View File

@ -18,8 +18,11 @@ export default {
getAllUnit: function(params) {
return request({
url: '/yxtbase/apiadmin/base/basegoodsunit/listAll',
method: 'get',
data: params,
method: 'post',
data: params,
headers: {
'Content-Type': 'application/json'
}
})
},

4
yxt-as-ui/src/api/warehouse/warehouse.js
View File

@ -18,8 +18,8 @@ export default {
getAllWarehouse: function(params) {
return request({
url: '/wms/apiadmin/base/wmswarehouseinfo/listAll',
method: 'get',
data: params,
method: 'post',
data: params,
headers: {
'Content-Type': 'application/json'
}

10
yxt-as-ui/src/api/warehouse/warehouseArea.js
View File

@ -18,11 +18,11 @@ export default {
getAllWarehousearea: function(params) {
return request({
url: '/wms/apiadmin/base/wmswarehousearea/listAll',
method: 'get',
data: params,
headers: {
'Content-Type': 'application/json'
}
method: 'post',
data: params,
headers: {
'Content-Type': 'application/json'
}
})
},

12
yxt-as-ui/src/api/warehouse/warehouseAreaType.js
View File

@ -19,8 +19,8 @@ export default {
getAllWarehouseareatype: function(params) {
return request({
url: '/wms/apiadmin/base/wmswarehouseareatype/listAll',
method: 'get',
data: params,
method: 'post',
data: params,
headers: {
'Content-Type': 'application/json'
}
@ -29,10 +29,10 @@ export default {
// 修改是否可用状态
updateIsEnable: function(sid,isEnable) {
return request({
url: '/wms/apiadmin/base/wmswarehouseareatype/updateIsEnable/'+sid+"/"+isEnable
});
updateIsEnable: function(sid, isEnable) {
return request({
url: '/wms/apiadmin/base/wmswarehouseareatype/updateIsEnable/' + sid + "/" + isEnable
});
},

2
yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/base/WmsWarehouseAreaRest.java
View File

@ -30,7 +30,7 @@ public class WmsWarehouseAreaRest {
return wmsWarehouseAreaService.listPage(pq);
}
@ApiOperation("查询所有的库区")
@GetMapping("/listAll")
@PostMapping("/listAll")
public ResultBean<List<WmsWarehouseArea>> listAll(@RequestBody OrgPathQuery query) {
return wmsWarehouseAreaService.getAllType(query);
}

2
yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/base/WmsWarehouseAreaTypeRest.java
View File

@ -30,7 +30,7 @@ public class WmsWarehouseAreaTypeRest {
return wmsWarehouseAreaTypeService.listPage(pq);
}
@ApiOperation("查询所有的")
@GetMapping("/listAll")
@PostMapping("/listAll")
public ResultBean<List<WmsWarehouseAreaType>> listAll(@RequestBody OrgPathQuery query) {
return wmsWarehouseAreaTypeService.listAll(query);
}

2
yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/base/WmsWarehouseInfoRest.java
View File

@ -31,7 +31,7 @@ public class WmsWarehouseInfoRest {
return wmsWarehouseService.listPage(pq);
}
@ApiOperation("查询所有的仓库")
@GetMapping("/listAll")
@PostMapping("/listAll")
public ResultBean<List<WmsWarehouseInfo>> listAll(@RequestBody OrgPathQuery query) {
return wmsWarehouseService.listAll(query);
}

2
yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseinfo/WmsWarehouseInfoMapper.java
View File

@ -29,6 +29,6 @@ public interface WmsWarehouseInfoMapper extends BaseMapper<WmsWarehouseInfo> {
WmsWarehouseInfo checkCodeForUpdate(@Param("warehouseCode") String warehouseCode, @Param("useOrgSid") String useOrgSid, @Param("sid") String sid);
@Select("select * from wms_warehouse_info where useOrgSid =#{useOrgSid} and isDelete = 0 and usageStatus '1' ")
@Select("select * from wms_warehouse_info where useOrgSid =#{useOrgSid} and isDelete = 0 and usageStatus = '1' ")
List<WmsWarehouseInfo> listAll(@Param("useOrgSid") String useOrgSid);
}

36
yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseinfo/WmsWarehouseInfoService.java
View File

@ -45,6 +45,7 @@ public class WmsWarehouseInfoService extends MybatisBaseService<WmsWarehouseInfo
private SysOrganizationFeign sysOrganizationFeign;
@Autowired
private SysStaffOrgFeign sysStaffOrgFeign;
public ResultBean<PagerVo<WmsWarehouseInfoVo>> listPage(PagerQuery<WmsWarehouseInfoQuery> pq) {
ResultBean rb = ResultBean.fireFail();
WmsWarehouseInfoQuery query = pq.getParams();
@ -85,22 +86,23 @@ public class WmsWarehouseInfoService extends MybatisBaseService<WmsWarehouseInfo
PagerVo<WmsWarehouseInfoVo> p = new PagerVo<>();
return rb.success().setData(p);
}
if(StringUtils.isNotBlank(query.getName())){
qw.like("w.warehouseName",query.getName());
if (StringUtils.isNotBlank(query.getName())) {
qw.like("w.warehouseName", query.getName());
}
if(StringUtils.isNotBlank(query.getCode())){
qw.like("w.warehouseCode",query.getCode());
if (StringUtils.isNotBlank(query.getCode())) {
qw.like("w.warehouseCode", query.getCode());
}
if(StringUtils.isNotBlank(query.getAddress())){
qw.like("w.address",query.getAddress());
if (StringUtils.isNotBlank(query.getAddress())) {
qw.like("w.address", query.getAddress());
}
qw.ne("w.isDelete",1);
qw.ne("w.isDelete", 1);
IPage<WmsWarehouseInfo> page = PagerUtil.queryToPage(pq);
IPage<WmsWarehouseInfoVo> pagging = baseMapper.listPage(page, qw);
PagerVo<WmsWarehouseInfoVo> p = PagerUtil.pageToVo(pagging, null);
List<WmsWarehouseInfoVo> records = pagging.getRecords();
return rb.success().setData(p);
}
public ResultBean<List<WmsWarehouseInfo>> listAll(OrgPathQuery query) {
ResultBean rb = ResultBean.fireFail();
String useOrgSid = "";
@ -129,7 +131,7 @@ public class WmsWarehouseInfoService extends MybatisBaseService<WmsWarehouseInfo
WmsWarehouseInfo wmsWarehouse = fetchBySid(dto.getSid());
BeanUtil.copyProperties(dto, wmsWarehouse, "id", "sid");
wmsWarehouse.setModifyTime(new Date());
WmsWarehouseInfo warehouseInfo = baseMapper.checkCodeForUpdate(dto.getWarehouseCode(),wmsWarehouse.getUseOrgSid(),sid);
WmsWarehouseInfo warehouseInfo = baseMapper.checkCodeForUpdate(dto.getWarehouseCode(), wmsWarehouse.getUseOrgSid(), sid);
if (warehouseInfo != null) {
return rb.setMsg("仓库编码重复");
}
@ -173,7 +175,7 @@ public class WmsWarehouseInfoService extends MybatisBaseService<WmsWarehouseInfo
wmsWarehouse.setCreateOrgSid(createOrgSid);
}
}
WmsWarehouseInfo warehouseInfo = baseMapper.checkCode(dto.getWarehouseCode(),deptSid);
WmsWarehouseInfo warehouseInfo = baseMapper.checkCode(dto.getWarehouseCode(), deptSid);
if (warehouseInfo != null) {
return rb.setMsg("仓库编码重复");
}
@ -197,10 +199,10 @@ public class WmsWarehouseInfoService extends MybatisBaseService<WmsWarehouseInfo
WmsWarehouseInfo wmsWarehouse = fetchBySid(sid);
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
BeanUtil.copyProperties(wmsWarehouse, vo);
List<WmsWarehouseExtend> list=wmsWarehouseExtendService.list(new QueryWrapper<WmsWarehouseExtend>().eq("warehouseSid",vo.getSid()));
List<WmsWarehouseExtendVo> list1=new ArrayList<>();
List<WmsWarehouseExtend> list = wmsWarehouseExtendService.list(new QueryWrapper<WmsWarehouseExtend>().eq("warehouseSid", vo.getSid()));
List<WmsWarehouseExtendVo> list1 = new ArrayList<>();
for (WmsWarehouseExtend wmsWarehouseExtend : list) {
WmsWarehouseExtendVo vo1= new WmsWarehouseExtendVo();
WmsWarehouseExtendVo vo1 = new WmsWarehouseExtendVo();
BeanUtil.copyProperties(wmsWarehouseExtend, vo1);
list1.add(vo1);
}
@ -209,7 +211,6 @@ public class WmsWarehouseInfoService extends MybatisBaseService<WmsWarehouseInfo
}
public ResultBean delete(String sid) {
ResultBean rb = ResultBean.fireFail();
WmsWarehouseInfo wmsWarehouse = fetchBySid(sid);
@ -222,15 +223,12 @@ public class WmsWarehouseInfoService extends MybatisBaseService<WmsWarehouseInfo
public void delAll(String[] sids) {
int count = baseMapper.updateBySidIsDelete(Arrays.stream(sids).collect(Collectors.toList()));
}
public ResultBean updateIsEnable(String sid,String isEnable) {
public ResultBean updateIsEnable(String sid, String isEnable) {
ResultBean rb = ResultBean.fireFail();
WmsWarehouseInfo wmsWarehouse = fetchBySid(sid);
if (null != wmsWarehouse) {
if (isEnable.equals("1")) {
wmsWarehouse.setUsageStatus(isEnable);
} else if (isEnable.equals("2")) {
wmsWarehouse.setUsageStatus("0");
}
wmsWarehouse.setUsageStatus(isEnable);
baseMapper.updateById(wmsWarehouse);
}
return rb.success().setMsg("成功");

Write Preview
Loading…
Cancel
Save