Procházet zdrojové kódy

分页 增加字段

gaodd před 2 roky
rodič
revize
6cda674529

+ 3 - 3
src/main/java/com/chinaitop/depot/business/controller/audit/BusinessProSheetAuditController.java

@@ -115,12 +115,12 @@ public class BusinessProSheetAuditController {
115 115
 			 }
116 116
 		}
117 117
         
118
-        //PageHelper.startPage(pageNum, pageSize);
118
+        PageHelper.startPage(pageNum, pageSize);
119 119
         PageInfo<BusinessNoticeReceive> pageInfo = new PageInfo<BusinessNoticeReceive>(list);
120
-        /*if(pageInfo.getTotal()>0){
120
+        if(pageInfo.getTotal()>0){
121 121
         	pageInfo.setStartRow(pageInfo.getStartRow()+1);
122 122
         	pageInfo.setEndRow(pageInfo.getEndRow()+1);
123
-        }*/
123
+        }
124 124
         return pageInfo;
125 125
     }
126 126
     

+ 2 - 1
src/main/java/com/chinaitop/depot/business/service/impl/ReceiveNoticeServiceImpl.java

@@ -254,7 +254,7 @@ public class ReceiveNoticeServiceImpl implements ReceiveNoticeService {
254 254
                                  */
255 255
                                 BigDecimal s = new BigDecimal(1000);
256 256
                                 BigDecimal kcslBig = new BigDecimal(kcsl);
257
-                                BigDecimal kcslKg = kcslBig.multiply(s);
257
+                                BigDecimal kcslKg = kcslBig.divide(s);
258 258
                                 
259 259
                                 businessNoticeReceive.setLssl(kcslKg.toString());//库存数量
260 260
                                 
@@ -275,6 +275,7 @@ public class ReceiveNoticeServiceImpl implements ReceiveNoticeService {
275 275
 
276 276
                             businessNoticeReceive.setInApplication(1); //启用
277 277
                             businessNoticeReceive.setIsNotice(0);//0是可以引用的通知单
278
+                            businessNoticeReceive.setAuditState(0);//下达未审批
278 279
                             businessNoticeReceive.setReceiveTime(new Date());//接收数据的时间
279 280
                             businessNoticeReceiveMapper.insert(businessNoticeReceive);
280 281
                         }