From e40990ee77e899e757c3c75d164d75dbdf79b0a6 Mon Sep 17 00:00:00 2001
From: Huluwa22 <2667400744@qq.com>
Date: Sat, 15 Mar 2025 13:50:08 +0800
Subject: [PATCH] 1

---
 .../web/controller/app/AppPmsController.java  | 50 +++++++++++++++++--
 .../framework/config/SecurityConfig.java      |  2 +-
 .../impl/AppPmsOrderInServiceImpl.java        |  2 +-
 3 files changed, 49 insertions(+), 5 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppPmsController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppPmsController.java
index a43791b5..3440fd7c 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppPmsController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppPmsController.java
@@ -69,7 +69,6 @@ public class AppPmsController extends BaseController {
         if (groupedByGoodsCode.values().stream().anyMatch(list -> list.size() > 1)) {
             return error("物料编号不能重复");
         }
-
         // 判断数据是否缺失
         for(PmsOrderInRequest orderInRequest : orderInRequestList) {
             if (StringUtils.isEmpty(orderInRequest.getGoodsId())
@@ -91,15 +90,60 @@ public class AppPmsController extends BaseController {
             appPmsOrderIn.setGoodsCode(orderInRequest.getGoodsCode());
             appPmsOrderIn.setCreateTime(new Date());
             appPmsOrderIn.setUpdateTime(new Date());
-            appPmsOrderIn.setCreateBy(getUsername());
+            appPmsOrderIn.setCreateBy("手动入库");
             appPmsOrderIn.setRemark("手动入库通知");
 
-           appPmsOrderInService.insertAppPmsOrderIn(appPmsOrderIn);
+            appPmsOrderInService.insertAppPmsOrderIn(appPmsOrderIn);
         }
 
         return AjaxResult.success("success");
     }
 
+    /**
+     * 其他物料入库单请求
+     */
+    @ApiOperation("其他物料入库单请求")
+    @Log(title = "其他物料入库单请求", skipAuth = true)
+    @PostMapping("/orderInOthers")
+    @Anonymous
+    public AjaxResult manualOrderInOthers(@RequestBody PmsOrderInRequest orderInRequest) {
+        logger.info("手动入库单请求：{}", JSONObject.toJSONString(orderInRequest));
+        // 判断数据是否缺失
+        if (StringUtils.isEmpty(orderInRequest.getGoodsId())
+                || StringUtils.isEmpty(orderInRequest.getGoodsDesc())
+                || orderInRequest.getGoodsNum() == null || orderInRequest.getGoodsNum() <=0) {
+            return error("缺少请求数据。");
+        }
+        // 构造入库单
+        AppPmsOrderIn appPmsOrderIn = getAppPmsOrderInOthers(orderInRequest);
+        int result = appPmsOrderInService.insertAppPmsOrderIn(appPmsOrderIn);
+        if (result <= 0) {
+            return error("创建入库单失败");
+        }
+        return AjaxResult.success("success",appPmsOrderIn);
+    }
+
+    private static AppPmsOrderIn getAppPmsOrderInOthers(PmsOrderInRequest orderInRequest) {
+        AppPmsOrderIn appPmsOrderIn = new AppPmsOrderIn();
+        String orderId= OrderCodeFactory.getOrderCode("RK", "");
+        BeanUtils.copyProperties(orderInRequest, appPmsOrderIn);
+        appPmsOrderIn.setId(OrderCodeFactory.getOrderCode("",""));
+        appPmsOrderIn.setListId(orderId);
+        appPmsOrderIn.setOrderType(orderInRequest.getOrderType());
+        appPmsOrderIn.setOrderId(UUID.randomUUID().toString());
+        appPmsOrderIn.setGoodsNum(BigDecimal.valueOf(orderInRequest.getGoodsNum()));
+        appPmsOrderIn.setUsedNum(BigDecimal.ZERO);
+        appPmsOrderIn.setRemainingNum(BigDecimal.valueOf(orderInRequest.getGoodsNum()));
+        appPmsOrderIn.setOrderStatus(0);
+        appPmsOrderIn.setGoodsCode(orderInRequest.getGoodsCode());
+        appPmsOrderIn.setCreateTime(new Date());
+        appPmsOrderIn.setUpdateTime(new Date());
+        appPmsOrderIn.setCreateBy("其他物料入库");
+        appPmsOrderIn.setRemark("其他物料入库通知");
+        return appPmsOrderIn;
+    }
+
+
     /**
      * 更新手动入库单请求
      */
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
index 828b6bf9..0784af60 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
@@ -114,7 +114,7 @@ public class SecurityConfig
                 requests.antMatchers("/login", "/register", "/captchaImage").permitAll()
                     // 静态资源，可匿名访问
                     .antMatchers(HttpMethod.GET, "/", "/*.html", "/**/*.html", "/**/*.css", "/**/*.js", "/profile/**").permitAll()
-                    .antMatchers("/swagger-ui.html", "/swagger-resources/**", "/webjars/**", "/*/api-docs", "/druid/**","/app/pms/orderIn", "/app/pmsOrderOut/**", "/app/task/sendLocation", "/app/task/taskResult","/app/task/createOutRequest", "/system/storage/**", "/app/location/count/**", "/app/vehicle/**", "/app/goods/getGoodsInfoByCode/**").permitAll()
+                    .antMatchers("/swagger-ui.html", "/swagger-resources/**", "/webjars/**", "/*/api-docs", "/druid/**","/app/pms/orderIn", "/app/pmsOrderOut/**", "/app/task/sendLocation", "/app/task/taskResult","/app/task/createOutRequest", "/system/storage/**", "/app/location/count/**", "/app/vehicle/**", "/app/goods/getGoodsInfoByCode/**","/app/pms/**").permitAll()
                     // 除上面外的所有请求全部需要鉴权认证
                     .anyRequest().authenticated();
             })
diff --git a/ruoyi-system/src/main/java/com/ruoyi/app/service/impl/AppPmsOrderInServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/app/service/impl/AppPmsOrderInServiceImpl.java
index 8f1e4d5d..9bdf1273 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/app/service/impl/AppPmsOrderInServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/app/service/impl/AppPmsOrderInServiceImpl.java
@@ -167,7 +167,7 @@ public class AppPmsOrderInServiceImpl implements IAppPmsOrderInService
             }
             update.setRemainingNum(subtract);
             appPmsOrderInMapper.updateAppPmsOrderIn(update);
-            insertNum ++;
+            insertNum++;
         }
         return insertNum;
     }