代码备份

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

@@ -97,6 +97,7 @@ public class SpsSyncDownloadService {
             List<InvWarehouseEntity> invWarehouseEntities = invWarehouseService.filterGroupInvWarehouse(filterInvWarehouseRequest);
             syncDataResponse.setInvWarehouseEntities(invWarehouseEntities);
 
+            if (CollUtil.isNotEmpty(invWarehouseEntities)) {
                 //仓库关联单据类型
                 FilterInvBusTypeRequest filterInvBusTypeRequest = new FilterInvBusTypeRequest();
                 BeanUtils.copyProperties(spsSyncDataRequest, filterInvBusTypeRequest);
@@ -110,6 +111,9 @@ public class SpsSyncDownloadService {
                 syncDataResponse.setWarehouseUserEntities(warehouseUserEntities);
             }
 
+
+        }
+
         if (syncDataSetEntity.isBasicProducts()) {
             //耗材字典
             FilterUdiInfoRequest filterUdiInfoRequest = new FilterUdiInfoRequest();
@@ -327,9 +331,11 @@ public class SpsSyncDownloadService {
         if (syncDataSetEntity.isDbDiProducts()) {
             ProductInfoFilterRequest productInfoFilterRequest = new ProductInfoFilterRequest();
             BeanUtils.copyProperties(spsSyncDataRequest, productInfoFilterRequest);
+            productInfoFilterRequest.setUpdateTime(spsSyncDataRequest.getLastUpdateTime());
             List<ProductInfoEntity> productInfoEntityList = productInfoService.syncDlUdi(productInfoFilterRequest);
             UdiCompanyRequest udiCompanyRequest = new UdiCompanyRequest();
             BeanUtils.copyProperties(spsSyncDataRequest, udiCompanyRequest);
+            udiCompanyRequest.setUpdateTime(spsSyncDataRequest.getLastUpdateTime());
             List<UdiCompanyEntity> udiCompanyEntities = udiCompanyService.syncDlCompany(udiCompanyRequest);
             spSyncUdiResponse.setUdiCompanyEntities(udiCompanyEntities);
             spSyncUdiResponse.setProductInfoEntityList(productInfoEntityList);

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

@@ -224,6 +224,7 @@ public class SpsSyncExportStatusController {
                     if (basicExportStatusTimeEntity != null) {
                         if (StrUtil.isNotEmpty(basicExportStatusRequest.getSyncTime()))
                             basicExportStatusTimeEntity.setLastUpdateTime(basicExportStatusRequest.getSyncTime());
+                        basicExportTimeService.updateExportStatus(basicExportStatusTimeEntity);
                     }
                     BasicExportStatusEntity basicExportStatusEntity = new BasicExportStatusEntity();
                     basicExportStatusEntity.setId(CustomUtil.getId());

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

@@ -5,25 +5,17 @@ import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.TypeReference;
 import com.glxp.sale.admin.constant.BasicProcessStatus;
 import com.glxp.sale.admin.constant.ConstantStatus;
+import com.glxp.sale.admin.dao.auth.AuthAdminDao;
 import com.glxp.sale.admin.dao.basic.*;
 import com.glxp.sale.admin.dao.info.CompanyProductRelevanceDao;
-import com.glxp.sale.admin.dao.inout.CodesDao;
-import com.glxp.sale.admin.dao.inout.OrderDao;
-import com.glxp.sale.admin.dao.inout.OrderDetailDao;
-import com.glxp.sale.admin.dao.thrsys.ThrCorpDao;
-import com.glxp.sale.admin.dao.thrsys.ThrOrderDao;
-import com.glxp.sale.admin.dao.thrsys.ThrOrderDetailDao;
-import com.glxp.sale.admin.dao.thrsys.ThrProductsDao;
+import com.glxp.sale.admin.dao.inout.*;
+import com.glxp.sale.admin.dao.thrsys.*;
+import com.glxp.sale.admin.entity.auth.AuthAdmin;
 import com.glxp.sale.admin.entity.basic.*;
 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.inout.*;
 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;
-import com.glxp.sale.admin.entity.thrsys.ThrProductsEntity;
+import com.glxp.sale.admin.entity.thrsys.*;
 import com.glxp.sale.admin.req.basic.SpsSyncDataRequest;
 import com.glxp.sale.admin.res.basic.SpsSyncBusResponse;
 import com.glxp.sale.admin.res.basic.SpsSyncDataResponse;
@@ -56,13 +48,18 @@ public class SpsSyncUploadController {
 
     @Resource
     SqlSessionFactory sqlSessionFactory;
-
+    @Resource
+    AuthAdminDao authAdminService;
     @Resource
     InvWarehouseService invWarehouseService;
     @Resource
     OrderService orderService;
     @Resource
     BasicBackUpdateProductService backUpdateProductService;
+    @Resource
+    WarehouseUserDao warehouseUserDao;
+    @Resource
+    WarehouseBussinessTypeDao warehouseBussinessTypeDao;
 
     @PostMapping("sps/sync/basic/upload")
     public BaseResponse findProductInfo(@RequestBody SpsSyncDataResponse syncDataResponse) {
@@ -172,6 +169,35 @@ public class SpsSyncUploadController {
             }
         }
 
+        //第三方仓库信息导入
+        if (CollUtil.isNotEmpty(syncDataResponse.getThrInvWarehouseEntities())) {
+
+            try {
+                List<ThrInvWarehouseEntity> thrInvWarehouseEntities = syncDataResponse.getThrInvWarehouseEntities();
+                ThrInvWarehouseDao mapper = batchSession.getMapper(ThrInvWarehouseDao.class);
+                for (ThrInvWarehouseEntity thrInvWarehouseEntity : thrInvWarehouseEntities) {
+                    thrInvWarehouseEntity.setUpdateTime(null);
+                    mapper.insertThrInvWarehouse(thrInvWarehouseEntity);
+                }
+                batchSession.commit();
+            } catch (Exception e) {
+            }
+        }
+
+        //仓库用户表
+        if (CollUtil.isNotEmpty(syncDataResponse.getWarehouseUserEntities())) {
+            for (WarehouseUserEntity warehouseUserEntity : syncDataResponse.getWarehouseUserEntities()) {
+                warehouseUserDao.insertOrUpdate(warehouseUserEntity);
+            }
+        }
+
+        //仓库单据类型表
+        if (CollUtil.isNotEmpty(syncDataResponse.getWarehouseBussinessTypeEntities())) {
+            for (WarehouseBussinessTypeEntity warehouseUserEntity : syncDataResponse.getWarehouseBussinessTypeEntities()) {
+                warehouseBussinessTypeDao.insertOrUpdate(warehouseUserEntity);
+            }
+        }
+
 
         //第三方产品信息导入
         if (CollUtil.isNotEmpty(syncDataResponse.getThrProductsEntities())) {
@@ -230,6 +256,17 @@ public class SpsSyncUploadController {
             } catch (Exception e) {
             }
         }
+
+
+        //用户表
+        if (CollUtil.isNotEmpty(syncDataResponse.getAuthAdminList())) {
+            for (AuthAdmin authAdmin : syncDataResponse.getAuthAdminList()) {
+                authAdmin.setLastModifyTime(null);
+                authAdmin.setCustomerId(110);
+                authAdminService.replaceAuthAdmin(authAdmin);
+            }
+        }
+
 //        batchSession.clearCache();
         batchSession.close();
     }
@@ -298,36 +335,55 @@ public class SpsSyncUploadController {
                     orderEntity.setUpdateTime(null);
                     orderEntity.setFromType(ConstantStatus.FROM_UDIWMS);
                     orderEntity.setReceiveStatus(0);
+                    orderEntity.setErpFk(null);
+                    orderEntity.setOutChangeEnable(false);
                     orderEntity.setStatus(ConstantStatus.ORDER_STATUS_PROCESS);
-                    orderService.deleteByOrderId(orderEntity.getId());
+
+                    OrderEntity temp = orderService.findById(orderEntity.getId());
+                    if (temp == null) {
                         mapper.importOrder(orderEntity);
-                }
-                batchSession.commit();
-            } catch (Exception e) {
-            }
-        }
-        if (CollUtil.isNotEmpty(syncDataResponse.getOrderDetailEntityList())) {
+                        if (CollUtil.isNotEmpty(syncDataResponse.getWarehouseEntityList())) {
                             try {
-                List<ErpOrderEntity> erpOrderEntities = syncDataResponse.getOrderDetailEntityList();
-                OrderDetailDao mapper = batchSession.getMapper(OrderDetailDao.class);
-                for (ErpOrderEntity erpOrderEntity : erpOrderEntities) {
-                    mapper.insertErpOrder(erpOrderEntity);
+                                CodesTempDao codeMappert = batchSession.getMapper(CodesTempDao.class);
+                                List<WarehouseEntity> warehouseEntityList = syncDataResponse.getWarehouseEntityList();
+                                for (WarehouseEntity warehouseEntity : warehouseEntityList) {
+                                    if (warehouseEntity.getOrderId().equals(orderEntity.getId())) {
+                                        codeMappert.replaceCodesTempSingle(warehouseEntity);
+                                    }
                                 }
                                 batchSession.commit();
                             } catch (Exception e) {
                             }
                         }
-        if (CollUtil.isNotEmpty(syncDataResponse.getWarehouseEntityList())) {
-            try {
-                List<WarehouseEntity> warehouseEntityList = syncDataResponse.getWarehouseEntityList();
-                CodesDao mapper = batchSession.getMapper(CodesDao.class);
-                for (WarehouseEntity warehouseEntity : warehouseEntityList) {
-                    mapper.insertWarehouse(warehouseEntity);
+                    }
+
                 }
                 batchSession.commit();
             } catch (Exception e) {
             }
         }
+//        if (CollUtil.isNotEmpty(syncDataResponse.getOrderDetailEntityList())) {
+//            try {
+//                List<ErpOrderEntity> erpOrderEntities = syncDataResponse.getOrderDetailEntityList();
+//                OrderDetailDao mapper = batchSession.getMapper(OrderDetailDao.class);
+//                for (ErpOrderEntity erpOrderEntity : erpOrderEntities) {
+//                    mapper.insertErpOrder(erpOrderEntity);
+//                }
+//                batchSession.commit();
+//            } catch (Exception e) {
+//            }
+//        }
+//        if (CollUtil.isNotEmpty(syncDataResponse.getWarehouseEntityList())) {
+//            try {
+//                List<WarehouseEntity> warehouseEntityList = syncDataResponse.getWarehouseEntityList();
+//                CodesDao mapper = batchSession.getMapper(CodesDao.class);
+//                for (WarehouseEntity warehouseEntity : warehouseEntityList) {
+//                    mapper.insertWarehouse(warehouseEntity);
+//                }
+//                batchSession.commit();
+//            } catch (Exception e) {
+//            }
+//        }
 
         batchSession.close();
     }

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

@@ -437,6 +437,18 @@ public class WareHouseController {
 
         UdiEntity udiEntity = FilterUdiUtils.getUdi(code);
         if (udiEntity == null) {
+
+            String sptmtodi = systemParamConfigService.selectValueByParamKey(Constant.SPTM_TO_DI);
+            if(sptmtodi.equals("1")){
+                if (code.length() == 13) {
+                    UdiInfoEntity udiInfoEntity = udiInfoService.findBySptm(code);
+                    if (udiInfoEntity != null) {
+                        BaseResponse baseResponse = ResultVOUtils.error(508, "商品条码");
+                        baseResponse.setData(udiInfoEntity);
+                        return baseResponse;
+                    }
+                }
+            }
             BaseResponse baseResponse = ResultVOUtils.error(501, "UDI码格式错误");
             baseResponse.setData(originCode);
             return baseResponse;
@@ -881,7 +893,9 @@ public class WareHouseController {
         //校验条码的完整性
         String errMsg = "";
         UdiRelevanceResponse udiRelevanceResponse = udiRelevanceService.selectByNameCode(udiEntity.getUdi());
-
+        if(udiRelevanceResponse == null){
+            return ResultVOUtils.error(501, "耗材字典不存在此产品！");
+        }
         if (StrUtil.isEmpty(udiEntity.getBatchNo()) && !udiRelevanceResponse.isAllowNoBatch()) {
             errMsg = errMsg + ",批次号";
         }

api-admin/src/main/java/com/glxp/sale/admin/dao/auth/AuthAdminDao.java

@@ -17,6 +17,8 @@ public interface AuthAdminDao {
      */
     List<AuthAdmin> listAdminPage(AuthAdminQueryRequest authAdminQueryRequest);
 
+    boolean replaceAuthAdmin(AuthAdmin authAdmin);
+
     /**
      * 根据id查询
      *

api-admin/src/main/java/com/glxp/sale/admin/service/basic/UdiInfoService.java

@@ -12,6 +12,9 @@ public interface UdiInfoService {
 
     List<UdiInfoEntity> filterUdiInfo(FilterUdiInfoRequest filterUdiInfoRequest);
 
+
+    UdiInfoEntity findBySptm(String sptm);
+
     List<UdiRelevanceResponse> filterUdiInfo2(FilterUdiInfoRequest filterUdiInfoRequest);
 
     List<UdiInfoEntity> filterAllUdiInfo(FilterUdiInfoRequest filterUdiInfoRequest);

api-admin/src/main/java/com/glxp/sale/admin/service/basic/impl/UdiInfoServiceImpl.java

@@ -1,8 +1,10 @@
 package com.glxp.sale.admin.service.basic.impl;
 
+import cn.hutool.core.collection.CollUtil;
 import com.github.pagehelper.PageHelper;
 import com.glxp.sale.admin.dao.basic.UdiInfoDao;
 import com.glxp.sale.admin.entity.basic.UdiInfoEntity;
+import com.glxp.sale.admin.entity.receipt.ProductInfoEntity;
 import com.glxp.sale.admin.req.basic.FilterUdiInfoRequest;
 import com.glxp.sale.admin.res.basic.UdiRelevanceResponse;
 import com.glxp.sale.admin.service.basic.UdiInfoService;
@@ -33,6 +35,17 @@ public class UdiInfoServiceImpl implements UdiInfoService {
         return data;
     }
 
+    @Override
+    public UdiInfoEntity findBySptm(String sptm) {
+        FilterUdiInfoRequest filterUdiInfoRequest = new FilterUdiInfoRequest();
+        filterUdiInfoRequest.setSptm(sptm);
+        List<UdiInfoEntity> data = udiInfoDao.filterUdiInfo(filterUdiInfoRequest);
+        if (CollUtil.isNotEmpty(data)) {
+            return data.get(0);
+        }
+        return null;
+    }
+
     @Override
     public List<UdiRelevanceResponse> filterUdiInfo2(FilterUdiInfoRequest filterUdiInfoRequest) {
         if (filterUdiInfoRequest == null) {

api-admin/src/main/java/com/glxp/sale/admin/service/receipt/impl/ProductInfoServiceImpl.java

@@ -125,7 +125,9 @@ public class ProductInfoServiceImpl implements ProductInfoService {
 //            int offset = (productInfoFilterRequest.getPage() - 1) * productInfoFilterRequest.getLimit();
 //            PageHelper.offsetPage(offset, productInfoFilterRequest.getLimit());
 //        }
-
+        int offset = (productInfoFilterRequest.getPage() - 1) * productInfoFilterRequest.getLimit();
+        productInfoFilterRequest.setPage(offset);
+        productInfoFilterRequest.setLimit(productInfoFilterRequest.getLimit());
         return productInfoDao.syncDlUdi(productInfoFilterRequest);
     }
 

api-admin/src/main/java/com/glxp/sale/admin/thread/IoTransInoutService.java

@@ -421,7 +421,7 @@ public class IoTransInoutService {
                     orderService.updateRemark(orderEntity.getId(), "udi码：" + warehouseEntity.getCode() + "当前供应商不存在此配送产品");
                     return;
                 } else {
-
+                    if (StrUtil.isEmpty(warehouseEntity.getRelId())) {
                         if (datas.size() == 1) {
                             warehouseEntity.setRelId(datas.get(0).getRlId() + "");
                         } else {
@@ -432,6 +432,8 @@ public class IoTransInoutService {
                     }
 
                 }
+
+            }
             //产品是否已维护已关联
             if (StrUtil.isEmpty(warehouseEntity.getRelId())) {
                 orderService.updateOrderStatus(warehouseEntity.getOrderId(), ConstantStatus.ORDER_STATUS_FAIL);

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

@@ -21,4 +21,6 @@ public class Constant {
     public static final String SCAN_ORDER = "ZS";
     public static final String BUS_ORDER = "ZY";
 
+    public static String SPTM_TO_DI = "sptm_to_di";
+
 }

api-admin/src/main/resources/mybatis/mapper/auth/AuthAdminDao.xml

@@ -31,7 +31,22 @@
         ORDER BY id
         DESC
     </select>
-
+    <insert id="replaceAuthAdmin" keyProperty="id" parameterType="com.glxp.sale.admin.entity.auth.AuthAdmin">
+        replace
+        INTO auth_user(id, userName, passWord, lastLoginIp,
+                              lastLoginTime, createTime, userFlag, lastModifyTime, employeeName,CustomerId)
+        values (
+        #{id},
+        #{userName},
+        #{passWord},
+        #{lastLoginIp},
+        #{lastLoginTime},
+        #{createTime},
+        #{userFlag,jdbcType=INTEGER},
+        #{lastModifyTime},
+        #{employeeName},#{CustomerId}
+        )
+    </insert>
     <select id="findByUserName" parameterType="hashmap" resultType="com.glxp.sale.admin.entity.auth.AuthAdmin">
         SELECT *
         FROM auth_user

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

@@ -22,6 +22,9 @@
             <if test="originUuid != '' and originUuid != null">
                 AND originUuid = #{originUuid}
             </if>
+            <if test="sptm != '' and sptm != null">
+                AND sptm = #{sptm}
+            </if>
         </where>
 
     </select>

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

@@ -33,7 +33,7 @@
                              fromCorp, status, remark, exportStatus, fromType, contrastStatus, signStatus,
                              receiveStatus, erpFk, stockCheckFk, customerId, supId,
                              exportFilePath, locStorageCode, supplementNo, ullageSupNo, createUser, reviewUser,
-                             outChangeEnable, originUllageSupNo, preCheck)
+                             outChangeEnable, originUllageSupNo, preCheck,updateTime)
         values (#{id},
                 #{action},
                 #{corpOrderId},
@@ -52,17 +52,18 @@
                 #{erpFk},
                 #{stockCheckFk},
                 #{customerId}, #{supId}, #{exportFilePath}, #{locStorageCode}, #{supplementNo},
-                #{ullageSupNo}, #{createUser}, #{reviewUser}, #{outChangeEnable}, #{originUllageSupNo}, #{preCheck})
+                #{ullageSupNo}, #{createUser}, #{reviewUser}, #{outChangeEnable}, #{originUllageSupNo}, #{preCheck},#{updateTime})
     </insert>
 
 
     <insert id="importOrder" keyProperty="id" parameterType="com.glxp.sale.admin.entity.inout.OrderEntity">
-        replace
+        insert
+        ignore
                 INTO io_order(id, action, corpOrderId, actDate, fromCorpId, actor, mainAction,
                               fromCorp, status, remark, exportStatus, fromType, contrastStatus, signStatus,
                               receiveStatus, erpFk, stockCheckFk, customerId, supId,
                               exportFilePath, locStorageCode, supplementNo, ullageSupNo, createUser, reviewUser,
-                              outChangeEnable, originUllageSupNo, preCheck)
+                              outChangeEnable, originUllageSupNo, preCheck,updateTime)
         values (#{id},
                 #{action},
                 #{corpOrderId},
@@ -90,7 +91,7 @@
                 #{reviewUser},
                 #{outChangeEnable},
                 #{originUllageSupNo},
-                #{preCheck})
+                #{preCheck},#{updateTime})
     </insert>
 
 

api-admin/src/main/resources/mybatis/mapper/inventory/InvWarehouseDao.xml

@@ -127,7 +127,7 @@
 
 
     <select id="filterGroupInvWarehouse" parameterType="com.glxp.sale.admin.req.inventory.FilterInvWarehouseRequest"
-            resultType="com.glxp.sale.admin.res.inventory.InvWarehouseResponse">
+            resultType="com.glxp.sale.admin.entity.inventory.InvWarehouseEntity">
         SELECT * FROM inv_warehouse
         <where>
             <if test="id != '' and id != null">

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

@@ -75,7 +75,7 @@
     </select>
     <insert id="insertThrInvWarehouse" keyProperty="id"
             parameterType="com.glxp.sale.admin.entity.thrsys.ThrInvWarehouseEntity">
-        insert INTO thr_inv_warehouse
+        replace INTO thr_inv_warehouse
         (pid, code, name, advanceType, isDefault,
          status, updateTime, remark,thirdSysFk)
         values (#{pid}, #{code},
@@ -84,7 +84,7 @@
                 #{remark},#{thirdSysFk})
     </insert>
     <insert id="insertThrInvWarehouses" parameterType="java.util.List">
-        insert INTO thr_inv_warehouse
+        replace INTO thr_inv_warehouse
         (pid, code, name, advanceType, isDefault,
         status, updateTime, remark,thirdSysFk)
         VALUES