权限修改

jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/ProductWarehouseServiceImpl.java

@@ -13,6 +13,7 @@ import java.math.BigDecimal;
 import cn.hutool.core.util.ObjectUtil;
 import jnpf.permission.model.authorize.AuthorizeConditionModel;
 import jnpf.util.GeneraterSwapUtil;
+import jnpf.util.GeneraterSwapUtil2;
 import jnpf.database.model.superQuery.SuperQueryJsonModel;
 import jnpf.database.model.superQuery.ConditionJsonModel;
 import jnpf.database.model.superQuery.SuperQueryConditionModel;
@@ -49,8 +50,12 @@ import javax.annotation.Resource;
  */
 @Service
 public class ProductWarehouseServiceImpl extends ServiceImpl<ProductWarehouseMapper, ProductWarehouseEntity> implements ProductWarehouseService{
+//    @Autowired
+//    private GeneraterSwapUtil generaterSwapUtil;
+
     @Autowired
-    private GeneraterSwapUtil generaterSwapUtil;
+    private GeneraterSwapUtil2 generaterSwapUtil;
+
 
     @Autowired
     private UserProvider userProvider;
@@ -740,7 +745,6 @@ public class ProductWarehouseServiceImpl extends ServiceImpl<ProductWarehouseMap
                 String value = productWarehousePagination.getCode() instanceof List ?
                         JsonUtil.getObjectToString(productWarehousePagination.getCode()) :
                         String.valueOf(productWarehousePagination.getCode());
-//                productWarehouseQueryWrapper.lambda().like(ProductWarehouseEntity::getCode,value);
                 productWarehouseQueryWrapper.like("a.CODE",value);
 
 
@@ -752,7 +756,6 @@ public class ProductWarehouseServiceImpl extends ServiceImpl<ProductWarehouseMap
                 String value = productWarehousePagination.getName() instanceof List ?
                         JsonUtil.getObjectToString(productWarehousePagination.getName()) :
                         String.valueOf(productWarehousePagination.getName());
-//                productWarehouseQueryWrapper.lambda().like(ProductWarehouseEntity::getName,value);
                 productWarehouseQueryWrapper.like("a.NAME",value);
 
 
@@ -763,7 +766,6 @@ public class ProductWarehouseServiceImpl extends ServiceImpl<ProductWarehouseMap
                 String value = productWarehousePagination.getName() instanceof List ?
                         JsonUtil.getObjectToString(productWarehousePagination.getId()) :
                         String.valueOf(productWarehousePagination.getId());
-//                productWarehouseQueryWrapper.lambda().like(ProductWarehouseEntity::getId,value);
                 productWarehouseQueryWrapper.like("a.id",value);
 
             }
@@ -841,14 +843,7 @@ public class ProductWarehouseServiceImpl extends ServiceImpl<ProductWarehouseMap
             }
             productWarehouseQueryWrapper.lambda().in(ProductWarehouseEntity::getId, intersection);
         }
-        //是否有高级查询
-//        if (StringUtil.isNotEmpty(superOp)){
-//            if (allSuperIDlist.size()==0){
-//                allSuperIDlist.add("jnpfNullList");
-//            }
-//            List<String> finalAllSuperIDlist = allSuperIDlist;
-//            productWarehouseQueryWrapper.lambda().and(t->t.in(ProductWarehouseEntity::getId, finalAllSuperIDlist));
-//        }
+
         //是否有数据过滤查询
         if (StringUtil.isNotEmpty(ruleOp)){
             if (allRuleIDlist.size()==0){
@@ -858,11 +853,9 @@ public class ProductWarehouseServiceImpl extends ServiceImpl<ProductWarehouseMap
             productWarehouseQueryWrapper.lambda().and(t->t.in(ProductWarehouseEntity::getId, finalAllRuleIDlist));
         }
         //假删除标志
-//        productWarehouseQueryWrapper.lambda().isNull(ProductWarehouseEntity::getDeleteMark);
         productWarehouseQueryWrapper.isNull("a.f_delete_mark");
         //排序
         if(StringUtil.isEmpty(productWarehousePagination.getSidx())){
-//            productWarehouseQueryWrapper.lambda().orderByDesc(ProductWarehouseEntity::getId);
             productWarehousePagination.setSidx("a.f_creator_time");
             productWarehousePagination.setSort("DESC");
         }else{
@@ -873,9 +866,7 @@ public class ProductWarehouseServiceImpl extends ServiceImpl<ProductWarehouseMap
                 Field declaredField = productWarehouseEntity.getClass().getDeclaredField(strs[0]);
                 declaredField.setAccessible(true);
                 String value = declaredField.getAnnotation(TableField.class).value();
-//                productWarehouseQueryWrapper="asc".equals(productWarehousePagination.getSort().toLowerCase())?productWarehouseQueryWrapper.orderByAsc(value):productWarehouseQueryWrapper.orderByDesc(value);
                 productWarehousePagination.setSidx("a." + value);
-
             } catch (NoSuchFieldException e) {
                 e.printStackTrace();
             }

jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/WorkOrderServiceImpl.java

@@ -44,10 +44,10 @@ import javax.annotation.Resource;
  */
 @Service
 public class WorkOrderServiceImpl extends ServiceImpl<WorkOrderMapper, WorkOrderEntity> implements WorkOrderService{
+//    @Autowired
+//    private GeneraterSwapUtil generaterSwapUtil;
     @Autowired
-    private GeneraterSwapUtil generaterSwapUtil;
-    @Autowired
-    private GeneraterSwapUtil2 generaterSwapUtil2;
+    private GeneraterSwapUtil2 generaterSwapUtil;
     @Autowired
     private UserProvider userProvider;
 

jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/ProductWarehouseController.java

@@ -182,7 +182,6 @@ public class ProductWarehouseController {
     @Operation(summary = "加工获取商品列表")
     @GetMapping("/getBomProductlists1")
     public ActionResult bomProductlists1()throws IOException{
-
         ProductWarehousePagination productWarehousePagination=new ProductWarehousePagination();
         productWarehousePagination.setDataType("0");