同步相关问题修改。用户选入物资字典相关修改

src/main/java/com/glxp/api/constant/BasicExportTypeEnum.java

@@ -47,6 +47,13 @@ public enum BasicExportTypeEnum {
      */
     IO_ORDER("io_order", "单据信息"),
 
+
+    /**
+     * 发票信息
+     */
+    ORDER_INVOICE("io_order_invoice", "扫码单据发票信息"),
+
+
 //
 //    NEW_ALL_ORDER("all_order", "出入库扫码单据"),
 //    ALL_BUS_ORDER("all_bus_order", "业务单据"),

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

@@ -52,7 +52,6 @@ public class IoOrderInvoiceController {
                     fileService.download(syncFiles);
                 }
             }
-
             return ResultVOUtils.success("更新成功！");
         } else
             return baseResponse;

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

@@ -137,6 +137,9 @@ public class IoOrderReviewController extends BaseController {
                     transferOrder(orderEntity, entrustReceEntity);
                 }
             }
+
+            if (orderEntity.getFromType() == ConstantStatus.FROM_UDISP)
+                spGetHttp.reviewOrder(updateExportStatusRequest);
             return updateReview(getUser(), orderEntity);
         } else if (orderEntity.getStatus() == ConstantStatus.ORDER_STATUS_CHECK_SUCCESS) {
             return thirdUpdateReview(getUser(), orderEntity);
@@ -452,7 +455,6 @@ public class IoOrderReviewController extends BaseController {
         String errMsg = checkReviewAuth(billNo, userId + "");
         EntrustReceEntity entrustReceEntity;
         if (StrUtil.isNotEmpty(errMsg)) {
-
             if (errMsg.equals("委托验收")) {
                 IoOrderEntity orderEntity = orderService.findByBillNo(billNo);
                 entrustReceEntity = entrustReceService.findByUnique(orderEntity.getAction(), userId);
@@ -493,12 +495,19 @@ public class IoOrderReviewController extends BaseController {
                         orderEntity = orderEntities.get(0);
                         orderEntity.setUpdateTime(null);
                         orderEntity.setFromType(ConstantStatus.FROM_UDISP);
+                        orderEntity.setReviewSp(true);
                         orderEntity.setStatus(ConstantStatus.ORDER_STATUS_PROCESS);
                         IoOrderEntity temp = orderService.findByBillNo(orderEntity.getBillNo());
                         if (temp == null) {
                             orderEntity.setId(null);
                             orderService.insertOrder(orderEntity);
                             heartService.insetOrderDb(spsSyncOrderResponse, orderEntity);
+                            orderEntity = orderService.findByBillNo(orderEntity.getBillNo());
+                            addInoutService.dealProcess(orderEntity);
+                            orderEntity = orderService.findByBillNo(orderEntity.getBillNo());
+                            if (orderEntity.getStatus() != ConstantStatus.ORDER_STATS_ERROR && !ioCheckInoutService.checkManual(orderEntity.getBillNo())) {
+                                ioCheckInoutService.check(orderEntity.getBillNo());
+                            }
                         }
                         FilterOrderDetailResultRequest tempRequest = new FilterOrderDetailResultRequest();
                         tempRequest.setOrderIdFk(billNo);
@@ -518,12 +527,30 @@ public class IoOrderReviewController extends BaseController {
         return ResultVOUtils.success(acceptOrderEntity);
     }
 
+    @Resource
+    IoAddInoutService addInoutService;
+
     @Resource
     InvBusUserService invBusUserService;
 
     //校验用户是否验收权限
     private String checkReviewAuth(String orderId, String userId) {
         IoOrderEntity orderEntity = orderService.findByBillNo(orderId);
+
+
+        if (orderEntity == null) {
+            ReviewSpmsRequest reviewSpmsRequest = new ReviewSpmsRequest();
+            reviewSpmsRequest.setBillNo(orderId);
+            BaseResponse<IoOrderEntity> response = spGetHttp.getSimpleOrder(reviewSpmsRequest, userId);
+            if (response.getCode() == 20000 && response.getData() != null) {
+                orderEntity = response.getData();
+            } else {
+                return "单据不存在！";
+            }
+
+        }
+
+
         if (orderEntity.getStatus() != ConstantStatus.ORDER_STATUS_CHECK_REW && orderEntity.getStatus() != ConstantStatus.ORDER_STATUS_CHECK_SUCCESS) {
             return "单据非未验收状态,无法审核！";
         }

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

@@ -66,13 +66,15 @@ public class SyncDataSetController {
         syncDataSetEntity.setId(1);
         List<SyncDataBustypeEntity> busTypes = syncDataSetResponse.getBusTypes();
         syncDataBustypeService.deleteAll(1);
-        if (CollUtil.isNotEmpty(busTypes))
+        if (CollUtil.isNotEmpty(busTypes)) {
             syncDataBustypeService.inserts(busTypes);
+        }
 
         List<SyncDataBustypeEntity> toInBusTypes = syncDataSetResponse.getToInBusTypes();
         syncDataBustypeService.deleteAll(2);
-        if (CollUtil.isNotEmpty(toInBusTypes))
+        if (CollUtil.isNotEmpty(toInBusTypes)) {
             syncDataBustypeService.inserts(toInBusTypes);
+        }
 
 
         if (CollUtil.isNotEmpty(syncDataSetResponse.getChangeBusTypes())) {

src/main/java/com/glxp/api/entity/basic/UdiProductEntity.java

@@ -79,7 +79,7 @@ public class UdiProductEntity {
     private String supId;
 
 
-    private Integer relSupId;
+    private Long relSupId;
 
 
     public Boolean getAllowNoBatch() {

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

@@ -195,6 +195,8 @@ public class IoOrderEntity {
 
     @TableField(value = "entrustEnd")
     private boolean entrustEnd;
+    @TableField(value = "reviewSp")
+    private boolean reviewSp;   //是否验收外网单据时，需忽略流转更改为待审核
 
 
     /**

src/main/java/com/glxp/api/http/sync/SpGetHttpClient.java

@@ -10,6 +10,7 @@ import com.glxp.api.common.res.BaseResponse;
 import com.glxp.api.common.util.ResultVOUtils;
 import com.glxp.api.constant.BasicExportTypeEnum;
 import com.glxp.api.entity.basic.ProductInfoEntity;
+import com.glxp.api.entity.inout.IoOrderEntity;
 import com.glxp.api.entity.inout.IoOrderInvoiceEntity;
 import com.glxp.api.entity.sync.BasicExportStatusEntity;
 import com.glxp.api.entity.sync.IOOrderStatusEntity;
@@ -125,6 +126,19 @@ public class SpGetHttpClient {
     }
 
 
+    public BaseResponse<IoOrderEntity> getSimpleOrder(ReviewSpmsRequest reviewSpmsRequest, String userId) {
+        String json = JSONUtil.toJsonStr(reviewSpmsRequest);
+        List<String> header = (List<String>) Convert.toList(buildHeader());
+        header.add("ADMIN_ID");
+        header.add(userId);
+        String result = okHttpCli.doPostJson(getIpUrl() + "/directToSpms" + "/udiwms/order/getSimpleOrder", json, Convert.toStrArray(header));
+        BaseResponse<IoOrderEntity> response =
+                JSONObject.parseObject(result, new TypeReference<BaseResponse<IoOrderEntity>>() {
+                });
+        return response;
+    }
+
+
     public BaseResponse<List<IoOrderInvoiceEntity>> getIoOrderInvoices(RefreshInoiceRequest refreshInoiceRequest) {
         String json = JSONUtil.toJsonStr(refreshInoiceRequest);
         String result = okHttpCli.doPostJson(getIpUrl() + "/directToSpms" + "/udiwms/inout/order/refrshInvoice", json, buildHeader());

src/main/java/com/glxp/api/res/basic/CompanyProductRelevanceResponse.java

@@ -5,7 +5,7 @@ import lombok.Data;
 @Data
 public class CompanyProductRelevanceResponse {
 
-    private int id;
+    private Long id;
     private Integer rlId;
     private String thirdId;
     private String thirdName;

src/main/java/com/glxp/api/service/basic/impl/CompanyProductRelevanceServiceImpl.java

@@ -1,6 +1,7 @@
 package com.glxp.api.service.basic.impl;
 
 
+import cn.hutool.core.util.IdUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.pagehelper.PageHelper;
@@ -39,6 +40,8 @@ public class CompanyProductRelevanceServiceImpl extends ServiceImpl<CompanyProdu
 
     @Override
     public boolean insertCompanyProductRelevance(CompanyProductRelevanceEntity companyProductRelevanceEntity) {
+        if (companyProductRelevanceEntity.getId() == null)
+            companyProductRelevanceEntity.setId(IdUtil.getSnowflakeNextId());
         return companyProductRelevanceDao.insertCompanyProductRelevance(companyProductRelevanceEntity);
     }
 

src/main/java/com/glxp/api/service/basic/impl/UdiProductServiceImpl.java

@@ -1,6 +1,7 @@
 package com.glxp.api.service.basic.impl;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.StrUtil;
 import com.github.pagehelper.PageHelper;
 import com.glxp.api.dao.basic.UdiProductDao;
@@ -96,6 +97,9 @@ public class UdiProductServiceImpl implements UdiProductService {
 
     @Override
     public boolean insertUdiInfo(UdiProductEntity udiProductEntity) {
+        if (udiProductEntity.getId() == null) {
+            udiProductEntity.setId(IdUtil.getSnowflakeNextId());
+        }
         return udiProductDao.insertUdiInfo(udiProductEntity);
     }
 

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

@@ -3,6 +3,7 @@ package com.glxp.api.service.inout;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.lang.UUID;
 import cn.hutool.core.thread.ThreadUtil;
+import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.StrUtil;
 import com.glxp.api.common.util.ResultVOUtils;
 import com.glxp.api.constant.Constant;
@@ -187,9 +188,12 @@ public class IoCheckInoutService {
             UdiEntity udiEntity = FilterUdiUtils.getUdi(codeEntity.getCode());
 
             IoCodeLostEntity codeLostEntity = codeLostService.findByCode(codeEntity.getCode());
-            if (codeLostEntity == null)
+            if (codeLostEntity == null) {
                 codeLostEntity = new IoCodeLostEntity();
-
+                codeLostEntity.setId(IdUtil.getSnowflakeNextId());
+                codeLostEntity.setNameCode(udiEntity.getUdi());
+                codeLostEntity.setCode(codeEntity.getCode());
+            }
             //校验是否写入缺失表
             boolean isTrue = false;
             if (udiEntity != null) {
@@ -211,9 +215,11 @@ public class IoCheckInoutService {
                         isTrue = true;
                     }
                 }
-                if (isTrue)
+                if (isTrue) {
+                    codeLostEntity.setCreateTime(new Date());
                     codeLostService.insertOrUpdate(codeLostEntity);
                 }
+            }
 
         }
     }
@@ -777,7 +783,7 @@ public class IoCheckInoutService {
                     if (!bussinessTypeEntity.isSecCheckCopy()) {
                         orderEntity.setStatus(ConstantStatus.ORDER_STATUS_AUDITED);
                     }
-                } else if (orderEntity.getFromType().intValue() == ConstantStatus.FROM_UDISP) {
+                } else if (orderEntity.getFromType().intValue() == ConstantStatus.FROM_UDISP && !orderEntity.isReviewSp()) {
                     if (!bussinessTypeEntity.isSecCheckSp()) {
                         orderEntity.setStatus(ConstantStatus.ORDER_STATUS_AUDITED);
                     }

src/main/java/com/glxp/api/service/sync/SyncDataBustypeService.java

@@ -14,4 +14,6 @@ public interface SyncDataBustypeService extends IService<SyncDataBustypeEntity>
 
     void inserts(List<SyncDataBustypeEntity> syncDataBustypeEntities);
 
+    boolean isExits(List<SyncDataBustypeEntity> syncDataBustypeEntities, Integer direct);
+
 }

src/main/java/com/glxp/api/service/sync/impl/SyncDataBustypeServiceImpl.java

@@ -13,7 +13,7 @@ import java.util.List;
 
 @Service
 @Transactional(rollbackFor = Exception.class)
-public class SyncDataBustypeServiceImpl extends ServiceImpl<SyncDataBustypeDao,SyncDataBustypeEntity> implements SyncDataBustypeService {
+public class SyncDataBustypeServiceImpl extends ServiceImpl<SyncDataBustypeDao, SyncDataBustypeEntity> implements SyncDataBustypeService {
 
     @Resource
     SyncDataBustypeDao syncDataBustypeDao;
@@ -32,4 +32,10 @@ public class SyncDataBustypeServiceImpl extends ServiceImpl<SyncDataBustypeDao,S
     public void inserts(List<SyncDataBustypeEntity> syncDataBustypeEntities) {
         syncDataBustypeDao.inserts(syncDataBustypeEntities);
     }
+
+    @Override
+    public boolean isExits(List<SyncDataBustypeEntity> syncDataBustypeEntities, Integer direct) {
+//
+        return false;
+    }
 }

src/main/java/com/glxp/api/util/DateUtil.java

@@ -61,7 +61,7 @@ public class DateUtil extends DateUtils {
      * 得到日期时间字符串，转换格式（yyyy-MM-dd HH:mm:ss）
      */
     public static String formatDateTime(Date date) {
-        Date currentTime = new Date();
+        Date currentTime = date;
         SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         String dateString = formatter.format(currentTime);
         return dateString;

src/main/java/com/glxp/api/util/udi/UdiInfoUtil.java

@@ -1,6 +1,7 @@
 package com.glxp.api.util.udi;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.StrUtil;
 import com.glxp.api.constant.ConstantStatus;
 import com.glxp.api.entity.basic.UdiProductEntity;
@@ -26,6 +27,9 @@ public class UdiInfoUtil {
     public static List<UdiProductEntity> initUdiInfoEntitys(List<UdiProductEntity> udiProductEntities) {
         if (CollUtil.isNotEmpty(udiProductEntities)) {
             for (UdiProductEntity udiProductEntity : udiProductEntities) {
+                if (udiProductEntity.getId() == null) {
+                    udiProductEntity.setId(IdUtil.getSnowflakeNextId());
+                }
                 udiProductEntity.setProductType(ConstantStatus.PRODUCT_TYPE_UDI);
                 if (StrUtil.isNotEmpty(udiProductEntity.getScbssfbhph()) && "否".equals(udiProductEntity.getScbssfbhph())) {
                     udiProductEntity.setAllowNoBatch(true);

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

@@ -5,10 +5,10 @@
     <insert id="insertCompanyProductRelevance"
             parameterType="com.glxp.api.entity.basic.CompanyProductRelevanceEntity">
         replace
-                INTO company_product_relevance(customerId, productId, enterpriseId, registrationId,
+                INTO company_product_relevance(id, customerId, productId, enterpriseId, registrationId,
                                                createTime, updateTime, auditStatus, productUuid, udiRlIdFk, unitFk,
                                                price)
-        values (#{customerId},
+        values (#{id}, #{customerId},
                 #{productId},
                 #{enterpriseId},
                 #{registrationId},

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

@@ -128,7 +128,6 @@
             <if test="originUuid != '' and originUuid != null">
                 AND originUuid = #{originUuid}
             </if>
-
         </where>
         ORDER BY updateTime DESC
     </select>
@@ -166,7 +165,7 @@
     <insert id="insertUdiInfo" keyProperty="id" parameterType="com.glxp.api.entity.basic.UdiProductEntity">
         replace
                 INTO basic_products
-        (uuid, originUuid, nameCode, deviceRecordKey, packRatio, packLevel, packUnit, bhxjsl, bhzxxsbzsl,
+                (id, uuid, originUuid, nameCode, deviceRecordKey, packRatio, packLevel, packUnit, bhxjsl, bhzxxsbzsl,
                  zxxsbzbhsydysl, bhxjcpbm, bzcj, cpmctymc, cplb, flbm, ggxh, qxlb, tyshxydm,
                  ylqxzcrbarmc, zczbhhzbapzbh, ylqxzcrbarywmc, sydycpbs, sjcpbm, versionNumber, diType, ybbm, sptm,
                  manufactory, measname, productType, scbssfbhph, scbssfbhxlh, scbssfbhscrq, scbssfbhsxrq, cpms,
@@ -174,7 +173,7 @@
                  allowNoProduct, allowNoSerial, spmc, cplx, hchzsb, cpdls, price, basicPrductRemak1, basicPrductRemak2,
                  basicPrductRemak3, basicPrductRemak4, basicPrductRemak5, basicPrductRemak6, basicPrductRemak7,
                  basicPrductRemak8)
-        values (#{uuid},
+        values (#{id}, #{uuid},
                 #{originUuid},
                 #{nameCode},
                 #{deviceRecordKey},
@@ -229,7 +228,7 @@
 
     <insert id="insertUdiInfos" keyProperty="id" parameterType="java.util.List">
         replace INTO basic_products
-        (id,uuid, originUuid, nameCode, deviceRecordKey, packRatio, packLevel, packUnit, bhxjsl, bhzxxsbzsl,
+                (id, uuid, originUuid, nameCode, deviceRecordKey, packRatio, packLevel, packUnit, bhxjsl, bhzxxsbzsl,
                  zxxsbzbhsydysl, bhxjcpbm, bzcj, cpmctymc, cplb, flbm, ggxh, qxlb, tyshxydm,
                  ylqxzcrbarmc, zczbhhzbapzbh, ylqxzcrbarywmc, sydycpbs, sjcpbm, versionNumber, diType, ybbm, sptm,
                  manufactory, measname, productType, scbssfbhph, scbssfbhxlh, scbssfbhscrq, scbssfbhsxrq, cpms,
@@ -957,6 +956,9 @@
     </update>
 
     <select id="selectAllowNoBatch" resultType="com.glxp.api.entity.basic.UdiProductEntity">
-        select id, allowNoBatch from basic_products where nameCode = #{nameCode} limit 1
+        select id, allowNoBatch
+        from basic_products
+        where nameCode = #{nameCode}
+        limit 1
     </select>
 </mapper>

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

@@ -10,7 +10,7 @@
 
 
     <insert id="inserts" parameterType="com.glxp.api.entity.system.SyncDataBustypeEntity" useGeneratedKeys="true">
-        insert INTO sync_data_bustypes
+        replace INTO sync_data_bustypes
                 (id, `action`, `name`, outChange, orderStatus, direct)
                 values
 

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

@@ -22,7 +22,7 @@
                                   , unCheckCert, checkedCert, companyCert, manufacturerCert, productCert, basicDept
                                   , systemConfig
                                   , printConfig, scanChangeConfig, supCert, dbDiCompany, busChangeConfig
-                                  , udiCodeLost, udiCodeRel, orderInvoice)
+                                  , udiCodeLost, udiCodeRel, orderInvoice, orderToInSyncTime, orderSyncDlTime)
         values (#{id},
                 #{typeBus},
                 #{typeScan},
@@ -51,6 +51,6 @@
                 #{unCheckCert},
                 #{checkedCert}, #{companyCert}, #{manufacturerCert}, #{productCert}, #{basicDept},
                 #{systemConfig}, #{printConfig}, #{scanChangeConfig}, #{supCert}, #{dbDiCompany}, #{busChangeConfig},
-                #{udiCodeLost}, #{udiCodeRel}, #{orderInvoice})
+                #{udiCodeLost}, #{udiCodeRel}, #{orderInvoice}, #{orderToInSyncTime}, #{orderSyncDlTime})
     </insert>
 </mapper>

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

@@ -393,3 +393,8 @@ CALL Pro_Temp_ColumnWork('sup_cert', 'filePath', 'text', 2);
 CALL Pro_Temp_ColumnWork('sync_data_bustypes', 'id', 'bigint', 2);
 CALL Pro_Temp_ColumnWork('io_order_invoice', 'id', 'bigint ', 2);
 CALL Pro_Temp_ColumnWork('sync_data_set', 'orderInvoice', 'tinyint', 1);
+
+CALL Pro_Temp_ColumnWork('io_order', 'regStatus', 'tinyint', 1);
+CALL Pro_Temp_ColumnWork('io_order', 'reviewSp', 'tinyint', 1);
+
+CALL Pro_Temp_ColumnWork('io_order_detail_biz', 'regStatus', 'tinyint', 1);