From efbcaf0d2b5b084b5539fe593597a846d8dee6bb Mon Sep 17 00:00:00 2001
From: liuxy <lxy1605052545@163.com>
Date: Mon, 8 Dec 2025 11:32:43 +0800
Subject: [PATCH] =?UTF-8?q?add:=20=E6=89=8B=E6=8C=81=E5=8C=85=E5=9C=A8?=
 =?UTF-8?q?=E7=BA=BF=E5=8D=87=E7=BA=A7=20PC=E6=A0=87=E7=AD=BE=E6=89=93?=
 =?UTF-8?q?=E5=8D=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/GroupController.java           |  6 +++
 .../controller/AppUpdateController.java       | 47 +++++++++++++++++++
 .../service/IMdPbGroupplateService.java       |  7 +++
 .../impl/MdPbGroupplateServiceImpl.java       |  9 ++++
 4 files changed, 69 insertions(+)
 create mode 100644 wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/authorization/controller/AppUpdateController.java

diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/controller/GroupController.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/controller/GroupController.java
index 3638e5b..d31e915 100644
--- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/controller/GroupController.java
+++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/controller/GroupController.java
@@ -62,6 +62,12 @@ public class GroupController {
         return new ResponseEntity<>(iMdPbGroupplateService.queryMater(whereJson), HttpStatus.OK);
     }
 
+    @PostMapping("/queryMaterList")
+    @Log("查询物料集合")
+    public ResponseEntity<Object> queryMaterList() {
+        return new ResponseEntity<>(iMdPbGroupplateService.queryMaterList(), HttpStatus.OK);
+    }
+
     @PostMapping("/checkVehicle")
     @Log("校验载具")
     public ResponseEntity<Object> checkVehicle(@RequestBody JSONObject whereJson) {
diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/authorization/controller/AppUpdateController.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/authorization/controller/AppUpdateController.java
new file mode 100644
index 0000000..eeb8899
--- /dev/null
+++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/authorization/controller/AppUpdateController.java
@@ -0,0 +1,47 @@
+package org.nl.wms.pda.authorization.controller;
+
+/**
+ * @author ldjun
+ * @version 1.0
+ * @date 2023年02月14日 15:20
+ * @desc desc
+ */
+
+import cn.dev33.satoken.annotation.SaIgnore;
+import com.alibaba.fastjson.JSONObject;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.nl.common.logging.annotation.Log;
+import org.nl.system.service.param.ISysParamService;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ *
+ */
+@RestController
+@RequiredArgsConstructor
+
+@RequestMapping("/api/pda/update")
+@Slf4j
+public class AppUpdateController {
+
+    private final ISysParamService iSysParamService;
+
+    @PostMapping
+    @Log("app更新")
+    @SaIgnore
+    public ResponseEntity<Object> appUpdate() {
+        JSONObject obj = new JSONObject();
+        String app_rul = iSysParamService.findByCode("APP_URL").getValue();
+        String app_version = iSysParamService.findByCode("APP_VERSION").getValue();
+        //        obj.put("versionName","1.0.1");
+        //        obj.put("url","http://172.17.2.163:8080/apk/app.apk");
+        obj.put("url", app_rul);
+        obj.put("versionName", app_version);
+        return new ResponseEntity<>(obj, HttpStatus.OK);
+    }
+}
diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/IMdPbGroupplateService.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/IMdPbGroupplateService.java
index 950b608..2a80e11 100644
--- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/IMdPbGroupplateService.java
+++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/IMdPbGroupplateService.java
@@ -55,6 +55,12 @@ public interface IMdPbGroupplateService extends IService<GroupPlate> {
      */
     MdMeMaterialbase queryMater(JSONObject whereJson);
 
+    /**
+     * 查询物料集合
+     * @return List<MdMeMaterialbase>
+     */
+    List<MdMeMaterialbase> queryMaterList();
+
     /**
      * 校验载具
      *
@@ -86,4 +92,5 @@ public interface IMdPbGroupplateService extends IService<GroupPlate> {
      * @param dto 实体类
      */
     void printDelete(GroupPlate dto);
+
 }
diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/impl/MdPbGroupplateServiceImpl.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/impl/MdPbGroupplateServiceImpl.java
index 72472ff..b727f13 100644
--- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/impl/MdPbGroupplateServiceImpl.java
+++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/impl/MdPbGroupplateServiceImpl.java
@@ -130,6 +130,15 @@ public class MdPbGroupplateServiceImpl extends ServiceImpl<MdPbGroupplateMapper,
         return iMdMeMaterialbaseService.getByCode(whereJson.getString("material_code"));
     }
 
+    @Override
+    public List<MdMeMaterialbase> queryMaterList() {
+        return iMdMeMaterialbaseService.list(
+                new QueryWrapper<MdMeMaterialbase>().lambda()
+                    .eq(MdMeMaterialbase::getIs_delete, IOSConstant.ZERO)
+                    .eq(MdMeMaterialbase::getIs_used, IOSConstant.ONE)
+        );
+    }
+
     @Override
     public void checkVehicle(JSONObject whereJson) {
         MdPbStoragevehicleinfo vehicleDao = iMdPbStoragevehicleinfoService.getByCode(whereJson.getString("storagevehicle_code"));