|
@@ -258,7 +258,7 @@ public class ReceiveNoticeServiceImpl implements ReceiveNoticeService {
|
258
|
258
|
|
259
|
259
|
businessNoticeReceive.setLssl(kcslKg.toString());//库存数量
|
260
|
260
|
|
261
|
|
- businessNoticeReceive.setHzqlsxzdm(3052);//商品粮
|
|
261
|
+ businessNoticeReceive.setHzqlsxzdm(3052);//商品粮 转后
|
262
|
262
|
businessNoticeReceive.setLsxzzbdh(jsonObject.getString("tzdid"));
|
263
|
263
|
//SimpleDateFormat dateFormat= new SimpleDateFormat("yyyy-MM-dd :hh:mm:ss");
|
264
|
264
|
businessNoticeReceive.setHzrq(new Date());
|
|
@@ -483,7 +483,7 @@ public class ReceiveNoticeServiceImpl implements ReceiveNoticeService {
|
483
|
483
|
Map<String, Object> map = feignAgileService.getDateByChHwh(Integer.valueOf(orgId), storehouseId, warehouseId);
|
484
|
484
|
Integer grainKind = (Integer) map.get("pz"); //品种
|
485
|
485
|
Double kcsl = (Double) map.get("kcsl");//千克
|
486
|
|
-
|
|
486
|
+ Integer grainAttribute = (Integer) map.get("hwxz"); //粮油性质
|
487
|
487
|
businessNoticeReceive.setAuditState(0);//下发未审批
|
488
|
488
|
businessNoticeReceive.setIsNotice(1);//0是1否 是否是可以引用的通知单
|
489
|
489
|
businessNoticeReceive.setOrgId(Integer.valueOf(orgId));
|
|
@@ -492,8 +492,8 @@ public class ReceiveNoticeServiceImpl implements ReceiveNoticeService {
|
492
|
492
|
businessNoticeReceive.setCount(rksl.toString());
|
493
|
493
|
businessNoticeReceive.setPzmc(grainVarietyName);
|
494
|
494
|
businessNoticeReceive.setGrainKind(grainKind);
|
495
|
|
- businessNoticeReceive.setGrainAttribute(3045);
|
496
|
|
- businessNoticeReceive.setHzqlsxzdm(3052);
|
|
495
|
+ businessNoticeReceive.setGrainAttribute(3052); //入库 转前 3052商品粮
|
|
496
|
+ businessNoticeReceive.setHzqlsxzdm(grainAttribute);//入库 转后
|
497
|
497
|
businessNoticeReceive.setLsxzzbdh(lsxzzbdh);
|
498
|
498
|
businessNoticeReceive.setNoticeNumber(lsxzzbdh);
|
499
|
499
|
businessNoticeReceive.setCrktype("1"); //1入 3出
|