diff --git a/src/main/java/com/gaotao/modules/finishedProduct/service/impl/PackingServiceImpl.java b/src/main/java/com/gaotao/modules/finishedProduct/service/impl/PackingServiceImpl.java
index 5bc354b..5673281 100644
--- a/src/main/java/com/gaotao/modules/finishedProduct/service/impl/PackingServiceImpl.java
+++ b/src/main/java/com/gaotao/modules/finishedProduct/service/impl/PackingServiceImpl.java
@@ -26,6 +26,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.servlet.http.HttpServletRequest;
+import java.text.DecimalFormat;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -449,7 +450,9 @@ public class PackingServiceImpl implements PackingService {
                         if (stringStringMap.get(cloumn) != null) {
                             if ("数量".equals(cloumn)) {
                                 cloumnSql.append(" , ").append(cloumn);
-                                valueSql.append(" , ").append("'" + pickingNumber.intValue() + "'");
+                                // 创建一个DecimalFormat实例，并设置格式模式
+                                DecimalFormat df = new DecimalFormat("#.###");
+                                valueSql.append(" , ").append("'" + df.format(pickingNumber) + "'");
                             }
 //                            else if ("U_PDNum".equals(cloumn)){
 //                                cloumnSql.append(" , ").append(cloumn);
diff --git a/src/main/java/com/gaotao/modules/pda/dao/impl/RollDaoImpl.java b/src/main/java/com/gaotao/modules/pda/dao/impl/RollDaoImpl.java
index 3d3e0e9..9420812 100644
--- a/src/main/java/com/gaotao/modules/pda/dao/impl/RollDaoImpl.java
+++ b/src/main/java/com/gaotao/modules/pda/dao/impl/RollDaoImpl.java
@@ -234,7 +234,7 @@ public class RollDaoImpl implements RollDao {
         sql.append("WHERE");
         sql.append("	RollNo = :rollNo AND Site =:site AND Status_DB =:status_DB  and warehouseid = :warehouseID ");
         sql.append("	AND RollDate  <=   dateadd(DAY, CAST(dbo.get_sys_config_value('rollOutDateCheck') AS INT), ");
-        sql.append("	 (SELECT MIN(RollDate) FROM C_RollInfo WHERE PartNo = :partNo and Status_DB = 'I' and ISNULL(scanner_status, 'N') != 'Y' ))	");
+        sql.append("	 (SELECT MIN(RollDate) FROM C_RollInfo WHERE PartNo = :partNo and Status_DB = 'I' and ISNULL(scanner_status, 'N') != 'Y' and warehouseid = :warehouseID) )	");
 
         List<RollInfo> query = parameterJdbcTemplate.query(sql.toString(), paramMap, new BeanPropertyRowMapper<>(RollInfo.class));
         if (CollectionUtil.isNotEmpty(query)){
diff --git a/src/main/java/com/gaotao/modules/shopOrder/controller/ShopOrderController.java b/src/main/java/com/gaotao/modules/shopOrder/controller/ShopOrderController.java
index bca0fb2..d95fe4f 100644
--- a/src/main/java/com/gaotao/modules/shopOrder/controller/ShopOrderController.java
+++ b/src/main/java/com/gaotao/modules/shopOrder/controller/ShopOrderController.java
@@ -445,7 +445,6 @@ public class ShopOrderController extends AbstractController {
      * @Param shopOrderData
      **/
     @PostMapping("getOrderInfo")
-
     public R getOrderInfo(@RequestBody ShopOrderData shopOrderData) {
         ShopOrderData orderInfo = shopOrderService.getOrderInfo(shopOrderData);
         return R.ok().put("orderInfo", orderInfo);
diff --git a/src/main/resources/mapper/shopOrder/ShopOrderMapper.xml b/src/main/resources/mapper/shopOrder/ShopOrderMapper.xml
index b65fd0c..110e364 100644
--- a/src/main/resources/mapper/shopOrder/ShopOrderMapper.xml
+++ b/src/main/resources/mapper/shopOrder/ShopOrderMapper.xml
@@ -539,7 +539,7 @@
              , P.PartDescription                             as part_desc
              , isnull(P.Spec, '')                            as spec
              , T.Remark                                      as remark
-             , dbo.getOrderFirstItemNoFun(T.Site, T.OrderNo) as first_item_no
+             , dbo.get_ShopOrderPrintInfo(T.Site, T.OrderNo) as first_item_no
         from ShopOrder as T,
              Part as P
         Where T.Site = P.Site