Merge branch 'dev' into test

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

@@ -349,7 +349,11 @@ public class IoCodeTempController extends BaseController {
         BasicBussinessTypeEntity bussinessTypeEntity = basicBussinessTypeService.findByAction(addOrderRequest.getAction());
         InvWarehouseEntity invWarehouseEntity = invWarehouseService.findByInvSubByCode(addOrderRequest.getInvCode());
         String code = addOrderRequest.getCode();
-        if (StringUtils.isBlank(code)) return ResultVOUtils.error(ResultEnum.DATA_ERROR);
+        if (StringUtils.isBlank(code))
+            return ResultVOUtils.error(ResultEnum.DATA_ERROR);
+        if (code.endsWith("\u001D")) {
+            code = code.replace("\u001D", "");
+        }
         UdiEntity udiEntity = FilterUdiUtils.getUdi(code);
         if (udiEntity == null)
             return ResultVOUtils.error(500, "无效条码！");
@@ -963,7 +967,9 @@ public class IoCodeTempController extends BaseController {
         for (int i = 0; i < codeEnttityList.size(); i++) {
             IoCodeTempEntity drugCodeSelectEntity = codeEnttityList.get(i);
             if (codeEnttityList.get(i).getCode().equals(code)) {
-                return drugCodeSelectEntity;
+                if (StrUtil.emptyIfNull(drugCodeSelectEntity.getSerialNo()).equals(StrUtil.emptyIfNull(udiEntity.getSerialNo()))) {
+                    return drugCodeSelectEntity;
+                }
             }
 //            UdiEntity originUdiEntity = FilterUdiUtils.getUdi(drugCodeSelectEntity.getCode());
             if (!StrUtil.emptyIfNull(drugCodeSelectEntity.getNameCode()).equals(StrUtil.emptyIfNull(udiEntity.getUdi()))) {

src/main/java/com/glxp/api/controller/purchase/SupCompanyController.java

@@ -81,6 +81,7 @@ public class SupCompanyController {
     @AuthRuleAnnotation("")
     @GetMapping("/api/pur/getSupComapnys")
     public BaseResponse getSupComapnys(FilterSupCompanyRequest companyRequest) {
+        System.out.println(companyRequest.toString());
         List<SupCompanyEntity> companyEntities = companyService.filterCompany(companyRequest);
         PageInfo<SupCompanyEntity> pageInfo = new PageInfo<>(companyEntities);
         PageSimpleResponse<SupCompanyEntity> pageSimpleResponse = new PageSimpleResponse<>();

src/main/java/com/glxp/api/controller/sup/CustomerController.java

@@ -113,6 +113,10 @@ public class CustomerController {
         List<AuthRoleAdmin> objects = new ArrayList<>();
         if( byCustomerld !=null && byCustomerld.size()>0){
             for (AuthAdmin authAdmin : byCustomerld) {
+                //修改关联的用户状态
+                authAdmin.setUserFlag(customerDetailEntity.getUserFlag());
+                authAdminService.updateAuthAdmin(authAdmin);
+
                 List<AuthRoleAdmin> authRoleAdmins = authRoleAdminService.listByAdminId(authAdmin.getId());
                 if(authRoleAdmins!=null && authRoleAdmins.size()>0) {
                     authRoleAdmin.setRole_id(Long.valueOf(customerDetailEntity.getRoleId()));

src/main/java/com/glxp/api/controller/sync/SpsSyncDownloadController.java

@@ -640,7 +640,7 @@ public class SpsSyncDownloadController {
             List<IoOrderEntity> orderEntities = syncDataResponse.getOrderEntities();
             for (IoOrderEntity orderEntity : orderEntities) {
 
-                SyncDataBustypeEntity syncDataBustypeEntity = syncDataBustypeService.findByAction(orderEntity.getAction(), 2);
+                SyncDataBustypeEntity syncDataBustypeEntity = syncDataBustypeService.findByAction(orderEntity.getAction(), 1);
                 orderEntity.setUpdateTime(null);
                 orderEntity.setFromType(ConstantStatus.FROM_UDISP);
                 orderEntity.setProcessStatus(ConstantStatus.ORDER_DEAL_POST);

src/main/java/com/glxp/api/controller/sync/SpsSyncExportStatusController.java

@@ -28,6 +28,7 @@ import com.glxp.api.service.sync.SpsSyncDownloadService;
 import com.glxp.api.service.sync.SyncDataSetService;
 import com.glxp.api.task.TaskExecutorConfig;
 import com.glxp.api.util.CustomUtil;
+import com.glxp.api.util.DateUtil;
 import com.glxp.api.util.RedisUtil;
 import lombok.RequiredArgsConstructor;
 import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
@@ -230,7 +231,7 @@ public class SpsSyncExportStatusController {
     @PostMapping("/spssync/basic/schedule/updateLastTime")
     @Log(title = "定时任务", businessType = BusinessType.UPDATE)
     public BaseResponse updateLastTime(@RequestBody BasicExportStatusTimeEntity basicExportStatusTimeEntity) {
-
+        basicExportStatusTimeEntity.setLastUpdateTime(DateUtil.formatDateTime(new Date()));
         boolean b = basicExportTimeService.insertExportStatus(basicExportStatusTimeEntity);
         if (b)
             return ResultVOUtils.success("更新成功！");

src/main/java/com/glxp/api/dao/inout/IoOrderDao.java

@@ -63,4 +63,6 @@ public interface IoOrderDao extends BaseMapperPlus<IoOrderDao, IoOrderEntity, Io
      * @return
      */
     String selectActionByBillNo(@Param("billNo") String billNo);
+
+
 }

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

@@ -140,7 +140,7 @@ public class IoCodeEntity implements Serializable {
     private Date createTime;
 
     @TableField(exist = false)
-    private int status;     //条码校验状态
+    private int status;     //条码校验状态//条码校验状态(数据类型请勿修改）
     @TableField(exist = false)
     private int scanCount;
 

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

@@ -137,7 +137,7 @@ public class IoCodeTempEntity {
     private Date createTime;
 
     @TableField(exist = false)
-    private Integer status;     //条码校验状态
+    private int status;     //条码校验状态(数据类型请勿修改）
     @TableField(exist = false)
     private String mySupId;     //更新供应商
 

src/main/java/com/glxp/api/req/inout/IoOrderInvoiceRequest.java

@@ -27,6 +27,7 @@ public class IoOrderInvoiceRequest extends ListPageRequest {
 
 
     private String machineNo;
+    private String nameCode;
 
 
     private String invoiceCode;

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

@@ -94,6 +94,7 @@ public class IoOrderInvoiceResponse {
     private String measname;
     private String manufacturer;
     private String certCode;
+    private String nameCode;
     private int reCount;
     private int count;
     private BigDecimal amout;

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

@@ -231,7 +231,7 @@ public class IoOrderResponse {
 
     private Integer deliveryStatus;
     private Integer processStatus;
-    private int inCodeStatus;
+    private Integer inCodeStatus;
 
     private Integer allCout;
 

src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java

@@ -41,8 +41,10 @@ import com.glxp.api.service.inout.*;
 import com.glxp.api.service.inv.*;
 import com.glxp.api.service.system.SyncUploadDataBustypeService;
 import com.glxp.api.util.DateUtil;
+import com.glxp.api.util.IntUtil;
 import com.glxp.api.util.udi.UdiCalCountUtil;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.exception.ExceptionUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -588,7 +590,7 @@ public class IoOrderServiceImpl implements IoOrderService {
                         && StrUtil.isEmpty(orderEntity.getSupplementNo())
                 ) {
                     if (orderEntity.getFromType() == ConstantStatus.FROM_UDISP) {
-                        if (orderEntity.getOutChangeEnable()) {
+                        if (IntUtil.value(orderEntity.getOutChangeEnable())) {
                             response.setEnableSupplementOrder(true);
                         }
                     } else
@@ -597,6 +599,7 @@ public class IoOrderServiceImpl implements IoOrderService {
                 result.add(response);
             } catch (Exception e) {
                 e.printStackTrace();
+                log.error(ExceptionUtils.getStackTrace(e));
                 log.error(orderEntity.getBillNo() + "平衡补单出错\n");
             }
 

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

@@ -1,6 +1,7 @@
 package com.glxp.api.service.inv.impl;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.date.DateTime;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.github.pagehelper.PageHelper;
@@ -142,7 +143,11 @@ public class InvPreInProductDetailServiceImpl implements InvPreinProductDetailSe
         response.setActionName(busType.getName());
         //设置单据日期
         IoOrderEntity order = orderDao.selectOne(new QueryWrapper<IoOrderEntity>().select("createTime").eq("billNo", response.getOrderId()));
-        response.setOrderTime(DateUtil.toDateStr(order.getCreateTime(), "yyyy-MM-dd HH:mm:ss"));
+        if (order!=null){
+            response.setOrderTime(DateUtil.toDateStr(order.getCreateTime(), "yyyy-MM-dd HH:mm:ss"));
+        }
+
+//        response.setOrderTime(DateUtil.toDateStr(new DateTime(), "yyyy-MM-dd HH:mm:ss"));
     }
 
     @Override

src/main/java/com/glxp/api/service/purchase/impl/SupCompanyServiceImpl.java

@@ -36,9 +36,8 @@ public class SupCompanyServiceImpl extends ServiceImpl<SupCompanyDao,SupCompanyE
         if (companyRequest == null) {
             return Collections.emptyList();
         }
-        if (companyRequest.getPage() != null) {
-            int offset = (companyRequest.getPage() - 1) * companyRequest.getLimit();
-            PageHelper.offsetPage(offset, companyRequest.getLimit());
+        if (null != companyRequest.getPage() && null != companyRequest.getLimit()) {
+            PageHelper.offsetPage((companyRequest.getPage() - 1) * companyRequest.getLimit(), companyRequest.getLimit());
         }
         return supCompanyDao.filterCompany(companyRequest);
     }

src/main/resources/application-dev.yml

@@ -3,9 +3,9 @@ server:
 spring:
   datasource:
     driver-class-name: com.p6spy.engine.spy.P6SpyDriver
-    jdbc-url: jdbc:p6spy:mysql://192.168.0.66:3364/udi_spms_zzzyy?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_spms_zyy?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
     username: root
-    password: Glxp@6066
+    password: 123456
     hikari:
       connection-timeout: 60000
       maximum-pool-size: 60

src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml

@@ -509,7 +509,6 @@
                basic_products.sfwblztlcp,
                basic_products.cgzmraqxgxx,
                basic_products.sfbjwycxsy,
-               basic_products.zdcfsycs,
                basic_products.sfwwjbz,
                basic_products.syqsfxyjxmj,
                basic_products.mjfs,

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

@@ -556,4 +556,6 @@
             </otherwise>
         </choose>
     </select>
+
+
 </mapper>

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

@@ -86,7 +86,7 @@
                basic_corp.creditNo,
                io.action,
                io.fromInvCode,
-               bbt.corpType
+               bbt.corpType,iodr.reCount count
         from io_order_detail_result iodr
                      INNER JOIN io_order io on iodr.orderIdFk = io.billNo
                      left join basic_corp on io.fromCorp = basic_corp.erpId

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

@@ -62,7 +62,8 @@
         io.manufacturer,
         io.certCode,
         io.reCount,
-        io.count
+        io.count,
+        io.nameCode
         FROM io_order_invoice ic
         INNER JOIN io_order_detail_code io ON ic.orderIdFk = io.orderIdFk
                      LEFT JOIN basic_udirel bu
@@ -90,6 +91,7 @@
     <select id="filterInvoice" parameterType="com.glxp.api.req.inout.IoOrderInvoiceRequest"
             resultType="com.glxp.api.res.inout.IoOrderInvoiceResponse">
         SELECT
+        io.nameCode,
         ic.id,
         ic.orderIdFk,
         ic.bindRlFk,