hfxc226 3 years ago
parent
commit
a3d5898583

+ 4 - 1
platform-dao/src/main/java/com/platform/dao/pojo/CommonTree.java

@@ -16,7 +16,10 @@ public class CommonTree extends TreeNode {
      * 节点ID
      */
     private String key;
-
+    /**
+     * 节点ID
+     */
+    private Integer level;
     /**
      * 名称
      */

+ 1 - 1
platform-dao/src/main/java/com/platform/dao/util/TreeUtil.java

@@ -247,7 +247,6 @@ public class TreeUtil {
      * 通过sysMenu创建树形节点
      *
      * @param dicts
-     * @param root
      * @return
      */
     public List<CommonTree> buildDictTree(List<SysDict> dicts) {
@@ -443,6 +442,7 @@ public class TreeUtil {
             node.setId(type.getId());
             node.setKey(type.getId());
             node.setParentId(type.getParentId());
+            node.setLevel(type.getLevel());
             node.setTitle(type.getName());
             node.setValue(type.getId());
             trees.add(node);

+ 8 - 0
platform-service/src/main/java/com/platform/service/sqarepartmanage/impl/SparePartInfoServiceImpl.java

@@ -142,6 +142,7 @@ public class SparePartInfoServiceImpl extends BaseServiceImpl<SparePartInfoMappe
      * 5:增加人工干预,可以改变每条的状态。
      */
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public void genMinStockWarn() {
         SparePartInfoDTO record = new SparePartInfoDTO();
         record.setSearchMinStockWarn(true);
@@ -181,6 +182,7 @@ public class SparePartInfoServiceImpl extends BaseServiceImpl<SparePartInfoMappe
      * 5:增加人工干预,可以改变每条的状态。
      */
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public void genCheckStockWarn() {
 
         // 查询近六个月待执行的任务列表。
@@ -455,6 +457,12 @@ public class SparePartInfoServiceImpl extends BaseServiceImpl<SparePartInfoMappe
             middleTypeNo = middleType.getNo();
             model.setMiddleNo(middleTypeNo);
         }
+        if(model.getMinStock() == null){
+            model.setMinStock(new BigDecimal(0));
+        }
+        if(model.getMaxStock() == null){
+            model.setMaxStock(new BigDecimal(0));
+        }
         String nameNo = model.getNameNo();
         String ggNo = model.getGgNo();
         String childTypeNo = null;