新增库存过滤方式，新增内网版本更新

src/main/java/com/glxp/api/controller/inout/IoOrderController.java

@@ -993,6 +993,8 @@ public class IoOrderController extends BaseController {
     public BaseResponse updateOrder(@RequestBody IoOrderEntity ioOrderEntity) {
 
         ioOrderEntity.setUpdateTime(new Date());
+        ioOrderEntity.setUpdateUser(getUserId() + "");
+        ioOrderEntity.setConfirmUser(getUserId() + "");
         orderService.updateByBillNo(ioOrderEntity);
 
         if (IntUtil.value(ioOrderEntity.getCheckStatus()) != 0) {

src/main/java/com/glxp/api/controller/system/VersionController.java

@@ -0,0 +1,31 @@
+package com.glxp.api.controller.system;
+
+import com.glxp.api.common.enums.ResultEnum;
+import com.glxp.api.common.res.BaseResponse;
+import com.glxp.api.common.util.ResultVOUtils;
+import com.glxp.api.entity.system.VersionEntity;
+import com.glxp.api.req.system.FilterVersionRequest;
+import com.glxp.api.service.system.VersionService;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import javax.validation.Valid;
+
+@RestController
+public class VersionController {
+
+
+    @Resource
+    private VersionService versionService;
+
+    @GetMapping("/sale/version")
+    public BaseResponse getVersion(@Valid FilterVersionRequest filterVersionRequest, BindingResult bindingResult) {
+        if (bindingResult.hasErrors()) {
+            return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
+        }
+        VersionEntity versionEntity = versionService.getVersion(filterVersionRequest);
+        return ResultVOUtils.success(versionEntity);
+    }
+}

src/main/java/com/glxp/api/dao/system/VersionDao.java

@@ -0,0 +1,13 @@
+package com.glxp.api.dao.system;
+
+import com.glxp.api.dao.BaseMapperPlus;
+import com.glxp.api.entity.system.VersionEntity;
+import com.glxp.api.req.system.FilterVersionRequest;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface VersionDao extends BaseMapperPlus<VersionDao, VersionEntity, VersionEntity> {
+
+    VersionEntity getVersion(FilterVersionRequest filterVersionRequest);
+
+}

src/main/java/com/glxp/api/entity/inout/IoOrderEntity.java

@@ -199,6 +199,10 @@ public class IoOrderEntity {
     private boolean reviewSp;   //是否验收外网单据时，需忽略流转更改为待审核
 
 
+    @TableField(value = "confirmUser")
+    private String confirmUser;
+
+
     /**
      * 单据类型：1.业务单据，2:扫码单据,3.正常处理单据  只有草稿，异常，待处理
      */

src/main/java/com/glxp/api/entity/system/VersionEntity.java

@@ -0,0 +1,17 @@
+package com.glxp.api.entity.system;
+
+import lombok.Data;
+
+@Data
+public class VersionEntity {
+
+    private String id;
+    private String type;
+    private String versionName;
+    private String versionCode;
+    private String appName;
+    private String createTime;
+    private String downloadUrl;
+    private String updateLog;
+
+}

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

@@ -110,5 +110,5 @@ public class FilterInvPreProductRequest extends ListPageRequest {
     private Integer filterCount;
 
     private String diCode;
-
+    private Integer filterNoInv;
 }

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

@@ -114,4 +114,7 @@ public class FilterInvPreinProductRequest extends ListPageRequest {
 
     private String startTime;
     private String endTime;
+
+    private Integer filterNoInv;
+
 }

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

@@ -118,5 +118,7 @@ public class FilterInvProductRequest extends ListPageRequest {
 
     private String basicPrductRemak1;
     private String category;
+    private Integer filterNoInv;
+
 
 }

src/main/java/com/glxp/api/req/system/FilterVersionRequest.java

@@ -0,0 +1,9 @@
+package com.glxp.api.req.system;
+
+import lombok.Data;
+
+@Data
+public class FilterVersionRequest {
+
+    private String type;
+}

src/main/java/com/glxp/api/res/inout/IoOrderResponse.java

@@ -228,7 +228,7 @@ public class IoOrderResponse {
 
     private Date checkTime;
     private String checkUserName;
-
+    private String confirmUser;
     //总金额
     private BigDecimal allAmount;
     private Integer confirmStatus;
@@ -268,4 +268,6 @@ public class IoOrderResponse {
         }
         return exportStatus;
     }
+
+    private String result;
 }

src/main/java/com/glxp/api/service/inout/IoAddInoutService.java

@@ -1158,7 +1158,7 @@ public class IoAddInoutService {
 
             } else {
                 // 4.若数量不足，则出下一批次
-                InvProductDetailEntity nextInvProduct = invProductDetailService.selectNextInBatch(bussinessTypeEntity, codeTempEntity.getRelId() + "", codeTempEntity.getBatchNo(), codeTempEntity.getInvCode(), ConstantType.TYPE_PUT, lastList.get(0).getInBatchNo());
+                InvProductDetailEntity nextInvProduct = invProductDetailService.selectNextInBatch(bussinessTypeEntity, codeTempEntity.getRelId() + "", codeTempEntity.getBatchNo(), codeTempEntity.getInvCode(), ConstantType.TYPE_PUT, lastInBatch);
                 if (nextInvProduct != null) {
                     codeTempEntity.setPrice(nextInvProduct.getPrice());
                     codeTempEntity.setInBatchNo(nextInvProduct.getInBatchNo());

src/main/java/com/glxp/api/service/system/VersionService.java

@@ -0,0 +1,19 @@
+package com.glxp.api.service.system;
+
+
+import com.glxp.api.entity.system.VersionEntity;
+import com.glxp.api.req.system.DeleteRequest;
+import com.glxp.api.req.system.FilterVersionRequest;
+
+import java.util.List;
+
+public interface VersionService {
+
+    boolean insertVersion(VersionEntity versionEntity);
+
+    boolean insertVersionList(List<VersionEntity> versionEntities);
+
+    VersionEntity getVersion(FilterVersionRequest filterVersionRequest);
+
+    boolean deleteVersion(DeleteRequest deleteVersionRequest);
+}

src/main/java/com/glxp/api/service/system/impl/VersionServiceImpl.java

@@ -0,0 +1,38 @@
+package com.glxp.api.service.system.impl;
+
+import com.glxp.api.dao.system.VersionDao;
+import com.glxp.api.entity.system.VersionEntity;
+import com.glxp.api.req.system.DeleteRequest;
+import com.glxp.api.req.system.FilterVersionRequest;
+import com.glxp.api.service.system.VersionService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+@Service
+public class VersionServiceImpl implements VersionService {
+
+    @Resource
+    VersionDao versionDao;
+
+    @Override
+    public boolean insertVersion(VersionEntity versionEntity) {
+        return versionDao.insert(versionEntity) > 0;
+    }
+
+    @Override
+    public boolean insertVersionList(List<VersionEntity> versionEntities) {
+        return versionDao.insertBatch(versionEntities);
+    }
+
+    @Override
+    public VersionEntity getVersion(FilterVersionRequest filterVersionRequest) {
+        return versionDao.getVersion(filterVersionRequest);
+    }
+
+    @Override
+    public boolean deleteVersion(DeleteRequest deleteVersionRequest) {
+        return versionDao.deleteById(deleteVersionRequest.getId()) > 0;
+    }
+}

src/main/resources/application-pro.yml

@@ -3,7 +3,7 @@ server:
 spring:
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    jdbc-url: jdbc:mysql://192.168.0.166:3306/udi_wms_zyy?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
+    jdbc-url: jdbc:mysql://192.168.0.166:3306/udi_wms_pt?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
     username: root
     password: 123456
     hikari:

src/main/resources/mybatis/mapper/inout/IoOrderDao.xml

@@ -419,7 +419,7 @@
     </select>
 
     <select id="selectUploadOrder" resultType="com.glxp.api.res.inout.IoOrderResponse">
-        select io.*,
+        select io.*,ioul.result,
                (select name from basic_bussiness_type bus where bus.action = io.action) billTypeName,
                (select name from auth_dept ad where ad.code = io.deptCode)              deptName,
                (select name from auth_warehouse aw where aw.code = io.invCode)          invName,
@@ -432,6 +432,7 @@
                (select name from basic_corp bc where bc.erpId = io.fromCorp)            fromCorpName,
                (select name from basic_corp bc where bc.erpId = io.customerId)          customerName
         from io_order as io
+                     left join io_order_upload_log ioul on io.billNo = ioul.billNo
         <where>
             io.dealStatus = 3
             <if test="billType != null and billType != ''">

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

@@ -71,6 +71,15 @@
             <if test="invCode != null and invCode != ''">
                 AND ipp.invCode = #{invCode}
             </if>
+            <if test="filterNoInv != null and filterNoInv == 1">
+                AND ipp.reCount <![CDATA[ > ]]> 0
+            </if>
+            <if test="filterNoInv != null and filterNoInv == 2">
+                AND ipp.reCount <![CDATA[ = ]]> 0
+            </if>
+            <if test="filterNoInv != null and filterNoInv == 3">
+                AND ipp.reCount <![CDATA[ < ]]> 0
+            </if>
             <if test="invCodes != null and invCodes.size() != 0">
                 AND ipp.invCode in
                 <foreach collection="invCodes" item="item" index="index" open="(" close=")" separator=",">

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

@@ -70,6 +70,15 @@
             <if test="invCode != null and invCode != ''">
                 AND ipp.invCode = #{invCode}
             </if>
+            <if test="filterNoInv != null and filterNoInv == 1">
+                AND ipp.reCount <![CDATA[ > ]]> 0
+            </if>
+            <if test="filterNoInv != null and filterNoInv == 2">
+                AND ipp.reCount <![CDATA[ = ]]> 0
+            </if>
+            <if test="filterNoInv != null and filterNoInv == 3">
+                AND ipp.reCount <![CDATA[ < ]]> 0
+            </if>
             <if test="invCodes != null and invCodes.size() != 0">
                 AND ipp.invCode in
                 <foreach collection="invCodes" item="item" index="index" open="(" close=")" separator=",">

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

@@ -79,6 +79,15 @@
             <if test="invSpaceCode != null and invSpaceCode != ''">
                 AND invSpaceCode = #{invSpaceCode}
             </if>
+            <if test="filterNoInv != null and filterNoInv == 1">
+                AND ip.reCount <![CDATA[ > ]]> 0
+            </if>
+            <if test="filterNoInv != null and filterNoInv == 2">
+                AND ip.reCount <![CDATA[ = ]]> 0
+            </if>
+            <if test="filterNoInv != null and filterNoInv == 3">
+                AND ip.reCount <![CDATA[ < ]]> 0
+            </if>
             <if test="invCodes != null and invCodes.size() != 0">
                 AND ip.invCode in
                 <foreach collection="invCodes" item="item" index="index" open="(" close=")" separator=",">

src/main/resources/mybatis/mapper/system/VersionDao.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+
+<mapper namespace="com.glxp.api.dao.system.VersionDao">
+    <select id="getVersion" parameterType="com.glxp.api.req.system.FilterVersionRequest"
+            resultType="com.glxp.api.entity.system.VersionEntity">
+        select *
+        from sys_app_version
+        <where>
+            <if test="type != null and type != ''">
+                and type = #{type}
+            </if>
+        </where>
+        order by versionCode desc
+        limit 1
+    </select>
+</mapper>

src/main/resources/schemas/schema_v2.4.sql

@@ -51,4 +51,26 @@ CREATE TABLE IF NOT EXISTS `inv_stock_compare_detail`
 ) ENGINE = InnoDB
   CHARACTER SET = utf8mb4
   COLLATE = utf8mb4_0900_ai_ci COMMENT = '库存对比明细'
-  ROW_FORMAT = Dynamic;
+  ROW_FORMAT = Dynamic;
+
+
+CALL Pro_Temp_ColumnWork('io_order', 'confirmUser', 'varchar(255)', 1);
+
+
+CREATE TABLE IF NOT EXISTS `sys_app_version`
+(
+    `id`          int                                                           NOT NULL,
+    `type`        varchar(40) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci  NOT NULL COMMENT '类型：android,pc,',
+    `versionName` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci  NULL DEFAULT NULL COMMENT '版本号',
+    `versionCode` int                                                           NULL DEFAULT NULL,
+    `appName`     varchar(40) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci  NULL DEFAULT NULL COMMENT '应用名称',
+    `createTime`  datetime(0)                                                   NULL DEFAULT NULL COMMENT '创建日期',
+    `downloadUrl` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '下载地址',
+    `updateLog`   varchar(600) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '更新日志',
+    PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB
+  CHARACTER SET = utf8mb4
+  COLLATE = utf8mb4_0900_ai_ci
+  ROW_FORMAT = DYNAMIC;
+
+INSERT ignore INTO `sys_app_version`(`id`, `type`, `versionName`, `versionCode`, `appName`, `createTime`, `downloadUrl`, `updateLog`) VALUES (1, 'udi_wms_new', '3.0.6', 306, 'UDI扫码终端', '2023-10-30 18:42:24', 'http://192.168.1.11:9150/udiwms_new.apk', '1.单据审核移除UDI码异常提示；2优化多项功能');