Merge remote-tracking branch 'origin/master_merge' into master_merge
This commit is contained in:
@@ -687,6 +687,13 @@ public class StIvtIostorinvServiceImpl extends ServiceImpl<StIvtIostorinvMapper,
|
|||||||
.out_stor_id(Long.parseLong(MapUtil.getStr(whereJson, "out_stor_id")))
|
.out_stor_id(Long.parseLong(MapUtil.getStr(whereJson, "out_stor_id")))
|
||||||
.source_id(Long.parseLong(MapUtil.getStr(whereJson, "source_id")))
|
.source_id(Long.parseLong(MapUtil.getStr(whereJson, "source_id")))
|
||||||
.build();
|
.build();
|
||||||
|
|
||||||
|
if (ObjectUtil.isNotEmpty(MapUtil.getStr(whereJson, "out_stor_id"))) {
|
||||||
|
mstDao.setOut_stor_id(Long.parseLong(MapUtil.getStr(whereJson, "out_stor_id")));
|
||||||
|
}
|
||||||
|
if (ObjectUtil.isNotEmpty(MapUtil.getStr(whereJson, "source_id"))) {
|
||||||
|
mstDao.setSource_id(Long.parseLong(MapUtil.getStr(whereJson, "source_id")));
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
// 修改
|
// 修改
|
||||||
mstDao.setBiz_date(whereJson.get("biz_date").toString().substring(0, 10));
|
mstDao.setBiz_date(whereJson.get("biz_date").toString().substring(0, 10));
|
||||||
|
|||||||
Reference in New Issue
Block a user