加入友好的数据显示

src/main/java/com/originspark/drp/controllers/projects/invoices/StockInInvoiceController.java

@@ -14,6 +14,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.originspark.drp.models.projects.invoices.StockInInvoice;
+import com.originspark.drp.util.enums.Status;
 import com.originspark.drp.util.json.FilterRequest;
 import com.originspark.drp.util.json.IdsJson;
 import com.originspark.drp.util.json.JsonUtils;
@@ -55,7 +56,6 @@ public class StockInInvoiceController extends AbstractInvoiceController {
     @RequestMapping(method = RequestMethod.GET)
     @ResponseBody
     public String list(@RequestParam int start, @RequestParam int limit, @RequestParam(required = false) Object filter) {
-
         List<FilterRequest> filters = new ArrayList<FilterRequest>();
 
         if (filter != null) {
@@ -74,28 +74,25 @@ public class StockInInvoiceController extends AbstractInvoiceController {
         String data = request().getParameter("data");
         ObjectMapper mapper = new ObjectMapper();
         IdsJson json = null;
-        
         try {
             json = mapper.readValue(data, IdsJson.class);
         } catch (Exception e) {
             return failure("提交数据有误");
         }
-        
+
         if (json == null) {
             return failure("没有需要删除的数据");
         }
-        
+
         for (Long id : json.getIds()) {
             if(id==null){
                 continue;
             }
             StockInInvoice invoice = stockInInvoiceService.findById(StockInInvoice.class, id);
-
             if(invoice != null && invoice.getCosts().isEmpty()){
-                stockInInvoiceService.delete(invoice);
-                logger.info(">删除成功："+invoice.toString());
+                invoice.setStatus(Status.DESTORYED);
+                stockInInvoiceService.update(invoice);
             }
-            
         }
         return ok("删除成功(注释：部分合价不为0的入库单已忽略)");
     }

src/main/java/com/originspark/drp/controllers/projects/invoices/StockOutInvoiceController.java

@@ -16,6 +16,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.originspark.drp.models.projects.invoices.StockOutInvoice;
+import com.originspark.drp.util.enums.Status;
 import com.originspark.drp.util.json.FilterRequest;
 import com.originspark.drp.util.json.IdsJson;
 import com.originspark.drp.util.json.JsonUtils;
@@ -46,19 +47,17 @@ public class StockOutInvoiceController extends AbstractInvoiceController {
         } catch (Exception e) {
             return failure("提交数据有误");
         }
-        
         if (json == null) {
             return failure("没有需要审核的数据");
         }
-        
         for (Long id : json.getIds()) {
             if(id == null){
                 continue;
             }
             StockOutInvoice invoice = stockOutInvoiceService.findById(StockOutInvoice.class, id);
             if (invoice != null && invoice.getCosts().isEmpty()) {
-                stockOutInvoiceService.delete(invoice);
-                logger.info(">删除成功：" + invoice.toString());
+                invoice.setStatus(Status.DESTORYED);
+                stockOutInvoiceService.update(invoice);
             }
         }
         return ok("删除成功(注释：部分合价不为0的入库单已忽略)");

src/main/java/com/originspark/drp/controllers/resources/WareController.java

@@ -30,6 +30,7 @@ import com.originspark.drp.models.resources.Vendor;
 import com.originspark.drp.models.resources.Ware;
 import com.originspark.drp.util.FileUtil;
 import com.originspark.drp.util.SessionUtil;
+import com.originspark.drp.util.enums.Status;
 import com.originspark.drp.util.json.FilterRequest;
 import com.originspark.drp.util.json.IdsJson;
 import com.originspark.drp.util.json.JsonUtils;
@@ -73,8 +74,8 @@ public class WareController extends BaseController {
 
     @RequestMapping(value = "/deleteBatch", method = RequestMethod.GET)
     @ResponseBody
-    public String deleteBatch(HttpServletRequest request) {
-        String data = request.getParameter("data");
+    public String deleteBatch() {
+        String data = request().getParameter("data");
         ObjectMapper mapper = new ObjectMapper();
         IdsJson json = null;
         try {
@@ -87,10 +88,9 @@ public class WareController extends BaseController {
         }
         for (long id : json.getIds()) {
             Ware ware = wareService.findById(Ware.class, id);
-            
             if(ware != null && ware.getInCosts().isEmpty() && ware.getOutCosts().isEmpty() && ware.getInventories().isEmpty()){
-                wareService.delete(ware);
-                logger.info(">删除成功："+ware.toString());
+                ware.setStatus(Status.DESTORYED);
+                wareService.save(ware);
             }
         }
         return ok("删除成功");

src/main/java/com/originspark/drp/service/projects/costs/StockInCostServiceBean.java

@@ -37,6 +37,7 @@ public class StockInCostServiceBean extends BaseDAOSupport<StockInCost> implemen
         if (predicates != null) {
             dataQuery.where(cb.and(predicates));
         }
+        dataQuery.orderBy(cb.desc(stockInCost.get("id")));
 
         return em.createQuery(dataQuery).setFirstResult(start)
                 .setMaxResults(limit).getResultList();

src/main/java/com/originspark/drp/service/projects/costs/StockOutCostServiceBean.java

@@ -38,6 +38,8 @@ public class StockOutCostServiceBean extends BaseDAOSupport<StockOutCost> implem
             dataQuery.where(cb.and(predicates));
         }
 
+        dataQuery.orderBy(cb.desc(stockOutCost.get("id")));
+
         return em.createQuery(dataQuery).setFirstResult(start)
                 .setMaxResults(limit).getResultList();
     }

src/main/java/com/originspark/drp/service/projects/inventories/InventoryServiceBean.java

@@ -25,7 +25,7 @@ public class InventoryServiceBean extends BaseDAOSupport implements InventorySer
     // 实时库存量统计
     final String CURRENT_SUM_SQL = "SELECT t3.name, t3.model, t3.unit, t3.brand, t1.outcome, t1.incount, t2.income, t2.outcount FROM "
             + CURRENT_IN_SQL + " LEFT JOIN " + CURRENT_OUT_SQL + " ON t1.wid = t2.wid"
-            + " JOIN wares as t3 WHERE t1.wid = t3.id";
+            + " JOIN wares as t3 WHERE t1.wid = t3.id ORDER BY t2.income - t1.outcome DESC";
     // 实时库存量总数计算
     final String CURRENT_COUNT = "SELECT COUNT(DISTINCT(ware)) FROM cost_stock_in";
 

src/main/java/com/originspark/drp/service/projects/invoices/StockInInvoiceServiceBean.java

@@ -37,7 +37,7 @@ public class StockInInvoiceServiceBean extends BaseDAOSupport<StockInInvoice> im
         Root<StockInInvoice> stockin = dataQuery.from(StockInInvoice.class);
 
         dataQuery.select(stockin);
-        
+
         StockInCost[] inCosts = findByWareName(filters);
         if(inCosts == null){
             return null;
@@ -56,8 +56,7 @@ public class StockInInvoiceServiceBean extends BaseDAOSupport<StockInInvoice> im
                 dataQuery.where(cb.and(andPredicates),cb.or(orPredicates));
             }
         }
-        
-        dataQuery.orderBy(cb.desc(stockin.get("forDate")));
+        dataQuery.orderBy(cb.asc(stockin.get("status")), cb.desc(stockin.get("forDate")), cb.desc(stockin.get("id")));
 
         return em.createQuery(dataQuery).setFirstResult(start)
                 .setMaxResults(limit).getResultList();
@@ -69,14 +68,14 @@ public class StockInInvoiceServiceBean extends BaseDAOSupport<StockInInvoice> im
         CriteriaQuery<Long> countQuery = cb.createQuery(Long.class);
         Root<StockInInvoice> stockin = countQuery.from(StockInInvoice.class);
         countQuery.select(cb.count(stockin));
-        
+
         StockInCost[] inCosts = findByWareName(filters);
         if(inCosts == null){
             return 0L;
         }
 
         List<Predicate[]> predicates = toPredicates(cb, stockin, filters, findByWareName(filters));
-        
+
         if (predicates != null) {
             Predicate[] andPredicates = predicates.get(0);
             Predicate[] orPredicates = predicates.get(1);
@@ -85,10 +84,9 @@ public class StockInInvoiceServiceBean extends BaseDAOSupport<StockInInvoice> im
             }else if(andPredicates.length == 0 && orPredicates.length != 0){
                 countQuery.where(cb.or(orPredicates));
             }else{
-                countQuery.where(cb.and(andPredicates),cb.or(orPredicates));
+                countQuery.where(cb.and(andPredicates), cb.or(orPredicates));
             }
         }
-
         return em.createQuery(countQuery).getSingleResult();
     }
 

src/main/java/com/originspark/drp/service/projects/invoices/StockOutInvoiceServiceBean.java

@@ -20,7 +20,6 @@ import com.originspark.drp.models.projects.costs.StockOutCost;
 import com.originspark.drp.models.projects.invoices.AbstractInvoice.COLUMNS;
 import com.originspark.drp.models.projects.invoices.StockOutInvoice;
 import com.originspark.drp.util.StringUtil;
-import com.originspark.drp.util.enums.AuditState;
 import com.originspark.drp.util.json.FilterRequest;
 
 @Transactional
@@ -37,14 +36,14 @@ public class StockOutInvoiceServiceBean extends BaseDAOSupport<StockOutInvoice>
         Root<StockOutInvoice> stockout = dataQuery.from(StockOutInvoice.class);
 
         dataQuery.select(stockout);
-        
+
         StockOutCost[] outCosts = findByWareName(filters);
         if(outCosts == null){
             return null;
         }
 
         List<Predicate[]> predicates = toPredicates(cb, stockout, filters, outCosts);
-        
+
         if (predicates != null) {
             Predicate[] andPredicates = predicates.get(0);
             Predicate[] orPredicates = predicates.get(1);
@@ -57,8 +56,8 @@ public class StockOutInvoiceServiceBean extends BaseDAOSupport<StockOutInvoice>
             }
         }
 
-        dataQuery.orderBy(cb.desc(stockout.get("forDate")));
-        
+        dataQuery.orderBy(cb.asc(stockout.get("status")), cb.desc(stockout.get("forDate")), cb.desc(stockout.get("id")));
+
         return em.createQuery(dataQuery).setFirstResult(start)
                 .setMaxResults(limit).getResultList();
     }

src/main/java/com/originspark/drp/service/resources/VendorServiceBean.java

@@ -14,7 +14,6 @@ import org.springframework.stereotype.Service;
 
 import com.originspark.drp.dao.BaseDAOSupport;
 import com.originspark.drp.models.resources.Vendor;
-import com.originspark.drp.models.resources.Ware;
 import com.originspark.drp.models.resources.Vendor.COLUMNS;
 import com.originspark.drp.util.json.FilterRequest;
 
@@ -37,6 +36,8 @@ public class VendorServiceBean extends BaseDAOSupport<Vendor> implements VendorS
             dataQuery.where(cb.and(predicates));
         }
 
+        dataQuery.orderBy(cb.asc(vendor.get("status")), cb.desc(vendor.get("id")));
+
         return em.createQuery(dataQuery).
                 setFirstResult(start).
                 setMaxResults(limit).

src/main/java/com/originspark/drp/service/resources/WareCategoryServiceBean.java

 package com.originspark.drp.service.resources;
 
 import java.util.List;
-
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Root;
-
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-
 import com.originspark.drp.dao.BaseDAOSupport;
 import com.originspark.drp.models.resources.WareCategory;
 
@@ -19,16 +13,8 @@ public class WareCategoryServiceBean extends BaseDAOSupport<WareCategory> implem
 
     @Override
     public List<WareCategory> treeViewData() {
-        CriteriaBuilder cb = em.getCriteriaBuilder();
-        CriteriaQuery<WareCategory> dataQuery = cb.createQuery(WareCategory.class);
-
-        Root<WareCategory> category = dataQuery.from(WareCategory.class);
-
-        dataQuery.select(category);
-
-        dataQuery.where(cb.isNull(category.get("parent")));
-
-        return em.createQuery(dataQuery).getResultList();
+        String sql = "from WareCategory where parent is null order by status asc, id desc";
+        return em.createQuery(sql, WareCategory.class).getResultList();
     }
 
 }

src/main/java/com/originspark/drp/service/resources/WareServiceBean.java

@@ -41,8 +41,8 @@ public class WareServiceBean extends BaseDAOSupport<Ware> implements WareService
         if (predicates != null) {
             dataQuery.where(cb.and(predicates));
         } 
-        
-        dataQuery.orderBy(cb.desc(ware.get("id")));
+
+        dataQuery.orderBy(cb.asc(ware.get("status")), cb.desc(ware.get("id")));
 
         return em.createQuery(dataQuery).setFirstResult(start)
                 .setMaxResults(limit).getResultList();

src/main/java/com/originspark/drp/service/users/UserServiceBean.java

@@ -40,6 +40,8 @@ public class UserServiceBean extends BaseDAOSupport<User> implements UserService
             dataQuery.where(cb.and(predicates));
         }
 
+        dataQuery.orderBy(cb.asc(user.get("status")), cb.desc(user.get("id")));
+
         return em.createQuery(dataQuery).setFirstResult(start)
                 .setMaxResults(limit).getResultList();
     }

src/main/webapp/drp/app/controller/AbstractController.js

@@ -64,6 +64,9 @@ Ext.define("drp.app.controller.AbstractController", {
                         grid.getStore().load();
                     },
                     failure : function(response, operation) {
+                        if(response.status == 404) {
+                            Ext.Msg.alert("操作失败", "服务器出现错误，请联系管理员.");
+                        }
                         Ext.Msg.alert("失败!", operation.request.scope.reader.jsonData["message"]);
                     }
                 });

src/main/webapp/drp/app/view/projects/inventories/CurrentInventoryView.js

@@ -63,6 +63,26 @@ Ext.define('drp.app.view.projects.inventories.CurrentInventoryView', {
                     flex : 1,
                     text : '盈余'
                 }],
+                viewConfig : {
+                    listeners: {
+                        refresh: function(grid) {
+                            var nodes = grid.getNodes();
+                            for (var i = 0; i < nodes.length; i++) {
+                                var node = nodes[i];
+                                var record = grid.getRecord(node);
+                                var cells = Ext.get(node).query('td');  
+                                var restcount = record.get('restcount');
+                                if(restcount < 10) {
+                                    Ext.fly(cells[5]).setStyle('background-color', '#FFCCCC');
+                                }
+                                var profit = record.get('profit');
+                                if(profit < 0) {
+                                    Ext.fly(cells[8]).setStyle('background-color', '#FF0033');
+                                }
+                            }
+                        }
+                    }
+                },
                 dockedItems : [{
                     xtype : 'pagingtoolbar',
                     dock : 'bottom',

src/main/webapp/drp/app/view/projects/invoices/StockInInvoiceView.js

@@ -162,6 +162,24 @@ Ext.define('drp.app.view.projects.invoices.StockInInvoiceView', {
                     flex : 2,
                     text : '经手人'
                 }],
+                viewConfig : {
+                    listeners: {
+                        refresh: function(grid) {
+                            var nodes = grid.getNodes();
+                            for (var i = 0; i < nodes.length; i++) {
+                                var node = nodes[i];
+                                var record = grid.getRecord(node);
+                                var cells = Ext.get(node).query('td');
+                                var status = record.get('status');
+                                if(status == 'DESTORYED') {
+                                    for(var j = 0; j < cells.length; j++) {
+                                        Ext.fly(cells[j]).setStyle('background-color', '#FFCCCC');
+                                    }
+                                }
+                            }
+                        }
+                    }
+                },
                 dockedItems : [{
                     xtype : 'pagingtoolbar',
                     dock : 'bottom',
@@ -177,7 +195,7 @@ Ext.define('drp.app.view.projects.invoices.StockInInvoiceView', {
                         action : 'showAddInInvoiceUI',
                         itemId : 'addInInvoice_btn',
                         text : '增加'
-                    }, {
+                    }, '-', {
                         xtype : 'button',
                         icon : 'resources/images/icons/delete.png',
                         action : 'deleteInInvoice',

src/main/webapp/drp/app/view/projects/invoices/StockOutInvoiceView.js

@@ -167,6 +167,24 @@ Ext.define('drp.app.view.projects.invoices.StockOutInvoiceView', {
                     flex : 2,
                     text : '经手人'
                 }],
+                viewConfig : {
+                    listeners: {
+                        refresh: function(grid) {
+                            var nodes = grid.getNodes();
+                            for (var i = 0; i < nodes.length; i++) {
+                                var node = nodes[i];
+                                var record = grid.getRecord(node);
+                                var cells = Ext.get(node).query('td');
+                                var status = record.get('status');
+                                if(status == 'DESTORYED') {
+                                    for(var j = 0; j < cells.length; j++) {
+                                        Ext.fly(cells[j]).setStyle('background-color', '#FFCCCC');
+                                    }
+                                }
+                            }
+                        }
+                    }
+                },
                 dockedItems : [{
                     xtype : 'pagingtoolbar',
                     dock : 'bottom',
@@ -182,7 +200,7 @@ Ext.define('drp.app.view.projects.invoices.StockOutInvoiceView', {
                         action : 'showAddOutInvoiceUI',
                         itemId : 'addOutInvoice_btn',
                         text : '增加'
-                    }, {
+                    }, '-', {
                         xtype : 'button',
                         icon : 'resources/images/icons/delete.png',
                         action : 'deleteOutInvoice',

src/main/webapp/drp/app/view/resources/VendorView.js

@@ -112,6 +112,24 @@ Ext.define('drp.app.view.resources.VendorView', {
                     dataIndex : 'note',
                     text : '备注'
                 }],
+                viewConfig : {
+                    listeners: {
+                        refresh: function(grid) {
+                            var nodes = grid.getNodes();
+                            for (var i = 0; i < nodes.length; i++) {
+                                var node = nodes[i];
+                                var record = grid.getRecord(node);
+                                var cells = Ext.get(node).query('td');
+                                var status = record.get('status');
+                                if(status == 'DESTORYED') {
+                                    for(var j = 0; j < cells.length; j++) {
+                                        Ext.fly(cells[j]).setStyle('background-color', '#FFCCCC');
+                                    }
+                                }
+                            }
+                        }
+                    }
+                },
                 dockedItems : [{
                     xtype : 'toolbar',
                     dock : 'top',

src/main/webapp/drp/app/view/resources/WareView.js

@@ -170,6 +170,24 @@ Ext.define('drp.app.view.resources.WareView', {
                         text : '更新时间'
                     }]
                 }],
+                viewConfig : {
+                    listeners: {
+                        refresh: function(grid) {
+                            var nodes = grid.getNodes();
+                            for (var i = 0; i < nodes.length; i++) {
+                                var node = nodes[i];
+                                var record = grid.getRecord(node);
+                                var cells = Ext.get(node).query('td');
+                                var status = record.get('status');
+                                if(status == 'DESTORYED') {
+                                    for(var j = 0; j < cells.length; j++) {
+                                        Ext.fly(cells[j]).setStyle('background-color', '#FFCCCC');
+                                    }
+                                }
+                            }
+                        }
+                    }
+                },
                 dockedItems : [{
                     xtype : 'toolbar',
                     dock : 'top',
@@ -179,7 +197,7 @@ Ext.define('drp.app.view.resources.WareView', {
                         itemId : 'addWare_btn',
                         action : 'addWare',
                         text : '新增'
-                    }, {
+                    }, '-', {
                         xtype : 'button',
                         icon : 'resources/images/icons/delete.png',
                         action : 'deleteWare',

src/main/webapp/drp/app/view/resources/WareViewForm.js

@@ -52,6 +52,12 @@ Ext.define("drp.app.view.resources.WareViewForm", {
                 }, {
                     "value" : "袋",
                     "name" : "袋"
+                }, {
+                    "value" : "公斤",
+                    "name" : "公斤"
+                }, {
+                    "value" : "千克",
+                    "name" : "千克"
                 }, {
                     "value" : "个",
                     "name" : "个"

src/main/webapp/drp/base/view/WestView.js

@@ -31,11 +31,11 @@ Ext.define("drp.base.view.WestView", {
                     text : "<span style='font-weight:bold'>实时库存</span>",
                     id : 'menu_current_inventory',
                     leaf : true
-                }, {
+                }/*, {
                     text : "<span style='font-weight:bold'>每日总账</span>",
                     id : 'menu_monthend_inventory',
                     leaf : true
-                }]
+                }*/]
             }
         }]
     }, {