diff --git a/src/main/java/com/glxp/api/controller/inv/InvPreProductController.java b/src/main/java/com/glxp/api/controller/inv/InvPreProductController.java
index ab66a8ddc..9ac22485b 100644
--- a/src/main/java/com/glxp/api/controller/inv/InvPreProductController.java
+++ b/src/main/java/com/glxp/api/controller/inv/InvPreProductController.java
@@ -95,6 +95,9 @@ public class InvPreProductController extends BaseController {
      */
     @GetMapping("/spms/inv/pre/product/filterDetail")
     public BaseResponse filterInvPreProductDetail(FilterInvPreProductDetailRequest detailRequest) {
+        if (!"".equals(detailRequest.getOrderBy())) {
+            detailRequest.setOrderBy("updateTime");
+        }
         List<InvPreProductDetailEntity> invPreProductDetailEntities = invPreProductDetailService.filterPreProductDetailList(detailRequest);
         PageInfo<InvPreProductDetailEntity> pageInfo = new PageInfo<>(invPreProductDetailEntities);
 
diff --git a/src/main/java/com/glxp/api/controller/inv/InvPreinProductController.java b/src/main/java/com/glxp/api/controller/inv/InvPreinProductController.java
index 235a53390..96d89df4a 100644
--- a/src/main/java/com/glxp/api/controller/inv/InvPreinProductController.java
+++ b/src/main/java/com/glxp/api/controller/inv/InvPreinProductController.java
@@ -86,6 +86,11 @@ public class InvPreinProductController extends BaseController {
      */
     @GetMapping("/spms/inv/pre/in/product/filterDetail")
     public BaseResponse filterInvPreProductDetail(FilterInvPreProductDetailRequest detailRequest) {
+
+        if(!"".equals(detailRequest.getOrderBy())){
+            detailRequest.setOrderBy("updateTime");
+        }
+
         List<InvPreInProductDetailEntity> invPreProductDetailEntities = invPreinProductDetailService.filterPreProductDetailList(detailRequest);
         PageInfo<InvPreInProductDetailEntity> pageInfo = new PageInfo<>(invPreProductDetailEntities);
 
diff --git a/src/main/java/com/glxp/api/controller/inv/InvProductController.java b/src/main/java/com/glxp/api/controller/inv/InvProductController.java
index 336b6ac5b..8c01df363 100644
--- a/src/main/java/com/glxp/api/controller/inv/InvProductController.java
+++ b/src/main/java/com/glxp/api/controller/inv/InvProductController.java
@@ -128,6 +128,9 @@ public class InvProductController extends BaseController {
      */
     @GetMapping("/spms/inv/product/filterDetail")
     public BaseResponse filterInvProductDetail(FilterInvProductDetailRequest filterInvProductDetailRequest) {
+        if (!"".equals(filterInvProductDetailRequest.getOrderBy())) {
+            filterInvProductDetailRequest.setOrderBy("updateTime");
+        }
         List<InvProductDetailEntity> invProductDetailEntities = invProductDetailService.filterInvProductDetailList(filterInvProductDetailRequest);
         PageInfo<InvProductDetailEntity> pageInfo = new PageInfo<>(invProductDetailEntities);
 
diff --git a/src/main/java/com/glxp/api/controller/purchase/PurOrderController.java b/src/main/java/com/glxp/api/controller/purchase/PurOrderController.java
index 6b27cf2cd..374e15ac3 100644
--- a/src/main/java/com/glxp/api/controller/purchase/PurOrderController.java
+++ b/src/main/java/com/glxp/api/controller/purchase/PurOrderController.java
@@ -89,7 +89,7 @@ public class PurOrderController {
         purOrderEntity.setStatus(postPurOrderRequest.getEditStatus());    //草稿状态
 
         if (postPurOrderRequest.getType() != null) {
-            String billNo = gennerOrderUtils.createStOrderNo(new OrderNoTypeBean(Constant.SG_ORDER, "yyyyMMdd"));
+            String billNo = gennerOrderUtils.createStOrderNo(new OrderNoTypeBean(Constant.CG_ORDER, "yyyyMMdd"));
             purOrderEntity.setBillNo(billNo);
         }
 
diff --git a/src/main/java/com/glxp/api/req/inv/FilterInvPreProductDetailRequest.java b/src/main/java/com/glxp/api/req/inv/FilterInvPreProductDetailRequest.java
index 45ccf4c84..0ed24ae94 100644
--- a/src/main/java/com/glxp/api/req/inv/FilterInvPreProductDetailRequest.java
+++ b/src/main/java/com/glxp/api/req/inv/FilterInvPreProductDetailRequest.java
@@ -76,4 +76,7 @@ public class FilterInvPreProductDetailRequest extends ListPageRequest {
      */
     private String updateTime;
 
+
+
+
 }
diff --git a/src/main/java/com/glxp/api/res/inv/InvPreinProductResponse.java b/src/main/java/com/glxp/api/res/inv/InvPreinProductResponse.java
index f31c78d9c..42afb6169 100644
--- a/src/main/java/com/glxp/api/res/inv/InvPreinProductResponse.java
+++ b/src/main/java/com/glxp/api/res/inv/InvPreinProductResponse.java
@@ -30,6 +30,11 @@ public class InvPreinProductResponse {
      */
     private String ggxh;
 
+    /*
+    * 计量单位
+    * */
+    private String measname;
+
     /**
      * 批次号
      */
diff --git a/src/main/java/com/glxp/api/res/purchase/PurOrderDetailResponse.java b/src/main/java/com/glxp/api/res/purchase/PurOrderDetailResponse.java
index 601f18055..c15e3796e 100644
--- a/src/main/java/com/glxp/api/res/purchase/PurOrderDetailResponse.java
+++ b/src/main/java/com/glxp/api/res/purchase/PurOrderDetailResponse.java
@@ -17,6 +17,7 @@ public class PurOrderDetailResponse {
     private String productDate;
     private Integer count;
     private int reCount;
+    private int planCount;
     private Integer sweepCount;
     private String ylqxzcrbarmc;
     private String zczbhhzbapzbh;
diff --git a/src/main/java/com/glxp/api/service/inv/impl/InvPreProductDetailServiceImpl.java b/src/main/java/com/glxp/api/service/inv/impl/InvPreProductDetailServiceImpl.java
index f3bde48a8..dc27258a1 100644
--- a/src/main/java/com/glxp/api/service/inv/impl/InvPreProductDetailServiceImpl.java
+++ b/src/main/java/com/glxp/api/service/inv/impl/InvPreProductDetailServiceImpl.java
@@ -147,7 +147,8 @@ public class InvPreProductDetailServiceImpl implements InvPreProductDetailServic
 
         //设置单据类型名称
         BasicBussinessTypeEntity busType = bussinessTypeDao.selectOne(new QueryWrapper<BasicBussinessTypeEntity>().select("name").eq("action", response.getAction()));
-        response.setActionName(busType.getName());
+        if (busType != null)
+            response.setActionName(busType.getName());
         //设置单据日期
         IoOrderEntity order = orderDao.selectOne(new QueryWrapper<IoOrderEntity>().select("createTime").eq("billNo", response.getOrderId()));
         if (order != null)
diff --git a/src/main/java/com/glxp/api/service/inv/impl/InvProductDetailServiceImpl.java b/src/main/java/com/glxp/api/service/inv/impl/InvProductDetailServiceImpl.java
index 9c5fc31ea..696bb6636 100644
--- a/src/main/java/com/glxp/api/service/inv/impl/InvProductDetailServiceImpl.java
+++ b/src/main/java/com/glxp/api/service/inv/impl/InvProductDetailServiceImpl.java
@@ -161,7 +161,8 @@ public class InvProductDetailServiceImpl implements InvProductDetailService {
 
         //设置单据类型名称
         BasicBussinessTypeEntity busType = bussinessTypeDao.selectOne(new QueryWrapper<BasicBussinessTypeEntity>().select("name").eq("action", response.getAction()));
-        response.setActionName(busType.getName());
+        if (busType != null)
+            response.setActionName(busType.getName());
         //设置单据日期
         IoOrderEntity order = orderDao.selectOne(new QueryWrapper<IoOrderEntity>().select("createTime").eq("billNo", response.getOrderId()));
         if (order != null)
diff --git a/src/main/java/com/glxp/api/util/page/ListPageRequest.java b/src/main/java/com/glxp/api/util/page/ListPageRequest.java
index 75f1f39d0..1a8ed21ec 100644
--- a/src/main/java/com/glxp/api/util/page/ListPageRequest.java
+++ b/src/main/java/com/glxp/api/util/page/ListPageRequest.java
@@ -19,5 +19,6 @@ public class ListPageRequest {
     @Min(value = 1, message = "分页参数不能小于1")
     @Max(value = 500, message = "分页参数不能大于500")
     private Integer limit;
-
+    private String orderBy;
+    private String sort;
 }
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index b8a8be397..7e59ac974 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -4,9 +4,9 @@ server:
 spring:
   datasource:
     driver-class-name: com.p6spy.engine.spy.P6SpyDriver
-    jdbc-url: jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms_0510?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
+    jdbc-url: jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
     username: root
-    password: root
+    password: 123456
     hikari:
       connection-timeout: 60000
       maximum-pool-size: 20
diff --git a/src/main/resources/mybatis/mapper/inv/InvPreInProductDetailDao.xml b/src/main/resources/mybatis/mapper/inv/InvPreInProductDetailDao.xml
index b0dc8be5a..b45bb795e 100644
--- a/src/main/resources/mybatis/mapper/inv/InvPreInProductDetailDao.xml
+++ b/src/main/resources/mybatis/mapper/inv/InvPreInProductDetailDao.xml
@@ -51,6 +51,15 @@
                 AND updateTime <![CDATA[ <= ]]> #{updateTime}
             </if>
         </where>
+
+        <choose>
+            <when test="(orderBy != null) and (sort == 'desc' or sort == 'asc')">
+                order by ${orderBy} ${sort}
+            </when>
+            <otherwise>
+                ORDER BY updateTime DESC
+            </otherwise>
+        </choose>
     </select>
 
     <select id="findGroupBySpace" resultType="com.glxp.api.res.inv.InvPreinProductResponse">
@@ -284,7 +293,7 @@
                sp.name                        invSpaceName,
                ifnull(sum(pd.inCount), 0)  as inCount,
                ifnull(sum(pd.outCount), 0) as outCount,
-        pd.inCount - pd.outCount  as reCount
+               pd.inCount - pd.outCount    as reCount
         from inv_prein_product_detail pd
                      left join basic_udirel bu on pd.relId = bu.id
                      left join basic_products bp on bp.uuid = bu.uuid
diff --git a/src/main/resources/mybatis/mapper/inv/InvPreinProductDao.xml b/src/main/resources/mybatis/mapper/inv/InvPreinProductDao.xml
index 0cf8dfd99..1fb50cf95 100644
--- a/src/main/resources/mybatis/mapper/inv/InvPreinProductDao.xml
+++ b/src/main/resources/mybatis/mapper/inv/InvPreinProductDao.xml
@@ -7,6 +7,7 @@
                bp.cpmctymc,
                ipp.relIdFk,
                bp.ggxh,
+               bp.measname,
                ipp.batchNo,
                ipp.productionDate,
                ipp.expireDate,
diff --git a/src/main/resources/mybatis/mapper/inv/InvUserProductDao.xml b/src/main/resources/mybatis/mapper/inv/InvUserProductDao.xml
index 80e857adf..500f86223 100644
--- a/src/main/resources/mybatis/mapper/inv/InvUserProductDao.xml
+++ b/src/main/resources/mybatis/mapper/inv/InvUserProductDao.xml
@@ -131,6 +131,16 @@
                 AND updateTime <![CDATA[ <= ]]> #{updateTime}
             </if>
         </where>
+
+
+        <choose>
+            <when test="(orderBy != null) and (sort == 'desc' or sort == 'asc')">
+                order by ${orderBy} ${sort}
+            </when>
+            <otherwise>
+                ORDER BY updateTime DESC
+            </otherwise>
+        </choose>
     </select>
 
     <delete id="deleteInvPreProductDetail">
diff --git a/src/main/resources/mybatis/mapper/inv/invProductDetailDao.xml b/src/main/resources/mybatis/mapper/inv/invProductDetailDao.xml
index 66ac6e94d..4d148b32a 100644
--- a/src/main/resources/mybatis/mapper/inv/invProductDetailDao.xml
+++ b/src/main/resources/mybatis/mapper/inv/invProductDetailDao.xml
@@ -25,7 +25,7 @@
                ipp.deptCode,
                ipp.invCode,
                ipp.invSpaceCode,
-               ipp.code as code
+               ipp.code                     as code
         from inv_product_detail ipp
                      inner join basic_udirel on ipp.relId = basic_udirel.id
                      inner join basic_products bp on basic_udirel.uuid = bp.uuid
@@ -142,6 +142,16 @@
                 AND updateTime <![CDATA[ <= ]]> #{updateTime}
             </if>
         </where>
+
+
+        <choose>
+            <when test="(orderBy != null) and (sort == 'desc' or sort == 'asc')">
+                order by ${orderBy} ${sort}
+            </when>
+            <otherwise>
+                ORDER BY updateTime DESC
+            </otherwise>
+        </choose>
     </select>
 
     <delete id="deleteInvProductDetail">