价格问题

src/main/java/com/glxp/api/req/thrsys/PostRelProductRequest.java

@@ -11,5 +11,6 @@ public class PostRelProductRequest {
     private String uploadType;
     private String thirdSys;
     List<UdiRelevanceResponse> datas;
+    UdiRelevanceResponse udiRelevanceResponse;
 
 }

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

@@ -499,10 +499,10 @@ public class IoAddInoutService {
         BaseResponse baseResponse = checkInv(bussinessTypeEntity, pdaPostOrderRequest.getOrderDetailBizEntities(), orderEntity, pdaPostOrderRequest.getCodeTempEntities());
         if (baseResponse != null)
             return baseResponse;
-
+        List<IoCodeTempEntity> codeTempEntities = BeanUtil.copyToList(pdaPostOrderRequest.getCodeTempEntities(), IoCodeTempEntity.class);
         String priceFifo = systemParamConfigService.selectValueByParamKey("price_fifo");
         if (IntUtil.value(priceFifo) > 0 && bussinessTypeEntity.getMainAction().equals(ConstantType.TYPE_OUT)) {
-            List<IoCodeTempEntity> codeTempEntities = BeanUtil.copyToList(pdaPostOrderRequest.getCodeTempEntities(), IoCodeTempEntity.class);
+
             List<IoCodeTempEntity> resultList = new ArrayList<>();
             for (IoCodeTempEntity codeTempEntity : codeTempEntities) {
                 resultList = checkPrice(codeTempEntity, bussinessTypeEntity, resultList);
@@ -520,10 +520,10 @@ public class IoAddInoutService {
         orderService.insertOrder(orderEntity);
 
         if (CollUtil.isNotEmpty(pdaPostOrderRequest.getCodeTempEntities())) {
-            for (IoCodeTempEntity codeTempEntity : pdaPostOrderRequest.getCodeTempEntities()) {
+            for (IoCodeTempEntity codeTempEntity : codeTempEntities) {
                 codeTempEntity.setOrderId(orderNo);
             }
-            codeTempService.insertBatch(pdaPostOrderRequest.getCodeTempEntities());
+            codeTempService.insertBatch(codeTempEntities);
         }
 
         dealProcess(orderEntity);

src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsServiceImpl.java

@@ -4,8 +4,7 @@ import cn.hutool.core.bean.BeanUtil;
 import com.glxp.api.req.basic.FilterUdiRelRequest;
 import com.glxp.api.req.thrsys.PostRelProductRequest;
 import com.glxp.api.service.basic.UdiRelevanceService;
-import com.glxp.api.util.BeanCopyUtils;
+import com.glxp.api.util.*;
-import com.glxp.api.util.CustomUtil;
 import org.apache.regexp.RE;
 import org.springframework.beans.BeanUtils;
 import cn.hutool.core.bean.copier.CopyOptions;
@@ -32,8 +31,6 @@ import com.glxp.api.res.thrsys.ThrProductsResponse;
 import com.glxp.api.service.basic.UdiContrastService;
 import com.glxp.api.service.system.SystemParamConfigService;
 import com.glxp.api.service.thrsys.ThrProductsService;
-import com.glxp.api.util.IntUtil;
-import com.glxp.api.util.RedisUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.ibatis.session.ExecutorType;
 import org.apache.ibatis.session.SqlSession;
@@ -327,8 +324,8 @@ public class ThrProductsServiceImpl extends ServiceImpl<ThrProductsDao, ThrProdu
     public BaseResponse uploadThrProduct(ThrSystemDetailEntity thrSystemDetailEntity) {
         //上次修改时间
         String lastUploadTime = (String) redisUtil.get("THR_PI_UPLOAD_TIME");
-        String currentTime = DateUtil.formatTime(new Date());
+        String currentTime = MsDateUtil.formatDateTime(new Date());
-        if (StrUtil.isEmpty(lastUploadTime)) {
+        if (StrUtil.isNotEmpty(lastUploadTime)) {
             //获取耗材字典最新维护数据
             FilterUdiRelRequest filterUdiRelRequest = new FilterUdiRelRequest();
             filterUdiRelRequest.setLastUpdateTime(lastUploadTime);
@@ -337,23 +334,31 @@ public class ThrProductsServiceImpl extends ServiceImpl<ThrProductsDao, ThrProdu
                 List<UdiRelevanceResponse> filteredList = udiRelevanceResponses.stream()
                         .filter(item ->
                                 {
-                                    if (StrUtil.isNotEmpty(item.getNameCode()) || StrUtil.isNotEmpty(item.getBasicPrductRemak8())) {
+                                    if ((StrUtil.isNotEmpty(item.getNameCode()) && StrUtil.isEmpty(item.getMainId())
+                                            || (StrUtil.isNotEmpty(item.getNameCode()) && StrUtil.isNotEmpty(item.getMainId()) && StrUtil.isNotEmpty(item.getBasicPrductRemak8()))
+                                    )) {
                                         return true;
                                     } else return false;
                                 }
                         )
                         .collect(Collectors.toList());
 
-                List<List<UdiRelevanceResponse>> splitList = CustomUtil.splitList(filteredList, 10);
+//                List<List<UdiRelevanceResponse>> splitList = CustomUtil.splitList(filteredList, 10);
-                for (List<UdiRelevanceResponse> temps : splitList) {
+                for (UdiRelevanceResponse udiRelevanceResponse : filteredList) {
                     PostRelProductRequest postRelProductRequest = new PostRelProductRequest();
                     postRelProductRequest.setUploadType("1");
                     postRelProductRequest.setThirdSys(thrSystemDetailEntity.getThirdSysFk());
-                    postRelProductRequest.setDatas(temps);
+                    postRelProductRequest.setUdiRelevanceResponse(udiRelevanceResponse);
                     //上传第三方产品信息
                     BaseResponse baseResponse = erpBasicClient.postRelProduct(postRelProductRequest);
                     if (baseResponse.getCode() != 20000) {
                         return ResultVOUtils.error(500, "上传失败！" + baseResponse.getMessage());
+                    } else {
+                        String thirdCode = (String) baseResponse.getData();
+                        UdiRelevanceEntity udiRelevanceEntity = udiRelevanceDao.selectById(udiRelevanceResponse.getId());
+                        udiRelevanceEntity.setThirdId(thirdCode);
+                        udiRelevanceEntity.setMainId(thirdCode);
+                        udiRelevanceDao.updateById(udiRelevanceEntity);
                     }
                 }
                 redisUtil.set("THR_PI_UPLOAD_TIME", currentTime);

src/main/resources/application-dev.yml

@@ -4,7 +4,7 @@ server:
 spring:
   datasource:
     driver-class-name: com.p6spy.engine.spy.P6SpyDriver
-    jdbc-url: jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms_ct?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_wms_ph?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
     username: root
     password: 123456
     hikari:

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

@@ -412,7 +412,8 @@
             </if>
             <if test="lastUpdateTime != null and lastUpdateTime != ''">
                 <![CDATA[
-                and DATE_FORMAT(updateTime, '%Y-%m-%d %H:%i:%S') >= DATE_FORMAT(#{lastUpdateTime}, '%Y-%m-%d %H:%i:%S')
+                and DATE_FORMAT(basic_udirel.updateTime, '%Y-%m-%d %H:%i:%S') >=
+                    DATE_FORMAT(#{lastUpdateTime}, '%Y-%m-%d %H:%i:%S')
                 ]]>
             </if>
             <if test="mainId != '' and mainId != null">