Merge remote-tracking branch 'origin/master'

src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java

@@ -128,12 +128,23 @@ public class UdiRelevanceController extends BaseController {
             if (StrUtil.isNotEmpty(filterUdiRelRequest.getUdiCode())) {
                 UdiEntity udiEntity = FilterUdiUtils.getUdi(filterUdiRelRequest.getUdiCode());
                 filterUdiRelRequest.setNameCode(udiEntity.getUdi());
+                List<UdiRelevanceResponse> temps = udiRelevanceService.filterUdiGp(filterUdiRelRequest);
+                if (temps != null && temps.size() > 0) {
+                    filterUdiRelRequest.setOriginUuid(temps.get(0).getOriginUuid());
+                    filterUdiRelRequest.setNameCode(null);
+                }
             }
+
+        } else if (StrUtil.isNotEmpty(filterUdiRelRequest.getUnionCode()) && StrUtil.isEmpty(filterUdiRelRequest.getUdiCode())) {
+            if (StrUtil.isNotEmpty(filterUdiRelRequest.getUnionCode())) {
+                filterUdiRelRequest.setNameCode(filterUdiRelRequest.getUnionCode());
                 List<UdiRelevanceResponse> temps = udiRelevanceService.filterUdiGp(filterUdiRelRequest);
                 if (temps != null && temps.size() > 0) {
                     filterUdiRelRequest.setOriginUuid(temps.get(0).getOriginUuid());
                     filterUdiRelRequest.setNameCode(null);
                 }
+            }
+
         } else {
             filterUdiRelRequest.setDiType(1);
         }

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

@@ -2,6 +2,7 @@ package com.glxp.api.controller.inout;
 
 import cn.hutool.Hutool;
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.lang.UUID;
 import cn.hutool.core.util.StrUtil;
 import com.github.pagehelper.PageInfo;
 import com.glxp.api.annotation.AuthRuleAnnotation;
@@ -493,8 +494,7 @@ public class IoCodeTempController extends BaseController {
 
         //校验预验收库存是否已存在
         if (bussinessTypeEntity.isScanPreIn()) {
-
-            if (bussinessTypeEntity.getBackPreinType() == 1) {//按单出库
+            if (bussinessTypeEntity.getBackPreinType() == 1 && bussinessTypeEntity.isPreInBack()) {//按单出库
                 String orderIds = addOrderRequest.getCheckPreInOrders();
                 if (StrUtil.isNotEmpty(orderIds)) {
                     String[] orderIdArray = orderIds.split(",");

src/main/java/com/glxp/api/entity/thrsys/ThrCorpEntity.java

@@ -3,6 +3,7 @@ package com.glxp.api.entity.thrsys;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
 import java.util.Date;
@@ -14,6 +15,7 @@ import java.util.Date;
  * @since 2023-01-12
  */
 @Data
+@TableName("thr_corp")
 public class ThrCorpEntity{
 
     @TableId(value = "id", type = IdType.AUTO)

src/main/java/com/glxp/api/entity/thrsys/ThrDeptEntity.java

@@ -1,5 +1,6 @@
 package com.glxp.api.entity.thrsys;
 
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
 import java.util.Date;
@@ -8,6 +9,7 @@ import java.util.Date;
  * 第三方仓库信息
  */
 @Data
+@TableName("thr_dept")
 public class ThrDeptEntity {
 
     private Integer id;

src/main/java/com/glxp/api/entity/thrsys/ThrInvWarehouseEntity.java

@@ -1,10 +1,13 @@
 package com.glxp.api.entity.thrsys;
 
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
 import java.util.Date;
 
 @Data
+@TableName("thr_inv_warehouse")
 public class ThrInvWarehouseEntity {
 
 
@@ -14,6 +17,7 @@ public class ThrInvWarehouseEntity {
     private String parentId;
     private String remark;
     private String thirdSysFk;
+    @TableField(exist = false)
     private String parentName;
 
     private Date updateTime;

src/main/java/com/glxp/api/req/basic/BussinessTypeSaveRequest.java

@@ -54,7 +54,7 @@ public class BussinessTypeSaveRequest {
     /**
      * 是否自动生成往来单位：1.是；2.否
      */
-    private Boolean genUnit;
+    private boolean genUnit;
 
     /**
      * 是否是内部单据：1.是；0：否
@@ -294,7 +294,6 @@ public class BussinessTypeSaveRequest {
     private boolean fillCodeRel;
 
 
-
     private Integer checkVailDate;
     private Integer checkExpire;
     private Integer checkCertExpire;

src/main/java/com/glxp/api/req/inv/FilterInvPreProductRequest.java

@@ -98,4 +98,9 @@ public class FilterInvPreProductRequest extends ListPageRequest {
      */
     private String cplb;
 
+    /**
+     * 是否过滤0库存
+     */
+    private Integer filterCount;
+
 }

src/main/java/com/glxp/api/req/inv/FilterInvPreinProductRequest.java

@@ -98,4 +98,9 @@ public class FilterInvPreinProductRequest extends ListPageRequest {
      */
     private String cplb;
 
+    /**
+     * 是否过滤0库存
+     */
+    private Integer filterCount;
+
 }

src/main/java/com/glxp/api/req/inv/FilterInvProductRequest.java

@@ -103,4 +103,9 @@ public class FilterInvProductRequest extends ListPageRequest {
      */
     private String invSpaceCode;
 
+    /**
+     * 是否过滤0库存
+     */
+    private Integer filterCount;
+
 }

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

@@ -306,7 +306,7 @@ public class IoAddInoutService {
     public void genOrderDetailCode(IoOrderEntity orderEntity, IoCodeTempEntity codeTempEntity) {
 
         List<IoOrderDetailCodeEntity> ioOrderDetailCodeEntities = orderDetailCodeDao.selectList(new QueryWrapper<IoOrderDetailCodeEntity>().select("id", "count", "reCount", "bindRlFk", "batchNo").eq("orderIdFk", orderEntity.getBillNo()));
-        UdiRelevanceResponse udiRelevanceResponse = udiRelevanceService.selectSupGroupById(codeTempEntity.getRelId(), orderEntity.getFromCorp());
+        UdiRelevanceResponse udiRelevanceResponse = udiRelevanceService.selectGroupById(codeTempEntity.getRelId());
 //        UdiRelevanceResponse udiRelevanceResponse = udiRelevanceService.selectGroupById(codeTempEntity.getRelId());
         if (CollUtil.isEmpty(ioOrderDetailCodeEntities)) {
             orderDetailCodeService.insert(buildEntity(orderEntity, codeTempEntity, udiRelevanceResponse));

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

@@ -203,7 +203,7 @@ public class IoChangeInoutService {
                 InvWarehouseEntity invWarehouseEntity = invWarehouseService.findByInvSubByCode(Constant.INV_PRE_IN_CODE);
                 outOrder.setFromInvCode(invWarehouseEntity.getCode());
                 outOrder.setFromDeptCode(invWarehouseEntity.getParentId());
-            } else if (targetBustypeEntity.getActionType() == 4) {
+            } else if (bussinessChangeTypeEntity.getCreateType() == 4) {
                 outOrder.setCustomerId(null);
                 outOrder.setFromCorp(null);
                 InvWarehouseEntity invWarehouseEntity = invWarehouseService.findByInvSubByCode(Constant.INV_PRE_CODE);

src/main/java/com/glxp/api/task/SyncHeartTask.java

@@ -20,8 +20,8 @@ import javax.annotation.Resource;
 import java.util.Arrays;
 
 
-//@Component
-//@EnableScheduling
+@Component
+@EnableScheduling
 public class SyncHeartTask implements SchedulingConfigurer {
 
     final Logger logger = LoggerFactory.getLogger(SyncHeartTask.class);
@@ -69,11 +69,11 @@ public class SyncHeartTask implements SchedulingConfigurer {
             }
             try {
                 if (curTime1 - lastTime1 > timeInterval1) {
-                    heartService.uploadAllBus(null);
-                    heartService.uploadAllUserData(null);
+//                    heartService.uploadAllBus(null);
+//                    heartService.uploadAllUserData(null);
                     //                heartService.uploadScheduleList();
-                    heartService.uploadThrData(null);
-                    heartService.uploadThrProducts(null);
+//                    heartService.uploadThrData(null);
+//                    heartService.uploadThrProducts(null);
                     heartService.uploadSysSetting(null);
                     Arrays.stream(BasicExportTypeEnum.values()).forEach(i -> {
                         heartService.pushData(syncDataSetEntity, null, i);