|
|
@@ -192,6 +192,14 @@ public class BusinessAgentBgmxzController {
|
|
192
|
192
|
if(ParameterUtil.isnotnull(bgmxz.getFssj())){
|
|
193
|
193
|
paramMap.put("fssj", bgmxz.getFssj());
|
|
194
|
194
|
}
|
|
|
195
|
+ if (bgmxz.getStartDate() != null && !"".equals(bgmxz.getStartDate())) {
|
|
|
196
|
+ Date start_rq = ParameterUtil.string2datetime(bgmxz.getStartDate()+" 00:00:00");
|
|
|
197
|
+ paramMap.put("start_rq", start_rq);
|
|
|
198
|
+ }
|
|
|
199
|
+ if (bgmxz.getEndDate() != null && !"".equals(bgmxz.getEndDate())) {
|
|
|
200
|
+ Date end_rq = ParameterUtil.string2datetime(bgmxz.getEndDate()+" 23:59:59");
|
|
|
201
|
+ paramMap.put("end_rq", end_rq);
|
|
|
202
|
+ }
|
|
195
|
203
|
/* 分页 */
|
|
196
|
204
|
if(ParameterUtil.isnotnull(pageNum) && ParameterUtil.isnotnull(pageSize)){
|
|
197
|
205
|
PageHelper.startPage(pageNum, pageSize);
|
|
|
@@ -239,6 +247,7 @@ public class BusinessAgentBgmxzController {
|
|
239
|
247
|
bgmxz.setOrgId(orgId);
|
|
240
|
248
|
Integer dckId = Integer.parseInt(job.get("unitid")+"");
|
|
241
|
249
|
BusinessAgentDepot businessAgentDepot = bgmxzService.selectAgentDepotObj(orgId, dckId);
|
|
|
250
|
+ System.out.println("businessAgentDepot = " + businessAgentDepot);
|
|
242
|
251
|
bgmxz.setAgentId(Integer.parseInt(businessAgentDepot.getAgentId()));
|
|
243
|
252
|
bgmxz.setSzlkOrgId(businessAgentDepot.getId());
|
|
244
|
253
|
bgmxz.setHouseId(job.get("ch")+"");
|
|
|
@@ -260,7 +269,7 @@ public class BusinessAgentBgmxzController {
|
|
260
|
269
|
bgmxz.setCreateDate(fssj);
|
|
261
|
270
|
|
|
262
|
271
|
//插入代储点的保管明细账表
|
|
263
|
|
- bgmxzService.insert(bgmxz);
|
|
|
272
|
+ //bgmxzService.insert(bgmxz);
|
|
264
|
273
|
}
|
|
265
|
274
|
//修改代储点货位表的保管明细账最后同步时间
|
|
266
|
275
|
bgmxzService.updateAgentDepot(orgId);
|