1.配货单据提交，单据详情数量添加校验

2.移除未使用的mybatis代码生成配置文件

api-admin/src/main/java/com/glxp/sale/admin/controller/inout/StockOrderController.java

@@ -1,6 +1,7 @@
 package com.glxp.sale.admin.controller.inout;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
 import com.github.pagehelper.PageInfo;
 import com.glxp.sale.admin.annotation.AuthRuleAnnotation;
@@ -156,6 +157,15 @@ public class StockOrderController {
                 stockOrderEntity.setStatus("202");//已配货
             }
         }
+
+        //校验 业务单据配货时实际数量是否允许高于单据数量
+        if (CollUtil.isNotEmpty(stockOrderPostRequest.getSubErpOrders())) {
+            boolean verifyResult = stockOrderDetailService.verifyCount(stockOrderPostRequest.getSubErpOrders());
+            if (!verifyResult) {
+                return ResultVOUtils.error(500, "实际数量不能高于订单数量");
+            }
+        }
+
         if (StringUtils.isBlank(stockOrderEntity.getId())) {
             BussinessLocalTypeEntity bussinessLocalTypeEntity = bussinessLocalTypeService.findBTByAction(stockOrderEntity.getBillType());
             if (StrUtil.isEmpty(stockOrderPostRequest.getBillNo())) {

api-admin/src/main/java/com/glxp/sale/admin/service/inout/StockOrderDetailService.java

@@ -24,4 +24,12 @@ public interface StockOrderDetailService {
     boolean deleteByOrderIdFk(String id);
 
     StockOrderDetailEntity findOne(@Param("id") String id);
+
+    /**
+     * 校验 业务单据配货时实际数量是否允许高于单据数量
+     *
+     * @param subErpOrders
+     * @return
+     */
+    boolean verifyCount(List<StockOrderDetailEntity> subErpOrders);
 }

api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/StockOrderDetailServiceImpl.java

@@ -1,8 +1,11 @@
 package com.glxp.sale.admin.service.inout.impl;
 
+import cn.hutool.core.util.StrUtil;
 import com.github.pagehelper.PageHelper;
 import com.glxp.sale.admin.dao.inout.StockOrderDetailDao;
+import com.glxp.sale.admin.dao.param.SystemParamConfigDao;
 import com.glxp.sale.admin.entity.inout.StockOrderDetailEntity;
+import com.glxp.sale.admin.entity.param.SystemParamConfigEntity;
 import com.glxp.sale.admin.req.inout.StockOrderDetailFilterRequest;
 import com.glxp.sale.admin.res.inout.StockOrderDetailResponse;
 import com.glxp.sale.admin.service.inout.StockOrderDetailService;
@@ -16,7 +19,9 @@ import java.util.List;
 public class StockOrderDetailServiceImpl implements StockOrderDetailService {
 
     @Resource
-    StockOrderDetailDao stockOrderDetailDao;
+    private StockOrderDetailDao stockOrderDetailDao;
+    @Resource
+    private SystemParamConfigDao systemParamConfigDao;
 
     @Override
     public List<StockOrderDetailEntity> filterStockOrderDetail(StockOrderDetailFilterRequest stockOrderDetailFilterRequest) {
@@ -61,6 +66,7 @@ public class StockOrderDetailServiceImpl implements StockOrderDetailService {
     public boolean deleteById(String id) {
         return stockOrderDetailDao.deleteById(id);
     }
+
     @Override
     public boolean deleteByOrderIdFk(String id) {
         return stockOrderDetailDao.deleteByOrderIdFk(id);
@@ -71,4 +77,24 @@ public class StockOrderDetailServiceImpl implements StockOrderDetailService {
         return stockOrderDetailDao.findOne(id);
     }
 
+    @Override
+    public boolean verifyCount(List<StockOrderDetailEntity> subErpOrders) {
+        //查询配置的系统运行参数
+        SystemParamConfigEntity config = systemParamConfigDao.selectByParamKey("stock_order_detail_count_max");
+        if (null != config) {
+            //0：允许；1：不允许，允许时不做判断
+            if ("1".equals(config.getParamValue())) {
+                for (StockOrderDetailEntity subErpOrder : subErpOrders) {
+                    if (StrUtil.isNotBlank(subErpOrder.getCount()) && StrUtil.isNotBlank(subErpOrder.getReCount())) {
+                        if (Long.parseLong(subErpOrder.getReCount()) > Long.parseLong(subErpOrder.getCount())) {
+                            return false;
+                        }
+                    }
+                }
+            }
+            return true;
+        }
+        return true;
+    }
+
 }

api-admin/src/main/resources/mybatis/configuration.xml

@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE generatorConfiguration
-        PUBLIC "-//mybatis.org//DTD MyBatis Generator Configuration 1.0//EN"
-        "http://mybatis.org/dtd/mybatis-generator-config_1_0.dtd">
-
-<generatorConfiguration>
-    <!--mysql 连接数据库jar 这里选择自己本地位置;
-    如果不知道maven本地仓库地址，可以使用EveryThing工具全局搜索mysql-connector-java，找到jar包位置；
-    也可以手动下载一个jar放在指定位置，进行引用。
-    -->
-    <classPathEntry location="D:/Program Files/maven/maven-repository/mysql/mysql-connector-java/8.0.21/mysql-connector-java-8.0.21.jar"/>
-
-    <context id="testTables" targetRuntime="MyBatis3">
-        <commentGenerator>
-            <!-- 是否去除自动生成的注释,true：是,false:否 -->
-            <property name="suppressAllComments" value="true"/>
-        </commentGenerator>
-
-        <!--数据库连接的信息：驱动类、连接地址、用户名、密码 -->
-        <jdbcConnection driverClass="com.mysql.cj.jdbc.Driver"
-                        connectionURL="jdbc:mysql://127.0.0.1:3306/spms?serverTimezone=GMT%2B8&amp;useUnicode=true&amp;characterEncoding=UTF-8&amp;zeroDateTimeBehavior=convertToNull&amp;useSSL=false"
-                        userId="root"
-                        password="123456">
-            <property name="nullCatalogMeansCurrent" value="true" />
-        </jdbcConnection>
-
-        <!-- 默认false，把JDBC DECIMAL 和 NUMERIC 类型解析为 Integer，为 true时把JDBC DECIMAL 和
-           NUMERIC 类型解析为java.math.BigDecimal -->
-        <javaTypeResolver>
-            <property name="forceBigDecimals" value="false"/>
-        </javaTypeResolver>
-
-        <!-- 指定javaBean生成的位置
-            targetPackage：生成的类要放的包，真实的包受enableSubPackages属性控制；
-            targetProject：目标项目，指定一个存在的目录下，生成的内容会放到指定目录中，如果目录不存在，MBG不会自动建目录
-         -->
-        <javaModelGenerator targetPackage="com.glxp.sale.admin.entity.inout" targetProject="src/main/java">
-            <!-- 在targetPackage的基础上，根据数据库的schema再生成一层package，最终生成的类放在这个package下，默认为false；如果多个数据库改为true分目录 -->
-            <property name="enableSubPackages" value="true"/>
-            <!-- 设置是否在getter方法中，对String类型字段调用trim()方法 -->
-            <property name="trimStrings" value="true"/>
-        </javaModelGenerator>
-
-        <!--  指定mapper映射文件生成的位置
-           targetPackage、targetProject同javaModelGenerator中作用一样-->
-        <sqlMapGenerator targetPackage="mybatis.mapper.inout" targetProject="src/main/resources">
-            <property name="enableSubPackages" value="false"/>
-        </sqlMapGenerator>
-
-        <!-- 指定mapper接口生成的位置
-         targetPackage、targetProject同javaModelGenerator中作用一样
-         -->
-        <javaClientGenerator type="XMLMAPPER" targetPackage="com.glxp.sale.admin.dao.inout" targetProject="src/main/java">
-            <property name="enableSubPackages" value="false"/>
-        </javaClientGenerator>
-
-        <!-- 指定数据库表
-        domainObjectName：生成的domain类的名字,当表名和domain类的名字有差异时一定要设置，如果不设置，直接使用表名作为domain类的名字；
-        可以设置为somepck.domainName，那么会自动把domainName类再放到somepck包里面；
-        -->
-        <table tableName="druginfo" schema="warehouse"></table>
-        <!--<table tableName="receiptsdetail" schema="warehouse"></table>-->
-    </context>
-</generatorConfiguration>