Merge remote-tracking branch 'origin/qms/develop' into qms/develop

nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/NormalPGIControllerService.java

@@ -137,6 +137,7 @@ public class NormalPGIControllerService {
         // 查询订单行项目列表
         List<WmsSrmOrderItem> orderItemList = wmsSrmOrderItemService.lambdaQuery()
                 .eq(WmsSrmOrderItem::getOrderId, order.getId())
+                .apply("delivery_qty-receipt_qty>0")
                 .list();
         VUtil.trueThrowBusinessError(CollectionUtil.isEmpty(orderItemList)).throwMessage("此收货单[" + orderNo + "] 已完成收货，无需再次操作");
 

nflg-wms-repository/src/main/resources/mapper/WmsInventoryMapper.xml

@@ -28,7 +28,7 @@
                 AND i.detection_results = #{request.detectionResults}
             </if>
         </where>
-        order by i.id desc
+        order by i.material_no,i.factory_no,i.warehouse_no,i.bin_location,i.batch_no
     </select>
 
     <select id="getNum" resultType="com.nflg.wms.common.pojo.dto.InventoryInDTO">