|
|
@@ -459,9 +459,9 @@ public class ReceiveNoticeServiceImpl implements ReceiveNoticeService {
|
|
459
|
459
|
example.setOrderByClause("receive_time desc");
|
|
460
|
460
|
List<BusinessNoticeReceive> list = businessNoticeReceiveMapper.selectByExample(example);
|
|
461
|
461
|
if(list.size()>0 && !list.get(0).getAuditState().equals(5)){
|
|
462
|
|
- return 0;//存在
|
|
|
462
|
+ return 0;//都是审批过的
|
|
463
|
463
|
}else{
|
|
464
|
|
- return 1;//不存在
|
|
|
464
|
+ return 1;//有未审批的
|
|
465
|
465
|
}
|
|
466
|
466
|
|
|
467
|
467
|
}
|
|
|
@@ -499,7 +499,7 @@ public class ReceiveNoticeServiceImpl implements ReceiveNoticeService {
|
|
499
|
499
|
businessNoticeReceive.setCrktype("1"); //1入 3出
|
|
500
|
500
|
BigDecimal s = new BigDecimal(1000);
|
|
501
|
501
|
BigDecimal kcslBig = new BigDecimal(kcsl);
|
|
502
|
|
- BigDecimal kcslKg = kcslBig.multiply(s);
|
|
|
502
|
+ BigDecimal kcslKg = kcslBig.divide(s);
|
|
503
|
503
|
businessNoticeReceive.setLssl(kcslKg.toString());//库存数量
|
|
504
|
504
|
businessNoticeReceive.setHzrq(new Date());
|
|
505
|
505
|
businessNoticeReceive.setReceiveTime(new Date());
|