代码备份。批次号校验，中继服务优化

api-admin/src/main/java/com/glxp/sale/admin/controller/auth/RegisterController.java

@@ -102,9 +102,14 @@ public class RegisterController {
                 return ResultVOUtils.error(500, "未找到该用户");
             }
             UserRegisterEntity userRegisterEntity = userRegisterService.selectByCustomerId(Long.valueOf(String.valueOf(authAdmin.getCustomerId())));
-
             if (!userRegisterEntity.getMobile().equals(checkCodeRequest.getPhoneNum())) {
-                return ResultVOUtils.error(500, "手机号与注册时不一致");
+                CustomerContactEntity customerContactEntity = customerContactService.selectById(Long.valueOf(String.valueOf(authAdmin.getCustomerId())));
+                if (customerContactEntity != null) {
+                    if (!customerContactEntity.getMobile().equals(checkCodeRequest.getPhoneNum())) {
+                        return ResultVOUtils.error(500, "手机号与注册时不一致");
+                    }
+                } else
+                    return ResultVOUtils.error(500, "手机号与注册时不一致");
             }
         }
 
@@ -253,7 +258,7 @@ public class RegisterController {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
         }
         log.info(httpSession.getId());
-        JSONObject userCode = (JSONObject) httpSession.getAttribute("code");
+        JSONObject userCode = JSONObject.parseObject(String.valueOf(redisUtil.get(Constant.CAPTCHAS + resetPasswdRequest.getMobile())));
         if (userCode == null) {
             return ResultVOUtils.error(500, "验证码已失效，请重新获取");
         }

api-admin/src/main/java/com/glxp/sale/admin/controller/basic/SpsSyncUploadController.java

@@ -19,6 +19,7 @@ import com.glxp.sale.admin.entity.info.CompanyProductRelevanceEntity;
 import com.glxp.sale.admin.entity.inout.ErpOrderEntity;
 import com.glxp.sale.admin.entity.inout.OrderEntity;
 import com.glxp.sale.admin.entity.inout.WarehouseEntity;
+import com.glxp.sale.admin.entity.inventory.InvWarehouseEntity;
 import com.glxp.sale.admin.entity.thrsys.ThrCorpEntity;
 import com.glxp.sale.admin.entity.thrsys.ThrOrderDetailEntity;
 import com.glxp.sale.admin.entity.thrsys.ThrOrderEntity;
@@ -105,6 +106,11 @@ public class SpsSyncUploadController {
         SqlSession batchSession = sqlSessionFactory.openSession(ExecutorType.BATCH, TransactionIsolationLevel.READ_COMMITTED);
         //仓库字典导入
         if (CollUtil.isNotEmpty(syncDataResponse.getInvWarehouseEntities())) {
+
+            List<InvWarehouseEntity> invWarehouseEntities = syncDataResponse.getInvWarehouseEntities();
+            for (InvWarehouseEntity invWarehouseEntity : invWarehouseEntities) {
+                invWarehouseEntity.setUpdateTime(null);
+            }
             invWarehouseService.importInvWarehouse(syncDataResponse.getInvWarehouseEntities());
         }
 
@@ -114,6 +120,7 @@ public class SpsSyncUploadController {
                 List<UdiRelevanceEntity> corpList = syncDataResponse.getUdiRelevanceEntities();
                 UdiRelevanceDao mapper = batchSession.getMapper(UdiRelevanceDao.class);
                 for (UdiRelevanceEntity basicUnitMaintainEntity : corpList) {
+                    basicUnitMaintainEntity.setUpdateTime(null);
                     mapper.insertUdiRelevance(basicUnitMaintainEntity);
                 }
                 batchSession.commit();
@@ -124,10 +131,10 @@ public class SpsSyncUploadController {
         if (CollUtil.isNotEmpty(syncDataResponse.getUdiInfoEntities())) {
             if (CollUtil.isNotEmpty(syncDataResponse.getUdiInfoEntities())) {
                 try {
-                    List<UdiInfoEntity> corpList = syncDataResponse.getUdiInfoEntities();
+                    List<UdiInfoEntity> udiInfoEntities = syncDataResponse.getUdiInfoEntities();
                     UdiInfoDao mapper = batchSession.getMapper(UdiInfoDao.class);
-                    for (UdiInfoEntity basicUnitMaintainEntity : corpList) {
-                        mapper.insertUdiInfo(basicUnitMaintainEntity);
+                    for (UdiInfoEntity udiInfoEntity : udiInfoEntities) {
+                        mapper.insertUdiInfo(udiInfoEntity);
                     }
                     batchSession.commit();
                 } catch (Exception e) {
@@ -141,6 +148,7 @@ public class SpsSyncUploadController {
                 List<BasicUnitMaintainEntity> corpList = syncDataResponse.getBasicUnitMaintainEntities();
                 BasicUnitMaintainDao mapper = batchSession.getMapper(BasicUnitMaintainDao.class);
                 for (BasicUnitMaintainEntity basicUnitMaintainEntity : corpList) {
+                    basicUnitMaintainEntity.setUpdateTime(null);
                     mapper.importBasicUnitMaintain(basicUnitMaintainEntity);
                 }
                 batchSession.commit();
@@ -154,6 +162,7 @@ public class SpsSyncUploadController {
                 List<CompanyProductRelevanceEntity> companyProductRelevanceEntities = syncDataResponse.getCompanyProductRelevanceEntities();
                 CompanyProductRelevanceDao mapper = batchSession.getMapper(CompanyProductRelevanceDao.class);
                 for (CompanyProductRelevanceEntity companyProductRelevanceEntity : companyProductRelevanceEntities) {
+                    companyProductRelevanceEntity.setUpdate_time(null);
                     mapper.importCompanyProductRelevance(companyProductRelevanceEntity);
                 }
                 batchSession.commit();
@@ -169,6 +178,7 @@ public class SpsSyncUploadController {
                 List<ThrProductsEntity> thrProductsEntities = syncDataResponse.getThrProductsEntities();
                 ThrProductsDao mapper = batchSession.getMapper(ThrProductsDao.class);
                 for (ThrProductsEntity thrProductsEntity : thrProductsEntities) {
+                    thrProductsEntity.setUpdateTime(null);
                     mapper.insertThrProducts(thrProductsEntity);
                 }
                 batchSession.commit();
@@ -183,6 +193,7 @@ public class SpsSyncUploadController {
                 List<ThrCorpEntity> thrCorpEntities = syncDataResponse.getThrCorpEntities();
                 ThrCorpDao mapper = batchSession.getMapper(ThrCorpDao.class);
                 thrCorpEntities.forEach(thrCorpEntity -> {
+                    thrCorpEntity.setUpdateTime(null);
                     mapper.importThrCorp(thrCorpEntity);
                 });
                 batchSession.commit();
@@ -195,8 +206,9 @@ public class SpsSyncUploadController {
             try {
                 List<ThrOrderEntity> thrOrderEntities = syncDataResponse.getThrOrderEntities();
                 ThrOrderDao mapper = batchSession.getMapper(ThrOrderDao.class);
-                thrOrderEntities.forEach(thrCorpEntity -> {
-                    mapper.importThrOrder(thrCorpEntity);
+                thrOrderEntities.forEach(thrOrderEntity -> {
+                    thrOrderEntity.setUpdateTime(null);
+                    mapper.importThrOrder(thrOrderEntity);
                 });
                 batchSession.commit();
             } catch (Exception e) {
@@ -209,6 +221,7 @@ public class SpsSyncUploadController {
                 List<ThrOrderDetailEntity> thrOrderDetailEntities = syncDataResponse.getThrOrderDetailEntities();
                 ThrOrderDetailDao mapper = batchSession.getMapper(ThrOrderDetailDao.class);
                 thrOrderDetailEntities.forEach(thrOrderDetailEntity -> {
+                    thrOrderDetailEntity.setUpdateTime(null);
                     mapper.importThrOrderDetail(thrOrderDetailEntity);
                 });
                 batchSession.commit();
@@ -226,6 +239,7 @@ public class SpsSyncUploadController {
                 List<BussinessTypeEntity> bussinessTypeEntities = syncDataResponse.getBussinessTypeEntities();
                 BussinessTypeDao mapper = batchSession.getMapper(BussinessTypeDao.class);
                 for (BussinessTypeEntity bussinessTypeEntity : bussinessTypeEntities) {
+                    bussinessTypeEntity.setUpdateTime(null);
                     mapper.insertBussinessType(bussinessTypeEntity);
                 }
                 batchSession.commit();
@@ -238,6 +252,7 @@ public class SpsSyncUploadController {
                 List<BussinessLocalTypeEntity> bussinessLocalTypeEntities = syncDataResponse.getBussinessLocalTypeEntities();
                 BussinessLocalTypeDao mapper = batchSession.getMapper(BussinessLocalTypeDao.class);
                 for (BussinessLocalTypeEntity bussinessTypeEntity : bussinessLocalTypeEntities) {
+                    bussinessTypeEntity.setUpdateTime(null);
                     mapper.insertBussinessType(bussinessTypeEntity);
                 }
                 batchSession.commit();
@@ -250,6 +265,7 @@ public class SpsSyncUploadController {
                 List<BussinessOriginTypeEntity> bussinessTypeEntities = syncDataResponse.getBussinessOriginTypeEntities();
                 BussinessOriginTypeDao mapper = batchSession.getMapper(BussinessOriginTypeDao.class);
                 for (BussinessOriginTypeEntity bussinessTypeEntity : bussinessTypeEntities) {
+                    bussinessTypeEntity.setUpdateTime(null);
                     mapper.insertBusOriginType(bussinessTypeEntity);
                 }
                 batchSession.commit();
@@ -267,6 +283,7 @@ public class SpsSyncUploadController {
                 List<OrderEntity> orderEntities = syncDataResponse.getOrderEntities();
                 OrderDao mapper = batchSession.getMapper(OrderDao.class);
                 for (OrderEntity orderEntity : orderEntities) {
+                    orderEntity.setUpdateTime(null);
                     orderService.deleteByOrderId(orderEntity.getId());
                     mapper.importOrder(orderEntity);
                 }

api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiRelevanceController.java

@@ -1,5 +1,6 @@
 package com.glxp.sale.admin.controller.basic;
 
+import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.TypeReference;
@@ -19,6 +20,7 @@ import com.glxp.sale.admin.entity.thrsys.ThrProductsEntity;
 import com.glxp.sale.admin.entity.udid.UdiEntity;
 import com.glxp.sale.admin.req.basic.*;
 import com.glxp.sale.admin.req.info.DeleteRequest;
+import com.glxp.sale.admin.req.inout.WarehouseQueryRequest;
 import com.glxp.sale.admin.res.PageSimpleResponse;
 import com.glxp.sale.admin.res.basic.BasicProductThirdSysResponse;
 import com.glxp.sale.admin.res.basic.UdiRelevanceResponse;
@@ -221,17 +223,26 @@ public class UdiRelevanceController {
                         for (int i = 0; i < udiInfoEntities.size(); i++) {
                             List<WarehouseEntity> warehouseEntityList = warehouseService.searchCode(udiInfoEntities.get(i).getNameCode());
                             if (warehouseEntityList != null && warehouseEntityList.size() > 0) {
-                                return ResultVOUtils.error(500, "改产品已被" + warehouseEntityList.get(0).getOrderId() + "订单关联不能删除");
+                                return ResultVOUtils.error(500, "该产品已被" + warehouseEntityList.get(0).getOrderId() + "订单关联不能删除");
                             }
                         }
                     }
                 }
             }
+            WarehouseQueryRequest warehouseQueryRequest = new WarehouseQueryRequest();
+            warehouseQueryRequest.setRelId(ids);
+            if(StrUtil.isNotEmpty(ids)){
+                List<WarehouseEntity> warehouseEntityList = warehouseService.findByOrderId(warehouseQueryRequest);
+                if(CollUtil.isNotEmpty(warehouseEntityList)){
+                    return ResultVOUtils.error(500, "该产品已被" + warehouseEntityList.get(0).getOrderId() + "订单关联不能删除");
+                }
+            }
+
         }
 
         CompanyProductRelevanceEntity companyProductRelevanceEntity = companyProductRelevanceService.findByUdiRlIdUnitFk(ids, null);
         if (companyProductRelevanceEntity != null) {
-            return ResultVOUtils.error(500, "改产品已被供应商选入" + "不能删除!");
+            return ResultVOUtils.error(500, "该产品已被供应商选入" + "不能删除!");
         }
 
 

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

@@ -285,6 +285,7 @@ public class StockOrderDetailController {
                 stockOrderDetailEntity.setManufactory(udiInfoEntity.getManufactory());
                 stockOrderDetailEntity.setYlqxzcrbarmc(udiInfoEntity.getYlqxzcrbarmc());
                 stockOrderDetailEntity.setZczbhhzbapzbh(udiInfoEntity.getZczbhhzbapzbh());
+                stockOrderDetailEntity.setAllowNoBatch(udiInfoEntity.isAllowNoBatch());
                 if (stockOrderIdsRequest.getUdiEntity() != null) {
                     UdiEntity udiEntity = stockOrderIdsRequest.getUdiEntity();
                     stockOrderDetailEntity.setBatchNo(udiEntity.getBatchNo());

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

@@ -92,6 +92,7 @@ public class WareHouseController {
     StockOrderService stockOrderService;
     @Resource
     GennerOrderUtils gennerOrderUtils;
+
     @AuthRuleAnnotation("")
     @GetMapping("admin/warehouse/inout/list")
     public BaseResponse list(WarehouseQueryRequest warehouseQueryRequest) {
@@ -340,6 +341,10 @@ public class WareHouseController {
         if (udiEntity == null)
             return ResultVOUtils.error(500, "无效条码！");
 
+        //批次号校验
+        if (StrUtil.isEmpty(udiEntity.getSerialNo()) && StrUtil.isEmpty(udiEntity.getBatchNo())) {
+            return ResultVOUtils.error(500, "批次号不能为空！");
+        }
 
         //过期提醒：
         SystemParamConfigEntity expireParamConfigEntity = systemParamConfigService.selectByParamKey("expire_date_tip");
@@ -671,7 +676,6 @@ public class WareHouseController {
     }
 
 
-
     @AuthRuleAnnotation("")
     @PostMapping("/admin/warehouse/inout/save")
     public BaseResponse save(@RequestBody @Valid WarehouseSaveRequest warehouseSaveRequest,

api-admin/src/main/java/com/glxp/sale/admin/entity/basic/UdiRelevanceEntity.java

@@ -32,6 +32,7 @@ public class UdiRelevanceEntity {
     private Boolean isAdavence;
     private String supName;
     private String originUuid;
+    private boolean allowNoBatch;
 
     public Integer getLockStatus() {
         if (lockStatus == null)

api-admin/src/main/java/com/glxp/sale/admin/entity/inout/StockOrderDetailEntity.java

@@ -35,5 +35,6 @@ public class StockOrderDetailEntity {
     //开票日期
     private String invoiceDate;
     private String manufactory;
+    private boolean allowNoBatch;
 
 }

api-admin/src/main/java/com/glxp/sale/admin/req/inout/WarehouseQueryRequest.java

@@ -12,4 +12,5 @@ public class WarehouseQueryRequest extends ListPageRequest {
     private String batchNo;
     private String orderId;
     private String nameCode;
+    private String relId;
 }

api-admin/src/main/java/com/glxp/sale/admin/res/basic/CompanyProductRelevanceResponse.java

@@ -65,5 +65,6 @@ public class CompanyProductRelevanceResponse {
     private String scbssfbhsxrq;
     private String cpms;
     private String supName;
+    private boolean allowNoBatch;
 
 }

api-admin/src/main/java/com/glxp/sale/admin/res/basic/UdiRelevanceResponse.java

@@ -66,6 +66,7 @@ public class UdiRelevanceResponse {
     private String unitFk;
     private String companyName;
     private String originUuid;
+    private boolean allowNoBatch;
 
     public int getBhzxxsbzsl() {
         if (bhzxxsbzsl == null || bhzxxsbzsl == 0) {

api-admin/src/main/java/com/glxp/sale/admin/res/inout/StockOrderDetailResponse.java

@@ -35,4 +35,5 @@ public class StockOrderDetailResponse {
 
     //开票日期
     private String invoiceDate;
+    private boolean allowNoBatch;
 }

api-admin/src/main/java/com/glxp/sale/admin/util/WarehousBeanUtils.java

@@ -88,46 +88,6 @@ public class WarehousBeanUtils {
         return warehouseEntitys;
     }
 
-    public static List<Warehousetemp> entityToTemp(List<WarehouseEntity> warehouseEntities) {
-        List<Warehousetemp> warehousetempList = new ArrayList<>();
-        if (warehouseEntities != null) {
-            for (int i = 0; i < warehouseEntities.size(); i++) {
-                Warehousetemp warehousetemp = new Warehousetemp();
-                WarehouseEntity warehouseEntity = warehouseEntities.get(i);
-//                String dateFormat = "yyyy-MM-dd HH:mm:ss";
-//                SimpleDateFormat sdf = new SimpleDateFormat(dateFormat);
-//                try {
-//                    Date date = (Date) sdf.parse(warehouseEntity.getActDate());
-//                    warehousetemp.setActdate(warehouseEntity.getActDate());
-//                } catch (ParseException e) {
-//                    e.printStackTrace();
-//                }
-                warehousetemp.setActdate(warehouseEntity.getActDate());
-                warehousetemp.setAction(warehouseEntity.getAction());
-                warehousetemp.setActor(warehouseEntity.getActor());
-                warehousetemp.setCode(warehouseEntity.getCode());
-                warehousetemp.setCorporderid(warehouseEntity.getCorpOrderId());
-                warehousetemp.setFromcorp(warehouseEntity.getFromCorp());
-                warehousetemp.setFromcorpid(warehouseEntity.getFromCorpId());
-                warehousetemp.setMainaction(warehouseEntity.getMainAction());
-                warehousetemp.setOrderid(warehouseEntity.getOrderId());
-//                warehousetemp.setUppercorporderid(warehouseEntity.getUpperCorpOrderId());
-//                warehousetemp.setWrongcode(warehouseEntity.getWrongCode());
-
-                warehousetemp.setBatchno(warehouseEntity.getBatchNo());
-                warehousetemp.setProducedate(warehouseEntity.getProduceDate());
-                warehousetemp.setExpiredate(warehouseEntity.getExpireDate());
-                warehousetemp.setSerialno(warehouseEntity.getSerialNo());
-//                warehousetemp.setUdi(warehouseEntity.getUdi());
-                warehousetemp.setCount(warehouseEntity.getCount());
-
-                warehousetempList.add(warehousetemp);
-            }
-        }
-
-
-        return warehousetempList;
-    }
 
 
     public static Device responseToDevice(DataSetBean dataSetBean) {

api-admin/src/main/resources/application-pro.properties

@@ -5,6 +5,9 @@ spring.datasource.jdbc-url=jdbc:mysql://127.0.0.1:3306/spms?serverTimezone=Asia/
 spring.datasource.username=root
 #spring.datasource.password=root
 spring.datasource.password=123456
+spring.datasource.hikari.connection-timeout=60000
+spring.datasource.hikari.maximum-pool-size=60
+spring.datasource.hikari.minimum-idle=10
 #server.servlet.context-path=
 #logging.level.com.glxp.sale.admin.dao=debug
 # \u8DE8\u57DF\u8BBE\u7F6E
@@ -29,8 +32,8 @@ logging.level.com.glxp.api.admin.dao.inventory=debug
 logging.level.com.glxp.api.admin.dao.thrsys=debug
 # \u8F93\u51FA\u65E5\u5FD7\u5230\u9879\u76EE\u6839\u76EE\u5F55\u4E0B\u7684springboot.log\u6587\u4EF6\u4E2D // \u914D\u7F6E logback-spring.xml\u65F6 \u6B64\u65E5\u5FD7\u8F93\u51FA\u65B9\u5F0F\u4F1A\u88AB\u8986\u76D6\u3002
 logging.file=D:/glxpdata/udiwms/udiwms.log
-#file_path=/home/glxpdata/udiwms
-file_path=D:/glxpdata/udiwms
+file_path=/home/glxpdata/udiwms
+#file_path=D:/glxpdata/udiwms
 #UDI\u6570\u636E\u4E0B\u8F7D
 UDI_KEY=6b137c66-6286-46c6-8efa-c2f5dd9237df
 UDI_SERVER_URL=https://www.udims.com/UDI_DL_Server_test

api-admin/src/main/resources/logback-spring.xml

@@ -38,7 +38,7 @@
         </filter>
         <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
             <!-- 每天一归档 d://glxpdata/udiwms -->
-            <fileNamePattern>/home/glxpdata/udiwms/logs/${LOG_INFO_HOME}//%d{yyyy-MM-dd}_%i.log
+            <fileNamePattern>home/glxpdata/udiwms/logs/${LOG_INFO_HOME}//%d{yyyy-MM-dd}_%i.log
             </fileNamePattern>
             <maxHistory>30</maxHistory>
             <timeBasedFileNamingAndTriggeringPolicy
@@ -59,7 +59,7 @@
         </filter>
         <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
             <!-- 每天一归档   /home/glxpdata/udiwms -->
-            <fileNamePattern>/home/glxpdata/udiwms/logs/${LOG_ERROR_HOME}//%d{yyyy-MM-dd}_%i.log
+            <fileNamePattern>home/glxpdata/udiwms/logs/${LOG_ERROR_HOME}//%d{yyyy-MM-dd}_%i.log
             </fileNamePattern>
             <maxHistory>30</maxHistory>
             <timeBasedFileNamingAndTriggeringPolicy

api-admin/src/main/resources/mybatis/mapper/basic/BasicUnitMaintainDao.xml

@@ -230,7 +230,8 @@
 
 
     <insert id="importBasicUnitMaintain" keyProperty="id">
-        REPLACE
+        insert
+        ignore
         INTO basic_corp
                 ( thirdId, erpId, `name`, spell,
                  addr, status, `type`, creditNo, contact, mobile, thirdId1, thirdId2, thirdId3, thirdId4,

api-admin/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml

@@ -12,7 +12,7 @@
         basic_udirel.thirdName1,basic_udirel.thirdName2,basic_udirel.thirdName3,basic_udirel.thirdName4,
         basic_udirel.manufactory,basic_udirel.measname,basic_udirel.ybbm,basic_udirel.sptm,
         basic_udirel.isDisable, basic_udirel.isLock,basic_udirel.lockStatus,basic_udirel.udplatCode,
-        basic_udirel.isAdavence,basic_udirel.mainId,
+        basic_udirel.isAdavence,basic_udirel.mainId,basic_udirel.allowNoBatch,
         basic_products.nameCode,basic_products.packRatio,basic_products.packLevel,
         basic_products.bhxjsl,basic_products.bhzxxsbzsl,basic_products.zxxsbzbhsydysl,
         basic_products.bhxjcpbm,basic_products.bzcj,
@@ -97,7 +97,7 @@
         basic_udirel.thirdName1,basic_udirel.thirdName2,basic_udirel.thirdName3,basic_udirel.thirdName4,
         basic_udirel.manufactory,basic_udirel.measname,basic_udirel.ybbm,basic_udirel.sptm,
         basic_udirel.isDisable, basic_udirel.isLock,basic_udirel.lockStatus,basic_udirel.udplatCode,
-        basic_udirel.isAdavence,basic_udirel.mainId,
+        basic_udirel.isAdavence,basic_udirel.mainId,basic_udirel.allowNoBatch,
         basic_products.nameCode,basic_products.packRatio,basic_products.packLevel,
         basic_products.bhxjsl,basic_products.bhzxxsbzsl,basic_products.zxxsbzbhsydysl,
         basic_products.bhxjcpbm,basic_products.bzcj,
@@ -187,7 +187,7 @@
         basic_udirel.thirdId1,basic_udirel.thirdId2,basic_udirel.thirdId3,basic_udirel.thirdId4,
         basic_udirel.ybbm,basic_udirel.sptm,basic_udirel.isDisable, basic_udirel.isLock,basic_udirel.lockStatus,
         basic_udirel.thirdName1,basic_udirel.thirdName2,basic_udirel.thirdName3,basic_udirel.thirdName4,
-        basic_udirel.manufactory,basic_udirel.measname,basic_udirel.udplatCode,
+        basic_udirel.manufactory,basic_udirel.measname,basic_udirel.udplatCode,basic_udirel.allowNoBatch,
         basic_products.nameCode,basic_products.packRatio,basic_products.packLevel,basic_products.bhxjsl,
         basic_products.bhzxxsbzsl,basic_products.zxxsbzbhsydysl,basic_products.bhxjcpbm,basic_products.bzcj,
         basic_products.addType,basic_products.deviceRecordKey,basic_products.cpmctymc,basic_products.cplb,
@@ -388,7 +388,7 @@
         (id,
         thirdId,thirdName,uuid,isUseDy,updateTime,
         thirdId1,thirdId2,thirdId3,thirdId4,thirdName1,thirdName2,thirdName3,thirdName4,manufactory,measname,ybbm,sptm,isDisable,isLock
-        ,mainId,mainName,lockStatus,udplatCode,isAdavence,supName
+        ,mainId,mainName,lockStatus,udplatCode,isAdavence,supName,allowNoBatch
         )
         values
             (
@@ -417,7 +417,8 @@
         #{lockStatus},
         #{udplatCode},
         #{isAdavence},
-        #{supName}
+        #{supName},
+        #{allowNoBatch}
         )
     </insert>
 
@@ -430,7 +431,7 @@
         (id,
         thirdId,thirdName,uuid,isUseDy,updateTime,
         thirdId1,thirdId2,thirdId3,thirdId4,thirdName1,thirdName2,thirdName3,thirdName4,manufactory,measname,ybbm,sptm,isDisable,isLock
-        ,mainId,mainName,lockStatus,udplatCode,isAdavence,supName
+        ,mainId,mainName,lockStatus,udplatCode,isAdavence,supName,allowNoBatch
         )
         values
             (
@@ -459,7 +460,8 @@
         #{lockStatus},
         #{udplatCode},
         #{isAdavence},
-        #{supName}
+        #{supName},
+        #{allowNoBatch}
         )
     </insert>
 
@@ -508,6 +510,7 @@
             <if test="udplatCode != null">udplatCode=#{udplatCode},</if>
             <if test="isAdavence != null">isAdavence=#{isAdavence},</if>
             <if test="supName != null">supName=#{supName},</if>
+            <if test="allowNoBatch != null">allowNoBatch=#{allowNoBatch},</if>
         </trim>
         WHERE id = #{id}
     </update>
@@ -532,7 +535,7 @@
     <insert id="importUdiRelevance" parameterType="java.util.List">
         replace into basic_udirel (id, thirdId, thirdName, uuid, isUseDy, updateTime, thirdId1, thirdId2, thirdId3,
         thirdId4, thirdName1, thirdName2, thirdName3, thirdName4, ybbm, sptm, manufactory,
-        measname, isDisable, mainId, mainName, udplatCode,supName)
+        measname, isDisable, mainId, mainName, udplatCode,supName,allowNoBatch)
         values
         <foreach collection="udiRelevanceEntities" item="item" index="index" separator=",">
             (#{item.id},
@@ -556,7 +559,7 @@
             #{item.isDisable},
             #{item.mainId},
             #{item.mainName},
-            #{item.udplatCode},#{item.supName})
+            #{item.udplatCode},#{item.supName},#{item.allowNoBatch})
         </foreach>
     </insert>
 </mapper>

api-admin/src/main/resources/mybatis/mapper/info/CompanyProductRelevanceDao.xml

@@ -39,7 +39,7 @@
         basic_udirel.manufactory,basic_udirel.measname,basic_udirel.lockStatus,
         basic_products.nameCode,basic_products.packRatio,basic_products.packLevel,basic_products.bhxjsl,
         basic_products.bhzxxsbzsl,basic_products.zxxsbzbhsydysl,basic_products.bhxjcpbm,
-        basic_products.bzcj,basic_products.addType,
+        basic_products.bzcj,basic_products.addType,basic_udirel.isDisable,
         basic_products.deviceRecordKey,basic_products.cpmctymc,
         basic_products.cplb,basic_products.flbm,basic_products.ggxh,basic_products.qxlb,
         basic_products.tyshxydm,basic_products.ylqxzcrbarmc,basic_products.zczbhhzbapzbh,
@@ -66,6 +66,9 @@
             <if test="nameCode != '' and nameCode != null">
                 AND nameCode LIKE concat(#{nameCode},'%')
             </if>
+            <if test="ggxh != '' and ggxh != null">
+                AND ggxh LIKE concat('%',#{ggxh},'%')
+            </if>
             <if test="unionCode != '' and unionCode != null">
                 and (
                 nameCode LIKE concat('%',#{unionCode},'%')

api-admin/src/main/resources/mybatis/mapper/inout/CodesDao.xml

@@ -30,6 +30,10 @@
             <if test="orderId != '' and orderId!=null">
                 and orderId =#{orderId}
             </if>
+            <if test="relId != '' and relId!=null">
+                and relId =#{relId}
+            </if>
+
         </where>
         ORDER BY actDate
     </select>

api-admin/src/main/resources/mybatis/mapper/inout/StockOrderDetail.xml

@@ -33,7 +33,7 @@
         basic_products.cpmctymc,basic_products.ggxh,
         stock_order_detail.batchNo,stock_order_detail.expireDate,stock_order_detail.productDate,
         stock_order_detail.count,stock_order_detail.reCount,stock_order_detail.sweepCount,stock_order_detail.relId,
-        basic_products.ylqxzcrbarmc,basic_products.zczbhhzbapzbh,stock_order_detail.price
+        basic_products.ylqxzcrbarmc,basic_products.zczbhhzbapzbh,stock_order_detail.price,stock_order_detail.allowNoBatch
         from stock_order_detail
         right JOIN basic_products
         ON stock_order_detail.productId = basic_products.uuid
@@ -58,11 +58,12 @@
         ORDER BY id DESC
     </select>
 
-    <insert id="insertStockOrderDetail" keyProperty="id" parameterType="com.glxp.sale.admin.entity.inout.StockOrderDetailEntity">
+    <insert id="insertStockOrderDetail" keyProperty="id"
+            parameterType="com.glxp.sale.admin.entity.inout.StockOrderDetailEntity">
         replace
         INTO stock_order_detail(id,
         orderIdFk,productId,productName,spec,batchNo,productDate,
-        expireDate,count,reCount,sweepCount,ylqxzcrbarmc,zczbhhzbapzbh,price,relId,manufactory,firstSalesInvNo,secSalesInvNo,secSalesListNo,invoiceDate)
+        expireDate,count,reCount,sweepCount,ylqxzcrbarmc,zczbhhzbapzbh,price,relId,manufactory,firstSalesInvNo,secSalesInvNo,secSalesListNo,invoiceDate,allowNoBatch)
         values(
         #{id},
         #{orderIdFk},
@@ -76,14 +77,22 @@
         #{reCount},
         #{sweepCount},
         #{ylqxzcrbarmc},
-        #{zczbhhzbapzbh},#{price},#{relId},#{manufactory},#{firstSalesInvNo},#{secSalesInvNo},#{secSalesListNo},#{invoiceDate}
+        #{zczbhhzbapzbh},
+        #{price},
+        #{relId},
+        #{manufactory},
+        #{firstSalesInvNo},
+        #{secSalesInvNo},
+        #{secSalesListNo},
+        #{invoiceDate},#{allowNoBatch}
         )
     </insert>
 
-    <insert id="insertStockOrderDetails" keyProperty="id" parameterType="com.glxp.sale.admin.entity.inout.StockOrderDetailEntity">
+    <insert id="insertStockOrderDetails" keyProperty="id"
+            parameterType="com.glxp.sale.admin.entity.inout.StockOrderDetailEntity">
         replace INTO stock_order_detail(id,
         orderIdFk,productId,productName,spec,batchNo,productDate,
-        expireDate,count,reCount,sweepCount,ylqxzcrbarmc,zczbhhzbapzbh,price,relId,manufactory,firstSalesInvNo,secSalesInvNo,secSalesListNo,invoiceDate)
+        expireDate,count,reCount,sweepCount,ylqxzcrbarmc,zczbhhzbapzbh,price,relId,manufactory,firstSalesInvNo,secSalesInvNo,secSalesListNo,invoiceDate,allowNoBatch)
         values
         <foreach collection="stockOrderDetailEntities" item="item" index="index"
                  separator=",">
@@ -100,7 +109,7 @@
             #{item.reCount},
             #{item.sweepCount},
             #{item.ylqxzcrbarmc},
-            #{item.zczbhhzbapzbh},#{item.price},#{item.relId},#{item.manufactory},#{item.firstSalesInvNo},#{item.secSalesInvNo},#{item.secSalesListNo},#{item.invoiceDate}
+            #{item.zczbhhzbapzbh},#{item.price},#{item.relId},#{item.manufactory},#{item.firstSalesInvNo},#{item.secSalesInvNo},#{item.secSalesListNo},#{item.invoiceDate},#{item.allowNoBatch}
             )
         </foreach>
 
@@ -122,6 +131,8 @@
             <if test="invoiceDate != null">invoiceDate=#{invoiceDate},</if>
             <if test="relId != null">relId=#{relId},</if>
             <if test="manufactory != null">manufactory=#{manufactory},</if>
+            <if test="allowNoBatch != null">allowNoBatch=#{allowNoBatch},</if>
+
         </set>
         WHERE id = #{id}
     </update>
@@ -140,9 +151,9 @@
 
     <select id="findOne" parameterType="Map"
             resultType="com.glxp.sale.admin.entity.inout.StockOrderDetailEntity">
-        SELECT * FROM stock_order_detail
-        WHERE id = #{id}
-        limit 1
+        SELECT *
+        FROM stock_order_detail
+        WHERE id = #{id} limit 1
     </select>
 
 </mapper>

api-admin/src/main/resources/mybatis/mapper/inout/WarehouseDao.xml

@@ -32,6 +32,10 @@
             <if test="batchNo != '' and batchNo!=null">
                 and batchNo =#{batchNo}
             </if>
+            <if test="relId != '' and relId!=null">
+                and relId =#{relId}
+            </if>
+
         </where>
         ORDER BY actDate
     </select>

api-admin/src/main/resources/mybatis/mapper/thrsys/ThrProductsDao.xml

@@ -22,7 +22,6 @@
             <if test="spec != '' and spec != null">
                 AND spec LIKE concat('%',#{spec},'%')
             </if>
-
             <if test="supName != '' and supName != null">
                 AND supName LIKE concat('%',#{supName},'%')
             </if>