Merge remote-tracking branch 'origin/dev' into dev

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);
 

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);
 

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);
 

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);
         }
 

src/main/java/com/glxp/api/req/inv/FilterInvPreProductDetailRequest.java

@@ -76,4 +76,7 @@ public class FilterInvPreProductDetailRequest extends ListPageRequest {
      */
     private String updateTime;
 
+
+
+
 }

src/main/java/com/glxp/api/res/inv/InvPreinProductResponse.java

@@ -30,6 +30,11 @@ public class InvPreinProductResponse {
      */
     private String ggxh;
 
+    /*
+    * 计量单位
+    * */
+    private String measname;
+
     /**
      * 批次号
      */

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;

src/main/java/com/glxp/api/service/inv/impl/InvPreProductDetailServiceImpl.java

@@ -147,6 +147,7 @@ public class InvPreProductDetailServiceImpl implements InvPreProductDetailServic
 
         //设置单据类型名称
         BasicBussinessTypeEntity busType = bussinessTypeDao.selectOne(new QueryWrapper<BasicBussinessTypeEntity>().select("name").eq("action", response.getAction()));
+        if (busType != null)
             response.setActionName(busType.getName());
         //设置单据日期
         IoOrderEntity order = orderDao.selectOne(new QueryWrapper<IoOrderEntity>().select("createTime").eq("billNo", response.getOrderId()));

src/main/java/com/glxp/api/service/inv/impl/InvProductDetailServiceImpl.java

@@ -161,6 +161,7 @@ public class InvProductDetailServiceImpl implements InvProductDetailService {
 
         //设置单据类型名称
         BasicBussinessTypeEntity busType = bussinessTypeDao.selectOne(new QueryWrapper<BasicBussinessTypeEntity>().select("name").eq("action", response.getAction()));
+        if (busType != null)
             response.setActionName(busType.getName());
         //设置单据日期
         IoOrderEntity order = orderDao.selectOne(new QueryWrapper<IoOrderEntity>().select("createTime").eq("billNo", response.getOrderId()));

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;
 }

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

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">

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,

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">

src/main/resources/mybatis/mapper/inv/invProductDetailDao.xml

@@ -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">