diff --git a/lombok.config b/lombok.config
new file mode 100644
index 00000000..29ceb170
--- /dev/null
+++ b/lombok.config
@@ -0,0 +1 @@
+lombok.equalsandhashcode.callSuper = SKIP
\ No newline at end of file
diff --git a/nflg-wms-admin/pom.xml b/nflg-wms-admin/pom.xml
index e8cf7e1c..a7a00a4e 100644
--- a/nflg-wms-admin/pom.xml
+++ b/nflg-wms-admin/pom.xml
@@ -83,7 +83,7 @@
         <dependency>
             <groupId>org.xhtmlrenderer</groupId>
             <artifactId>flying-saucer-pdf</artifactId>
-            <version>9.11.2</version>
+            <version>9.13.3</version>
             <exclusions>
                 <exclusion>
                     <artifactId>bcprov-jdk14</artifactId>
@@ -93,13 +93,14 @@
         </dependency>
         <dependency>
             <groupId>com.itextpdf</groupId>
-            <artifactId>itextpdf</artifactId>
-            <version>5.5.13.4</version>
+            <artifactId>itext7-core</artifactId>
+            <version>7.2.6</version>
+            <type>pom</type>
         </dependency>
         <dependency>
             <groupId>com.itextpdf</groupId>
-            <artifactId>itext-asian</artifactId>
-            <version>5.2.0</version>
+            <artifactId>font-asian</artifactId>
+            <version>7.2.6</version>
         </dependency>
         <dependency>
             <groupId>com.sap.conn.jco</groupId>
diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InCostCenterBackController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InCostCenterBackController.java
index cd4af47e..556f6494 100644
--- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InCostCenterBackController.java
+++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InCostCenterBackController.java
@@ -178,7 +178,7 @@ public class InCostCenterBackController extends BaseController {
                                     .setMatnr(item.getMatnr())
                                     .setNum(item.getLeft());
                             if (StrUtil.isBlank(vo.getLgort2())) {
-                                vo.setLgort2(storageService.getWarehouseNo(order.getWerks(), item.getMatnr()));
+                                vo.setLgort2(CollectionUtil.get(storageService.getWarehouseNo(order.getWerks(), item.getMatnr()), 0));
                             }
                             if (StrUtil.isNotBlank(vo.getLgort2()) && StrUtil.isBlank(vo.getLgpbe())) {
                                 vo.setLgpbe(StrUtil.join("/", storageService.getBinNos(item.getMatnr(), order.getWerks(), vo.getLgort2())));
@@ -324,20 +324,21 @@ public class InCostCenterBackController extends BaseController {
         WmsInCostcenterBack info = inCostcenterBackService.getById(id);
         VUtil.trueThrowBusinessError(Objects.isNull(info)).throwMessage("退料单不存在");
         InCostcenterBackInfoVO order = Convert.convert(InCostcenterBackInfoVO.class, info);
-        List<WmsInCostcenterBackItem> list = inCostcenterBackItemService.getList(id);
+        List<InCostcenterBackItemVO> list = Convert.toList(InCostcenterBackItemVO.class, inCostcenterBackItemService.getList(id));
 //        InCostcenterBackInfoVO order = new InCostcenterBackInfoVO();
 //        order.setNo(NoUtil.getOutCostcenterNo());
 //        List<WmsInCostcenterBackItem> list = new ArrayList<>();
 //        for (int i = 0, count = RandomUtil.randomInt(1, 100); i < count; i++) {
 //            list.add(new WmsInCostcenterBackItem().setMatnr(RandomUtil.randomNumbers(11)).setMaktx("非金属联件和紧固件等 M6 DIN 982 不锈钢304"));
 //        }
+        list.forEach(item -> item.setLgort(order.getLgort()));
         Map<String, String> base = new HashMap<>();
         base.put("date", DateUtil.format(LocalDateTime.now(), "yyyy-MM-dd"));
         base.put("qrcode", QRCodeUtil.generateQRCodeBase64(order.getNo(), 100, 100));
         Map<String, Object> variables = new HashMap<>();
         variables.put("info", order);
         variables.put("base", base);
-        variables.put("pages", PdfPageDTO.create(list, 17, new WmsInCostcenterBackItem()));
+        variables.put("pages", PdfPageDTO.create(list, 17, new InCostcenterBackItemVO()));
         String html = ThymeleafUtil.generator("/template/", "成本中心退料单", ".html", variables);
         PdfGeneratorUtil.generatePdf("成本中心领料单" + order.getNo(), html, response);
     }
diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InProduceOrderController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InProduceOrderController.java
index 7de7f9af..acce04c4 100644
--- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InProduceOrderController.java
+++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InProduceOrderController.java
@@ -433,7 +433,7 @@ public class InProduceOrderController extends BaseController {
                     materialNos.add(it.getMaterialNo());
                 }
                 //是否更改了储位
-                syncStorage(it,materialQO.getBinNos());
+                syncStorage(it, StrUtil.split(materialQO.getBinNos(), "/"));
             }
         });
         VUtil.trueThrowBusinessError(CollectionUtil.isNotEmpty(materialNos))
@@ -457,7 +457,7 @@ public class InProduceOrderController extends BaseController {
         return ApiResult.success();
     }
 
-    private void syncStorage(InProduceOrderItemVO it, Set<String> binNos) {
+    private void syncStorage(InProduceOrderItemVO it, Collection<String> binNos) {
         produceOrderItemService.lambdaUpdate()
                 .set(WmsInProduceOrderItem::getBinNos, StrUtil.join(",", binNos))
                 .eq(WmsInProduceOrderItem::getId, it.getId())
diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/MaterialController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/MaterialController.java
index 873b061b..fe6f167c 100644
--- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/MaterialController.java
+++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/MaterialController.java
@@ -121,7 +121,7 @@ public class MaterialController extends BaseController {
      */
     @Transactional
     @PostMapping("uploadZip")
-    public ApiResult uploadZip(HttpServletResponse response, @Valid @RequestParam("file") @NotEmpty MultipartFile file) throws Exception {
+    public ApiResult uploadZip(HttpServletResponse response, @Valid @RequestParam("file") @NotNull MultipartFile file) throws Exception {
         return materialControllerService.uploadZip(response,file);
     }
 
diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/StructuralPackageOrderController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/StructuralPackageOrderController.java
index f6677e3d..788ec03a 100644
--- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/StructuralPackageOrderController.java
+++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/StructuralPackageOrderController.java
@@ -678,7 +678,7 @@ public class StructuralPackageOrderController extends BaseController {
         imageData.setRelativeLastColumnIndex(0);
         writeCellData.setImageDataList(List.of(imageData));
         info.put("qrCodeUrl", writeCellData);
-        UserSupplier supplier = userSupplierService.getByUserId(deliverOrder.getSupplierId());
+        UserSupplier supplier = userSupplierService.getById(deliverOrder.getSupplierId());
         VUtil.trueThrowBusinessError(Objects.isNull(supplier)).throwMessage("供应商不存在");
         info.put("supplierName", supplier.getSupplierName());
         info.put("abbreviation", supplier.getAbbreviation());
@@ -725,6 +725,9 @@ public class StructuralPackageOrderController extends BaseController {
             } else {
                 it.setWarehouseNo(dto.getWarehouseNo());
                 it.setBinNos(binService.getBinNos(it.getPackageNo(), dto.getWerks(), dto.getWarehouseNo()));
+//                if (dto.getTransportNum().compareTo(new BigDecimal(it.getNum()))<0){
+//                    it.setNum(dto.getTransportNum().intValue());
+//                }
             }
         });
         DeliverStructuralPackageOrderForPackageVO vo = new DeliverStructuralPackageOrderForPackageVO();
@@ -765,6 +768,9 @@ public class StructuralPackageOrderController extends BaseController {
                 .eq(WmsStructuralPackageOrderTray::getState, OrderState.InTransit.getState())
                 .update();
         structuralPackageDeliverOrderService.updateStateByOrderId(request.getId());
+        SAPMaterialInfoInOrderDTO dto = CollectionUtil.get(sapService.zim004(order.getExternalOrderNo(), order.getSupplierCode(), order.getPackageNo()), 0);
+        VUtil.trueThrowBusinessError(Objects.isNull(dto)).throwMessage("ZIM_004未查询到数据");
+        VUtil.trueThrowBusinessError(StrUtil.isBlank(dto.getWarehouseNo())).throwMessage("ZIM_004接口查询到仓库为空");
         //创建上架任务
         VUtil.trueThrowBusinessError(!inTaskService.generateTask(List.of(new WmsInTaskItem()
                         .setPoNum(order.getExternalOrderNo())
@@ -779,9 +785,9 @@ public class StructuralPackageOrderController extends BaseController {
                         .setUnqualifiedQty(BigDecimal.ZERO)
                         .setQualifiedQty(BigDecimal.valueOf(order.getNum()))
                         .setInspectionQty(BigDecimal.valueOf(order.getNum()))
-                        .setFactory("1010")
+                        .setFactory(dto.getWerks())
                         .setDataStatus((short) 0)
-                        .setReceivedWarehouse(storageService.getWarehouseNo("1010", order.getPackageNo()))
+                        .setReceivedWarehouse(dto.getWarehouseNo())
                         .setOperationUserId(UserUtil.getUserId())
                         .setOperationUserName(UserUtil.getUserName())
                         .setBatchNumber(order.getWorkbenchCode())
@@ -838,6 +844,7 @@ public class StructuralPackageOrderController extends BaseController {
                 it.setReceivedQty(it.getInspectionQty().subtract(qo.getNum()));
                 it.setBins(StrUtil.join(",", qo.getBinNos()));
                 it.setDataStatus((short) 1);
+                it.setReceivedWarehouse(qo.getReceivedWarehouse());
             });
             inTaskItemService.updateBatchById(datas);
             inTaskService.updateState(request.getTaskNo());
diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/PositionControllerService.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/PositionControllerService.java
index e2e263d6..d3e47d9a 100644
--- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/PositionControllerService.java
+++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/PositionControllerService.java
@@ -86,6 +86,7 @@ public class PositionControllerService {
     public PageData<PositionVO> search(PositionSearchQO request) {
         return PageUtil.convert(positionService.lambdaQuery()
                         .like(StrUtil.isNotBlank(request.getName()), Position::getName, request.getName())
+                        .orderByDesc(Position::getId)
                         .page(new Page<>(request.getPage(), request.getPageSize())),
                 d -> Convert.convert(PositionVO.class, d));
     }
diff --git a/nflg-wms-admin/src/main/resources/template/钢构件老鼠图.html b/nflg-wms-admin/src/main/resources/template/钢构件老鼠图.html
index 8384e3e1..bc03095a 100644
--- a/nflg-wms-admin/src/main/resources/template/钢构件老鼠图.html
+++ b/nflg-wms-admin/src/main/resources/template/钢构件老鼠图.html
@@ -36,7 +36,7 @@
 
         td {
             border: 1px solid #000;
-            padding: 8px;
+            padding: 7px;
         }
 
         tr:first-child td {
@@ -82,7 +82,14 @@
 
         .cell {
             border-bottom: 1px solid #000;
-            padding: 8px;
+            padding: 7px;
+            overflow: hidden;
+        }
+
+        .cell1 {
+            border-bottom: 1px solid #000;
+            padding: 7px;
+            height: 25px;
             overflow: hidden;
         }
 
@@ -124,15 +131,19 @@
     </table>
     <div class="data-item" th:each="item,itemStat : ${page.datas}"
          th:classappend="${itemStat.index % 3 == 0} ? 'data-item-row-first'">
-        <div class="cell" style="height: 160px;">
+        <div class="cell" style="height: 150px;">
             <div class="cell-img">
-                <img style="width: 200px;height: 140px;" alt=""
+                <img style="width: 200px;height: 130px;" alt=""
                      th:src="${!#strings.isEmpty(item.image)} ? ${item.image} : (${#strings.isEmpty(item.no)} ? '' : 'http://192.168.163.83:9090/nflg-wms/template/none.png')"/>
             </div>
         </div>
         <div class="cell">SAP编码：<span th:text="${item.no}">2222222222</span></div>
-        <div class="cell">图号：<span th:text="${item.drawingNo}">12255665451615</span></div>
-        <div class="cell">名称：<span th:text="${item.name}">2222222222</span></div>
+        <div class="cell1">图号：<span
+                th:text="${item.drawingNo}">图号图号图号图号图号图号图号图号图号图号图号图号图号图号图号图号</span>
+        </div>
+        <div class="cell1">名称：<span
+                th:text="${item.name}">名称名称名称名称名称名称名称名称名称名名称名名称名称名称称名称名称名称称名称名称名称</span>
+        </div>
         <div class="cell">数量：<span th:text="${item.num}">1</span>&nbsp;&nbsp;&nbsp;&nbsp;重量：<span
                 th:text="${item.weight}">348.41</span></div>
     </div>
diff --git a/nflg-wms-admin/src/main/resources/template/钢构包送货单模版.xlsx b/nflg-wms-admin/src/main/resources/template/钢构包送货单模版.xlsx
index 0a630063..36ed9974 100644
Binary files a/nflg-wms-admin/src/main/resources/template/钢构包送货单模版.xlsx and b/nflg-wms-admin/src/main/resources/template/钢构包送货单模版.xlsx differ
diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/InCostcenterBackSubmitItemQO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/InCostcenterBackSubmitItemQO.java
index 88a5c50f..9f91d91a 100644
--- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/InCostcenterBackSubmitItemQO.java
+++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/InCostcenterBackSubmitItemQO.java
@@ -1,5 +1,6 @@
 package com.nflg.wms.common.pojo.qo;
 
+import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotEmpty;
 import jakarta.validation.constraints.NotNull;
 import lombok.Data;
@@ -18,8 +19,8 @@ public class InCostcenterBackSubmitItemQO {
     /**
      * 实际入库储位编号列表
      */
-    @NotEmpty
-    private List<String> binNos;
+    @NotBlank
+    private String binNos;
 
     /**
      * 二维码列表
diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/InProduceOrderReceiveMaterialQO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/InProduceOrderReceiveMaterialQO.java
index 1ad09580..a2865367 100644
--- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/InProduceOrderReceiveMaterialQO.java
+++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/InProduceOrderReceiveMaterialQO.java
@@ -5,7 +5,6 @@ import jakarta.validation.constraints.NotEmpty;
 import lombok.Data;
 
 import java.util.List;
-import java.util.Set;
 
 @Data
 public class InProduceOrderReceiveMaterialQO {
@@ -19,8 +18,8 @@ public class InProduceOrderReceiveMaterialQO {
     /**
      * 储位编号列表
      */
-    @NotEmpty
-    private Set<String> binNos;
+    @NotBlank
+    private String binNos;
 
     /**
      * 二维码列表
diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/MaterialStorageItemQO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/MaterialStorageItemQO.java
index 1c88c67d..581ce95b 100644
--- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/MaterialStorageItemQO.java
+++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/MaterialStorageItemQO.java
@@ -6,7 +6,7 @@ import jakarta.validation.constraints.NotEmpty;
 import lombok.Data;
 
 import java.math.BigDecimal;
-import java.util.Set;
+import java.util.List;
 
 @Data
 public class MaterialStorageItemQO {
@@ -38,7 +38,7 @@ public class MaterialStorageItemQO {
      * 储位列表
      */
     @NotEmpty
-    private Set<String> binNos;
+    private List<String> binNos;
 
     /**
      * 越库数量
diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/DeliverStructuralPackageOrderTrayItemVO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/DeliverStructuralPackageOrderTrayItemVO.java
index adea7f80..63432c1e 100644
--- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/DeliverStructuralPackageOrderTrayItemVO.java
+++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/DeliverStructuralPackageOrderTrayItemVO.java
@@ -9,7 +9,7 @@ import java.io.Serializable;
 import java.math.BigDecimal;
 
 @Data
-@Accessors
+@Accessors(chain = true)
 public class DeliverStructuralPackageOrderTrayItemVO implements Serializable {
 
     /**
diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/UserSupplierItemVO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/UserSupplierItemVO.java
index 3d4bfbf8..f5178ecc 100644
--- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/UserSupplierItemVO.java
+++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/UserSupplierItemVO.java
@@ -6,7 +6,7 @@ import lombok.experimental.Accessors;
 import java.util.Collection;
 
 @Data
-@Accessors
+@Accessors(chain = true)
 public class UserSupplierItemVO {
     //所属角色
     private Collection<Long> roleIds;
diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsStorageMapper.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsStorageMapper.java
index 5e71c34b..dc184376 100644
--- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsStorageMapper.java
+++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsStorageMapper.java
@@ -26,7 +26,7 @@ public interface WmsStorageMapper extends BaseMapper<WmsStorage> {
 
     List<StorageVO> searchNonPage(@Param("request") StorageSearchQO request);
 
-    String getWarehouseNo(String factoryNo, String materialNo);
+    List<String> getWarehouseNo(String factoryNo, String materialNo);
 
     String getBinNos(String materialNo, String factoryNo, String warehouseNo);
 
diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsStorageService.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsStorageService.java
index f43a55c8..e7d49743 100644
--- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsStorageService.java
+++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsStorageService.java
@@ -37,7 +37,7 @@ public interface IWmsStorageService extends IService<WmsStorage> {
 
     List<StorageVO> searchNonPage(@Valid StorageSearchQO request);
 
-    String getWarehouseNo(String factoryNo,String materialNo);
+    List<String> getWarehouseNo(String factoryNo, String materialNo);
 
     Set<String> getBinNos(String materialNo, @NotBlank String factoryNo, String warehouseNo);
 
diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/ParamConfigServiceImpl.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/ParamConfigServiceImpl.java
index cde941b9..2784a7f5 100644
--- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/ParamConfigServiceImpl.java
+++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/ParamConfigServiceImpl.java
@@ -69,6 +69,7 @@ public class ParamConfigServiceImpl extends ServiceImpl<ParamConfigMapper, Param
                 .like(StrUtil.isNotBlank(request.getName()), ParamConfig::getName, request.getName())
                 .like(StrUtil.isNotBlank(request.getCode()), ParamConfig::getCode, request.getCode())
                 .like(StrUtil.isNotBlank(request.getGroupName()), ParamConfig::getGroupName, request.getGroupName())
+                .orderByDesc(ParamConfig::getId)
                 .page(new Page<>(request.getPage(), request.getPageSize()));
         if (CollectionUtil.isEmpty(page.getRecords())) {
             return new PageData<>();
diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WebComponentServiceImpl.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WebComponentServiceImpl.java
index 1ff556cf..42263821 100644
--- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WebComponentServiceImpl.java
+++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WebComponentServiceImpl.java
@@ -80,6 +80,7 @@ public class WebComponentServiceImpl extends ServiceImpl<WebComponentMapper, Web
                 .like(StrUtil.isNotBlank(request.getName()), WebComponent::getComponentName, request.getName())
                 .eq(StrUtil.isNotBlank(request.getModuleName()), WebComponent::getModuleName, request.getModuleName())
                 .eq(StrUtil.isNotBlank(request.getPageName()), WebComponent::getPageName, request.getPageName())
+                .orderByDesc(WebComponent::getId)
                 .page(new Page<>(request.getPage(), request.getPageSize()));
         Map<Long, String> userMap = new HashMap<>();
         return PageUtil.convert(page, (d) -> {
diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsGongzhuangTaizhangCheckServiceImpl.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsGongzhuangTaizhangCheckServiceImpl.java
index 511306ee..025020ec 100644
--- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsGongzhuangTaizhangCheckServiceImpl.java
+++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsGongzhuangTaizhangCheckServiceImpl.java
@@ -45,6 +45,7 @@ public class WmsGongzhuangTaizhangCheckServiceImpl extends ServiceImpl<WmsGongzh
     public IPage<WmsGongzhuangTaizhangCheck> search(GongZhuangTaiZhangCheckListQO request) {
         return lambdaQuery()
                 .eq(WmsGongzhuangTaizhangCheck::getNo, request.getNo())
+                .orderByDesc(WmsGongzhuangTaizhangCheck::getId)
                 .page(new Page<>(request.getPage(), request.getPageSize()));
     }
 }
diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsGongzhuangTaizhangServiceImpl.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsGongzhuangTaizhangServiceImpl.java
index 877c3ecc..7edcb368 100644
--- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsGongzhuangTaizhangServiceImpl.java
+++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsGongzhuangTaizhangServiceImpl.java
@@ -68,6 +68,7 @@ public class WmsGongzhuangTaizhangServiceImpl extends ServiceImpl<WmsGongzhuangT
         return lambdaQuery()
                 .like(StrUtil.isNotBlank(request.getNo()), WmsGongzhuangTaizhang::getNo, request.getNo())
                 .like(StrUtil.isNotBlank(request.getName()), WmsGongzhuangTaizhang::getName, request.getName())
+                .orderByDesc(WmsGongzhuangTaizhang::getId)
                 .page(new Page<>(request.getPage(), request.getPageSize()));
     }
 
diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsInCostcenterBackServiceImpl.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsInCostcenterBackServiceImpl.java
index 3a21ee94..5a0639f2 100644
--- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsInCostcenterBackServiceImpl.java
+++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsInCostcenterBackServiceImpl.java
@@ -30,6 +30,7 @@ public class WmsInCostcenterBackServiceImpl extends ServiceImpl<WmsInCostcenterB
                 .like(StrUtil.isNotBlank(request.getKostl()), WmsInCostcenterBack::getKostl, request.getKostl())
                 .ge(request.getStartDate() != null, WmsInCostcenterBack::getCreateTime, request.getStartDate())
                 .le(request.getEndDate() != null, WmsInCostcenterBack::getCreateTime, request.getEndDate())
+                .orderByDesc(WmsInCostcenterBack::getId)
                 .page(new Page<>(request.getPage(), request.getPageSize()));
     }
 }
diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsInProduceOrderServiceImpl.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsInProduceOrderServiceImpl.java
index 4d1fdf3a..ae61dfd4 100644
--- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsInProduceOrderServiceImpl.java
+++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsInProduceOrderServiceImpl.java
@@ -33,6 +33,7 @@ public class WmsInProduceOrderServiceImpl extends ServiceImpl<WmsInProduceOrderM
                 )
                 .ge(Objects.nonNull(request.getStartDate()), WmsInProduceOrder::getCreateTime, request.getStartDate())
                 .le(Objects.nonNull(request.getEndDate()), WmsInProduceOrder::getCreateTime, request.getEndDate())
+                .orderByDesc(WmsInProduceOrder::getId)
                 .page(new Page<>(request.getPage(), request.getPageSize()));
     }
 
diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsOutPurchaseServiceImpl.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsOutPurchaseServiceImpl.java
index 1761ef30..28cea0b7 100644
--- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsOutPurchaseServiceImpl.java
+++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsOutPurchaseServiceImpl.java
@@ -30,6 +30,7 @@ public class WmsOutPurchaseServiceImpl extends ServiceImpl<WmsOutPurchaseMapper,
                 .eq(StrUtil.isNotBlank(request.getLifnr()), WmsOutPurchase::getLifnr, request.getLifnr())
                 .ge(Objects.nonNull(request.getStartDate()), WmsOutPurchase::getCreateTime, request.getStartDate())
                 .le(Objects.nonNull(request.getEndDate()), WmsOutPurchase::getCreateTime, request.getEndDate())
+                .orderByDesc(WmsOutPurchase::getId)
                 .page(new Page<>(request.getPage(), request.getPageSize()));
     }
 }
diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsSrmOrderServiceImpl.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsSrmOrderServiceImpl.java
index 2f8a868d..b6108208 100644
--- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsSrmOrderServiceImpl.java
+++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsSrmOrderServiceImpl.java
@@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.nflg.wms.common.pojo.qo.SRMOrderSearchQO;
 import com.nflg.wms.common.pojo.qo.SearchDeliverOrderQO;
-import com.nflg.wms.common.pojo.vo.PoReceiveTaskItemVO;
 import com.nflg.wms.common.pojo.vo.PoReceiveTaskVO;
 import com.nflg.wms.common.pojo.vo.SrmOrderVO;
 import com.nflg.wms.repository.entity.WmsSrmOrder;
@@ -34,6 +33,7 @@ public class WmsSrmOrderServiceImpl extends ServiceImpl<WmsSrmOrderMapper, WmsSr
                 .eq(StrUtil.isNotBlank(request.getOrderNo()),WmsSrmOrder::getNoteNum, request.getOrderNo())
                 .ge(Objects.nonNull(request.getStartDate()), WmsSrmOrder::getCreateTime, request.getStartDate())
                 .le(Objects.nonNull(request.getEndDate()), WmsSrmOrder::getCreateTime, request.getEndDate())
+                .orderByDesc(WmsSrmOrder::getId)
                 .page(new Page<>(request.getPage(),request.getPageSize()));
     }
 
diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsStorageServiceImpl.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsStorageServiceImpl.java
index 0ba0064d..8e9e1289 100644
--- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsStorageServiceImpl.java
+++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsStorageServiceImpl.java
@@ -94,7 +94,7 @@ public class WmsStorageServiceImpl extends ServiceImpl<WmsStorageMapper, WmsStor
     }
 
     @Override
-    public String getWarehouseNo(String factoryNo,String materialNo) {
+    public List<String> getWarehouseNo(String factoryNo, String materialNo) {
         return baseMapper.getWarehouseNo(factoryNo,materialNo);
     }
 
diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsToolMaterialCheckServiceImpl.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsToolMaterialCheckServiceImpl.java
index a610a91b..27f79f23 100644
--- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsToolMaterialCheckServiceImpl.java
+++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsToolMaterialCheckServiceImpl.java
@@ -45,7 +45,9 @@ public class WmsToolMaterialCheckServiceImpl extends ServiceImpl<WmsToolMaterial
 
     @Override
     public IPage<WmsToolMaterialCheck> search(GongZhuangTaiZhangCheckListQO request) {
-        return lambdaQuery().eq(WmsToolMaterialCheck::getNo, request.getNo())
+        return lambdaQuery()
+                .eq(WmsToolMaterialCheck::getNo, request.getNo())
+                .orderByDesc(WmsToolMaterialCheck::getId)
                 .page(new Page<>(request.getPage(), request.getPageSize()));
     }
 }
diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsToolMaterialMaintainServiceImpl.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsToolMaterialMaintainServiceImpl.java
index 6f116f4c..d287f908 100644
--- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsToolMaterialMaintainServiceImpl.java
+++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsToolMaterialMaintainServiceImpl.java
@@ -45,7 +45,9 @@ public class WmsToolMaterialMaintainServiceImpl extends ServiceImpl<WmsToolMater
 
     @Override
     public IPage<WmsToolMaterialMaintain> search(GongZhuangTaiZhangCheckListQO request) {
-        return lambdaQuery().eq(WmsToolMaterialMaintain::getNo, request.getNo())
+        return lambdaQuery()
+                .eq(WmsToolMaterialMaintain::getNo, request.getNo())
+                .orderByDesc(WmsToolMaterialMaintain::getId)
                 .page(new Page<>(request.getPage(), request.getPageSize()));
     }
 }
diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsToolMaterialServiceImpl.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsToolMaterialServiceImpl.java
index c070b780..faa8de91 100644
--- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsToolMaterialServiceImpl.java
+++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsToolMaterialServiceImpl.java
@@ -63,6 +63,7 @@ public class WmsToolMaterialServiceImpl extends ServiceImpl<WmsToolMaterialMappe
     public IPage<WmsToolMaterial> search(ToolMaterialSearchQO request) {
         return lambdaQuery()
                 .like(StrUtil.isNotBlank(request.getNo()), WmsToolMaterial::getNo, request.getNo())
+                .orderByDesc(WmsToolMaterial::getId)
                 .page(new Page<>(request.getPage(), request.getPageSize()));
     }
 
diff --git a/nflg-wms-repository/src/main/resources/mapper/AdMapper.xml b/nflg-wms-repository/src/main/resources/mapper/AdMapper.xml
index 2c5911bc..f1d46535 100644
--- a/nflg-wms-repository/src/main/resources/mapper/AdMapper.xml
+++ b/nflg-wms-repository/src/main/resources/mapper/AdMapper.xml
@@ -7,6 +7,7 @@
         from ad a
         inner join ad_sync ac on a.id = ac.ad_id
         where a.enable
+        order by a."id" desc
     </select>
 
     <select id="getInfo" resultType="com.nflg.wms.common.pojo.dto.AdDTO">
diff --git a/nflg-wms-repository/src/main/resources/mapper/DictionaryItemTranslateMapper.xml b/nflg-wms-repository/src/main/resources/mapper/DictionaryItemTranslateMapper.xml
index c027b61d..ec90e7e8 100644
--- a/nflg-wms-repository/src/main/resources/mapper/DictionaryItemTranslateMapper.xml
+++ b/nflg-wms-repository/src/main/resources/mapper/DictionaryItemTranslateMapper.xml
@@ -15,6 +15,7 @@
         FROM dictionary_item_translate t
             LEFT JOIN language l ON t.language_code=l.code
         WHERE t.dictionary_item_id=#{id}
+        ORDER BY t.id
     </select>
 
     <select id="getAllByDictionaryCode" resultType="com.nflg.wms.common.pojo.vo.DictionaryItemTranslateVO">
@@ -25,6 +26,7 @@
             LEFT JOIN dictionary_item_translate t ON t.dictionary_item_id=di.id AND t.language_code=#{language}
             LEFT JOIN "language" l ON t.language_code=l.code
         WHERE d.code=#{code}
+        ORDER BY t.id
     </select>
 
     <select id="getByDictionaryCode" resultType="com.nflg.wms.repository.entity.DictionaryItemTranslate">
@@ -33,5 +35,6 @@
                  INNER JOIN dictionary_item di on di.id=dit.dictionary_item_id
                  inner join dictionary d on di.dictionary_id=d.id
         WHERE d.code=#{dictionaryCode}
+        ORDER BY dit.id
     </select>
 </mapper>
diff --git a/nflg-wms-repository/src/main/resources/mapper/DictionaryMapper.xml b/nflg-wms-repository/src/main/resources/mapper/DictionaryMapper.xml
index 658e7ab7..d47371d1 100644
--- a/nflg-wms-repository/src/main/resources/mapper/DictionaryMapper.xml
+++ b/nflg-wms-repository/src/main/resources/mapper/DictionaryMapper.xml
@@ -7,5 +7,6 @@
         FROM "dictionary" d
         INNER JOIN dictionary_item di ON d."id"=di.dictionary_id
         WHERE d.code=#{code} AND di.code=#{itemCode}
+        order by di.id
     </select>
 </mapper>
diff --git a/nflg-wms-repository/src/main/resources/mapper/MenuMapper.xml b/nflg-wms-repository/src/main/resources/mapper/MenuMapper.xml
index 918a3e3f..43b58676 100644
--- a/nflg-wms-repository/src/main/resources/mapper/MenuMapper.xml
+++ b/nflg-wms-repository/src/main/resources/mapper/MenuMapper.xml
@@ -11,6 +11,7 @@
         WHERE mb.enable = TRUE
           AND mb.menu_id = #{menuId}
           AND urm.user_id = #{userId}
+        order by mb.id
     </select>
 
     <select id="menuIsSelected" resultType="java.lang.Boolean">
diff --git a/nflg-wms-repository/src/main/resources/mapper/RoleMapper.xml b/nflg-wms-repository/src/main/resources/mapper/RoleMapper.xml
index c37d3048..a792205a 100644
--- a/nflg-wms-repository/src/main/resources/mapper/RoleMapper.xml
+++ b/nflg-wms-repository/src/main/resources/mapper/RoleMapper.xml
@@ -10,6 +10,7 @@
                 AND name ilike CONCAT('%',#{request.name},'%')
             </if>
         </where>
+        ORDER BY id DESC
     </select>
 
     <select id="getMenusByRoleCodes" resultType="com.nflg.wms.common.pojo.vo.MenuVO">
@@ -22,5 +23,6 @@
           AND r.enable = TRUE
           AND urm.user_id = #{userId}
           AND m.service_desc_id = #{serviceId}
+        order by m.id
     </select>
 </mapper>
diff --git a/nflg-wms-repository/src/main/resources/mapper/UserMapper.xml b/nflg-wms-repository/src/main/resources/mapper/UserMapper.xml
index e959c942..e0a05e40 100644
--- a/nflg-wms-repository/src/main/resources/mapper/UserMapper.xml
+++ b/nflg-wms-repository/src/main/resources/mapper/UserMapper.xml
@@ -33,5 +33,6 @@
                 and vu.create_time &lt;= #{request.endDate}
             </if>
         </where>
+        order by vu.id desc
     </select>
 </mapper>
\ No newline at end of file
diff --git a/nflg-wms-repository/src/main/resources/mapper/UserRoleMapMapper.xml b/nflg-wms-repository/src/main/resources/mapper/UserRoleMapMapper.xml
index dc5c18f1..77070702 100644
--- a/nflg-wms-repository/src/main/resources/mapper/UserRoleMapMapper.xml
+++ b/nflg-wms-repository/src/main/resources/mapper/UserRoleMapMapper.xml
@@ -7,6 +7,7 @@
         FROM user_role_map urm
                  INNER JOIN "role" r ON urm.role_id=r."id"
         WHERE urm.user_id=#{id}
+        ORDER BY r."id"
     </select>
 
     <select id="getAuthorizeUser" resultType="com.nflg.wms.common.pojo.vo.UserVO">
@@ -16,6 +17,7 @@
                  left join user_interior b on u."id"=b.user_id
                  left join department c on b.dept_id=c."id"
         where urm.role_id = #{roleId}
+        order by u.id
     </select>
 
     <select id="getAuthorizeRole" resultType="com.nflg.wms.common.pojo.vo.RoleSimpleVO">
@@ -23,5 +25,6 @@
         from user_role_map urm
         inner join role r on urm.role_id = r.id
         where urm.user_id = #{userId}
+        order by r.id
     </select>
 </mapper>
diff --git a/nflg-wms-repository/src/main/resources/mapper/WmsBinMapper.xml b/nflg-wms-repository/src/main/resources/mapper/WmsBinMapper.xml
index d5077bc2..11feb8c5 100644
--- a/nflg-wms-repository/src/main/resources/mapper/WmsBinMapper.xml
+++ b/nflg-wms-repository/src/main/resources/mapper/WmsBinMapper.xml
@@ -22,6 +22,7 @@
         <foreach item="item" collection="ids" separator="," open="(" close=")">
             #{item}
         </foreach>
+        order by bin.id desc
     </select>
 
     <select id="searchNonPage" resultType="com.nflg.wms.common.pojo.vo.BinVO">
diff --git a/nflg-wms-repository/src/main/resources/mapper/WmsBomMapper.xml b/nflg-wms-repository/src/main/resources/mapper/WmsBomMapper.xml
index a0d8f1cd..0cc80a9f 100644
--- a/nflg-wms-repository/src/main/resources/mapper/WmsBomMapper.xml
+++ b/nflg-wms-repository/src/main/resources/mapper/WmsBomMapper.xml
@@ -7,5 +7,6 @@
         FROM wms_bom b1
         INNER JOIN wms_bom b2 ON b2.parent_id=b1."id"
         WHERE b1."no"=#{materialNo}
+        ORDER BY b2.id
     </select>
 </mapper>
diff --git a/nflg-wms-repository/src/main/resources/mapper/WmsComponentPackingMapper.xml b/nflg-wms-repository/src/main/resources/mapper/WmsComponentPackingMapper.xml
index a5339e5d..058fa3aa 100644
--- a/nflg-wms-repository/src/main/resources/mapper/WmsComponentPackingMapper.xml
+++ b/nflg-wms-repository/src/main/resources/mapper/WmsComponentPackingMapper.xml
@@ -32,7 +32,7 @@
                 and datum &lt;= #{request.endDate}
             </if>
         </where>
-        order by create_time desc
+        order by id desc
     </select>
 
     <select id="getOutboundTask" resultType="com.nflg.wms.common.pojo.vo.ComponentPackingPdaVO">
diff --git a/nflg-wms-repository/src/main/resources/mapper/WmsInCostcenterBackTicketItemMapper.xml b/nflg-wms-repository/src/main/resources/mapper/WmsInCostcenterBackTicketItemMapper.xml
index 7682b241..1ea71069 100644
--- a/nflg-wms-repository/src/main/resources/mapper/WmsInCostcenterBackTicketItemMapper.xml
+++ b/nflg-wms-repository/src/main/resources/mapper/WmsInCostcenterBackTicketItemMapper.xml
@@ -7,5 +7,6 @@
         FROM wms_in_costcenter_back_ticket_item icbti
         INNER JOIN wms_in_costcenter_back_item icbi ON icbti.order_item_id=icbi."id"
         WHERE icbti.ticket_id=#{id}
+        ORDER BY icbti.id desc
     </select>
 </mapper>
diff --git a/nflg-wms-repository/src/main/resources/mapper/WmsInProduceBackItemMapper.xml b/nflg-wms-repository/src/main/resources/mapper/WmsInProduceBackItemMapper.xml
index 14f226f5..bbcc6af5 100644
--- a/nflg-wms-repository/src/main/resources/mapper/WmsInProduceBackItemMapper.xml
+++ b/nflg-wms-repository/src/main/resources/mapper/WmsInProduceBackItemMapper.xml
@@ -6,5 +6,6 @@
         select *
         from wms_in_produce_back_item
         where order_id=#{id}
+        order by id desc
     </select>
 </mapper>
diff --git a/nflg-wms-repository/src/main/resources/mapper/WmsInProduceBackTicketItemMapper.xml b/nflg-wms-repository/src/main/resources/mapper/WmsInProduceBackTicketItemMapper.xml
index 3ee6bd34..9f5b7380 100644
--- a/nflg-wms-repository/src/main/resources/mapper/WmsInProduceBackTicketItemMapper.xml
+++ b/nflg-wms-repository/src/main/resources/mapper/WmsInProduceBackTicketItemMapper.xml
@@ -8,5 +8,6 @@
         INNER JOIN wms_in_produce_back_item ipbi ON ipbti.produce_back_item_id=ipbi."id"
         inner join wms_in_produce_back ipb on ipb.id=ipbi.order_id
         WHERE ipbti.ticket_id=#{id}
+        ORDER BY ipbti.id
     </select>
 </mapper>
diff --git a/nflg-wms-repository/src/main/resources/mapper/WmsInProduceBackTicketMapper.xml b/nflg-wms-repository/src/main/resources/mapper/WmsInProduceBackTicketMapper.xml
index 24405890..ed93e927 100644
--- a/nflg-wms-repository/src/main/resources/mapper/WmsInProduceBackTicketMapper.xml
+++ b/nflg-wms-repository/src/main/resources/mapper/WmsInProduceBackTicketMapper.xml
@@ -20,6 +20,7 @@
                 and ipbt.create_time &lt;= #{request.endDate}
             </if>
         </where>
+        ORDER BY ipbt.id DESC
     </select>
 
     <select id="getInfo" resultType="com.nflg.wms.common.pojo.vo.InProduceBackTicketVO">
diff --git a/nflg-wms-repository/src/main/resources/mapper/WmsInProduceOrderItemMapper.xml b/nflg-wms-repository/src/main/resources/mapper/WmsInProduceOrderItemMapper.xml
index f26b88f7..889b3345 100644
--- a/nflg-wms-repository/src/main/resources/mapper/WmsInProduceOrderItemMapper.xml
+++ b/nflg-wms-repository/src/main/resources/mapper/WmsInProduceOrderItemMapper.xml
@@ -7,5 +7,6 @@
         FROM wms_in_produce_order ipo
         INNER JOIN wms_in_produce_order_item ipoi ON ipo."id"=ipoi.order_id
         WHERE ipo."id"=#{id}
+        ORDER BY ipoi.id
     </select>
 </mapper>
diff --git a/nflg-wms-repository/src/main/resources/mapper/WmsStorageMapper.xml b/nflg-wms-repository/src/main/resources/mapper/WmsStorageMapper.xml
index 71186293..b46a6ba1 100644
--- a/nflg-wms-repository/src/main/resources/mapper/WmsStorageMapper.xml
+++ b/nflg-wms-repository/src/main/resources/mapper/WmsStorageMapper.xml
@@ -27,7 +27,7 @@
                 and t."binNos" like concat('%', #{request.binNo}, '%')
             </if>
         </where>
-        order by id desc
+        order by t.id desc
     </select>
 
     <select id="getList" resultType="com.nflg.wms.common.pojo.vo.StorageVO">
@@ -41,6 +41,7 @@
         <foreach item="item" collection="ids" separator="," open="(" close=")">
             #{item}
         </foreach>
+        order by s.id desc
     </select>
 
     <select id="searchNonPage" resultType="com.nflg.wms.common.pojo.vo.StorageVO">
@@ -68,6 +69,7 @@
                 and t."binNos" like concat('%', #{request.binNo}, '%')
             </if>
         </where>
+        order by t.id desc
     </select>
 
     <select id="getWarehouseNo" resultType="java.lang.String">
@@ -95,6 +97,7 @@
         FROM wms_storage s
         LEFT JOIN wms_warehouse wh ON s.warehouse_id = wh.id
         LEFT JOIN dictionary_item di ON wh.factory_id = di."id"
-        where s.sap_state != 1;
+        where s.sap_state != 1
+        order by s.id desc
     </select>
 </mapper>
diff --git a/nflg-wms-repository/src/main/resources/mapper/WmsStructuralPackageOrderTrayItemMapper.xml b/nflg-wms-repository/src/main/resources/mapper/WmsStructuralPackageOrderTrayItemMapper.xml
index 2f913d5b..fa276d42 100644
--- a/nflg-wms-repository/src/main/resources/mapper/WmsStructuralPackageOrderTrayItemMapper.xml
+++ b/nflg-wms-repository/src/main/resources/mapper/WmsStructuralPackageOrderTrayItemMapper.xml
@@ -19,5 +19,6 @@
         from wms_structural_package_order_tray ot
         inner join wms_structural_package_order_tray_item oti on ot."id"=oti.tray_id
         where ot.no=#{trayNo}
+        order by oti.id
     </select>
 </mapper>
diff --git a/nflg-wms-repository/src/main/resources/mapper/WmsStructuralPackageOrderTrayMapper.xml b/nflg-wms-repository/src/main/resources/mapper/WmsStructuralPackageOrderTrayMapper.xml
index 0e367f5b..c1b3af45 100644
--- a/nflg-wms-repository/src/main/resources/mapper/WmsStructuralPackageOrderTrayMapper.xml
+++ b/nflg-wms-repository/src/main/resources/mapper/WmsStructuralPackageOrderTrayMapper.xml
@@ -55,6 +55,7 @@
         <foreach item="item" collection="ids" separator="," open="(" close=")">
             #{item}
         </foreach>
+        order by o.id desc
     </select>
 
     <select id="getInfo" resultType="com.nflg.wms.common.pojo.vo.DeliverStructuralPackageOrderExtendVO">
diff --git a/nflg-wms-repository/src/main/resources/mapper/WmsWarehouseMapper.xml b/nflg-wms-repository/src/main/resources/mapper/WmsWarehouseMapper.xml
index deaf8a71..fbd7e3b2 100644
--- a/nflg-wms-repository/src/main/resources/mapper/WmsWarehouseMapper.xml
+++ b/nflg-wms-repository/src/main/resources/mapper/WmsWarehouseMapper.xml
@@ -17,6 +17,7 @@
                 and w.name ilike concat('%',#{request.name},'%')
             </if>
         </where>
+        order by w.id desc
     </select>
 
     <select id="getList" resultType="com.nflg.wms.common.pojo.vo.WarehouseVO">
@@ -27,6 +28,7 @@
         <foreach item="item" collection="ids" separator="," open="(" close=")">
             #{item}
         </foreach>
+        order by w.id desc
     </select>
 
     <select id="searchNonPage" resultType="com.nflg.wms.common.pojo.vo.WarehouseVO">
@@ -41,6 +43,7 @@
                 and w.name ilike concat('%',#{request.name},'%')
             </if>
         </where>
+        order by w.id desc
     </select>
 
     <select id="getEnableList" resultType="com.nflg.wms.common.pojo.vo.WarehouseVO">
@@ -51,7 +54,7 @@
         <if test="factoryNo!=null and factoryNo!=''">
             and di.code=#{factoryNo}
         </if>
-        order by w.id
+        order by di.code,w.id desc
     </select>
 
     <select id="getListByIds" resultType="com.nflg.wms.common.pojo.vo.WarehouseVO">
@@ -62,5 +65,6 @@
         <foreach item="item" collection="list" separator="," open="(" close=")">
             #{item}
         </foreach>
+        order by w.id desc
     </select>
 </mapper>