change - 开放api鉴权

aucma-base/src/main/java/com/aucma/base/controller/BaseCustomDataController.java

@@ -38,7 +38,7 @@ public class BaseCustomDataController extends BaseController {
     /**
      * 查询自定义数据维护列表
      */
-    @PreAuthorize("@ss.hasPermi('base:customData:list')")
+//    @PreAuthorize("@ss.hasPermi('base:customData:list')")
     @GetMapping("/list")
     public TableDataInfo list(BaseCustomData baseCustomData) {
         startPage();

aucma-framework/src/main/java/com/aucma/framework/config/SecurityConfig.java

@@ -119,8 +119,13 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter
                 .antMatchers(HttpMethod.POST, "/sap/port/**").permitAll()
                 // 开放看板接口
                 .antMatchers(HttpMethod.POST, "/boardReport/**").permitAll()
-                .antMatchers(HttpMethod.POST, "/**/**/**").permitAll()
+                .antMatchers(HttpMethod.GET, "/base/customData/**").permitAll()
-                .antMatchers(HttpMethod.GET, "/**/**/**").permitAll()
+                .antMatchers(HttpMethod.GET, "/getInfo/**").permitAll()
+                .antMatchers(HttpMethod.GET, "/system/dict/data/type/**").permitAll()
+                .antMatchers(HttpMethod.GET, "/report/pdaRecord/getPdaRecord").permitAll()
+                .antMatchers(HttpMethod.GET, "/report/repairMeasures/getRepairMeasures").permitAll()
+//                .antMatchers(HttpMethod.POST, "/**/**/**").permitAll()
+//                .antMatchers(HttpMethod.GET, "/**/**/**").permitAll()
                 // 除上面外的所有请求全部需要鉴权认证
                 .anyRequest().authenticated()
                 .and()

aucma-production/src/main/java/com/aucma/production/service/impl/ProductPlanInfoServiceImpl.java

@@ -114,8 +114,6 @@ public class ProductPlanInfoServiceImpl implements IProductPlanInfoService {
      */
     @Override
     public Boolean releaseOrderPlan(BaseOrderInfo baseOrderInfo) {
-
-
         String orderCode = baseOrderInfo.getOrderCode();
         String saleOrderCode = baseOrderInfo.getSaleOrderCode();
         String saleOrderLineNumber = baseOrderInfo.getSaleOrderLineNumber();
@@ -133,7 +131,7 @@ public class ProductPlanInfoServiceImpl implements IProductPlanInfoService {
             throw new ServiceException("生产BOM信息不完整，请先维护生产BOM信息！");
         }
         bomInfo.setIsPlanToStation(null);
-        List<BaseBomInfo> baseBomInfos= baseBomInfoService.selectBaseBomInfoList(bomInfo);
+        List<BaseBomInfo> baseBomInfos = baseBomInfoService.selectBaseBomInfoList(bomInfo);
         try {
             for (BaseBomInfo baseBomInfo : baseBomInfos) {
                 if (baseBomInfo.getMaterialType().equals(MaterialConstants.BOX_MATERIAL_TYPE)) {
@@ -150,18 +148,18 @@ public class ProductPlanInfoServiceImpl implements IProductPlanInfoService {
                     planInfo.setPlanCode(PlanCodeUtils.getPlanCode());
                     planInfo.setProductLineCode("1005");
                     this.insertProductPlanInfo(planInfo);
-
+                }
-                    if (baseBomInfo.getMaterialType().equals(MaterialConstants.COAMING_MATERIAL_TYPE)) {
+                if (baseBomInfo.getMaterialType().equals(MaterialConstants.COAMING_MATERIAL_TYPE)) {
-                        planInfo.setPlanCode(PlanCodeUtils.getPlanCode());
+                    ProductPlanInfo plan = new ProductPlanInfo();
-                        planInfo.setOrderCode(orderCode);
+                    plan.setPlanCode(PlanCodeUtils.getPlanCode());
-                        planInfo.setSaleOrderCode(saleOrderCode);
+                    plan.setProductLineCode("1001");
-                        planInfo.setSaleorderLinenumber(saleOrderLineNumber);
+                    plan.setOrderCode(orderCode);
-                        planInfo.setMaterialCode(baseBomInfo.getMaterialCode());
+                    plan.setSaleOrderCode(saleOrderCode);
-                        planInfo.setMaterialName(baseBomInfo.getMaterialName());
+                    plan.setSaleorderLinenumber(saleOrderLineNumber);
-                        planInfo.setProductLineCode("1001");
+                    plan.setMaterialCode(baseBomInfo.getMaterialCode());
-                        planInfo.setPlanAmount(baseBomInfo.getStandardAmount().longValue() * orderAmount.longValue());
+                    plan.setMaterialName(baseBomInfo.getMaterialName());
-                        this.insertProductPlanInfo(planInfo);
+                    plan.setPlanAmount(baseBomInfo.getStandardAmount().longValue() * orderAmount.longValue());
-                    }
+                    this.insertProductPlanInfo(plan);
                 }
             }
             baseOrderInfo.setIsRelease(0L);

aucma-production/src/main/resources/mapper/production/ProductPlanInfoMapper.xml

@@ -79,7 +79,7 @@
             <if test="updatedBy != null  and updatedBy != ''">and pp.updated_by = #{updatedBy}</if>
             <if test="updatedTime != null ">and pp.updated_time = #{updatedTime}</if>
         </where>
-        order by pp.plan_code desc
+        order by pp.order_code desc, pp.plan_code
     </select>
 
     <select id="selectProductPlanInfoByObjId" parameterType="Long" resultMap="ProductPlanInfoResult">

aucma-report/src/main/resources/mapper/report/ReportRepairMeasuresMapper.xml

@@ -44,6 +44,7 @@
             <if test="updatedBy != null  and updatedBy != ''">and updated_by = #{updatedBy}</if>
             <if test="updatedTime != null ">and updated_time = #{updatedTime}</if>
         </where>
+        order by repair_code
     </select>
 
     <select id="selectReportRepairMeasuresByObjId" parameterType="Long" resultMap="ReportRepairMeasuresResult">