寄售出库问题，预验收入库问题，同步问题，领用单据问题

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

@@ -15,7 +15,7 @@ public enum BasicExportTypeEnum {
     /**
      * 国家库DI数据
      */
-    COUNTRY_DI_DATA("country_di_data", "国家库DI数据"),
+//    COUNTRY_DI_DATA("country_di_data", "国家库DI数据"),
 
     /**
      * 单据类型

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

@@ -33,6 +33,7 @@ public class FilterReceiveRequest extends ListPageRequest {
     private Integer status;
     private String corpName;
     private String billAction;
+    private String targetInvCode;
 
     private Integer type;
 

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

@@ -108,7 +108,7 @@ public class IoOrderResponse {
     /**
      * ID
      */
-    private Long customerId;
+    private String customerId;
 
     /**
      * 部门编码

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

@@ -238,7 +238,7 @@ public class BasicBussinessTypeServiceImpl extends ServiceImpl<BasicBussinessTyp
                 break;
             case Constant.ORDER_ACTION_SUP_INVOICE:
                 bussinessTypeEntities = basicBussinessTypeDao.selectList(new QueryWrapper<BasicBussinessTypeEntity>()
-                        .eq("mainAction", ConstantType.TYPE_PUT).eq("corpType", ConstantStatus.CORP_TYPE_OUT)
+                        .eq("mainAction", ConstantType.TYPE_PUT)
                         .gt("spUse", 0).eq("actionType", 1).eq("enable", true));
                 break;
 

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

@@ -119,7 +119,7 @@ public class IoAddInoutService {
                     basicCorpEntity.setOutType(ConstantStatus.CORP_SICK_SICK);
                     basicCorpEntity.setName(orderEntity.getFromCorp());
                     basicCorpEntity.setId(IdUtil.getSnowflakeNextId());
-                    basicCorpService.insertBasicUnitMaintain(basicCorpEntity);
+                    basicCorpService.insert(basicCorpEntity);
                 }
                 orderEntity.setFromCorp(basicCorpEntity.getErpId());
                 orderEntity.setUpdateTime(new Date());

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

@@ -157,7 +157,7 @@ public class IoChangeInoutService {
         Map<String, List<IoCodeEntity>> filterSupMaps = new HashMap<>();
         BasicBussinessTypeEntity targetBustypeEntity = basicBussinessTypeService.findByAction(bussinessChangeTypeEntity.getAction());
         //过滤供应商
-        if (targetBustypeEntity.getCorpType() == ConstantStatus.CORP_TYPE_OUT) {
+        if (targetBustypeEntity.getCorpType() == ConstantStatus.CORP_TYPE_OUT || bussinessChangeTypeEntity.getCreateType() == 3 || bussinessChangeTypeEntity.getCreateType() == 4) {
             for (IoCodeEntity warehouseEntity : useInList) {
                 if (warehouseEntity.getSupId() != null) {
                     if (filterSupMaps.get(warehouseEntity.getSupId()) == null) {

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

@@ -101,6 +101,7 @@ public class IoGenInvService {
             BeanUtils.copyProperties(codeEntity, invProductDetailEntity);
             invProductDetailEntity.setRelId(codeEntity.getRelId());
             invProductDetailEntity.setUpdateTime(new Date());
+            invProductDetailEntity.setId(null);
             invProductDetailEntity.setPurchaseType(ConstantStatus.PRUCHASE_COMMON);
             if (invProductDetailEntity.getMainAction().equals(ConstantType.TYPE_PUT)) {
                 invProductDetailEntity.setInCount(invProductDetailEntity.getReCount());
@@ -171,6 +172,7 @@ public class IoGenInvService {
             BeanUtils.copyProperties(codeEntity, invProductDetailEntity);
             invProductDetailEntity.setRelId(codeEntity.getRelId());
             invProductDetailEntity.setUpdateTime(new Date());
+            invProductDetailEntity.setId(null);
             invProductDetailEntity.setPurchaseType(ConstantStatus.PRUCHASE_COMMON);
             if (invProductDetailEntity.getMainAction().equals(ConstantType.TYPE_PUT)) {
                 invProductDetailEntity.setInCount(invProductDetailEntity.getReCount());
@@ -252,6 +254,7 @@ public class IoGenInvService {
             BeanUtils.copyProperties(codeEntity, invProductDetailEntity);
             invProductDetailEntity.setRelId(codeEntity.getRelId());
             invProductDetailEntity.setUpdateTime(new Date());
+            invProductDetailEntity.setId(null);
             invProductDetailEntity.setPurchaseType(ConstantStatus.PRUCHASE_COMMON);
             if (invProductDetailEntity.getMainAction().equals(ConstantType.TYPE_PUT)) {
                 invProductDetailEntity.setInCount(invProductDetailEntity.getReCount());

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

@@ -178,7 +178,7 @@ public class InvPreProductDetailServiceImpl implements InvPreProductDetailServic
     @Override
     public InvPreProductDetailEntity findUseOneByCode(String code) {
         List<InvPreProductDetailEntity> invPreinDetailEntities = invPreProductDetailDao.selectList(new QueryWrapper<InvPreProductDetailEntity>().eq("code", code)
-                .eq("status", ConstantStatus.INVIN_IN).last("limit 1"));
+                .last("limit 1"));
         if (CollUtil.isNotEmpty(invPreinDetailEntities)) {
             return invPreinDetailEntities.get(0);
         }

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

@@ -1415,6 +1415,14 @@ public class HeartService {
                         basicDownloadStatusEntity.setUpdateTime(new Date());
                         basicDownloadStatusEntity.setEndTime(new Date());
                         basicDownloadStatusEntity.setStatus(StatusEnum.SUCCESS.getCode());
+
+                        try {
+                            String fileFullPath = writeFile(filePrefix, NEW_ALL_ORDER, response.getData());
+                            basicDownloadStatusEntity.setCacheFilePath(fileFullPath);
+                        } catch (IOException e) {
+                            throw new RuntimeException(e);
+                        }
+
                         basicDownloadService.updateDownloadStatus(basicDownloadStatusEntity);
 
 

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

@@ -28,6 +28,9 @@
             <if test="invCode != null and invCode != ''">
                 AND invCode = #{invCode}
             </if>
+            <if test="targetInvCode != null and targetInvCode != ''">
+                AND targetInvCode = #{targetInvCode}
+            </if>
             <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
                 AND date_format(createTime, '%Y-%m-%d') between date_format(#{startTime}, '%Y-%m-%d') and date_format(#{endTime}, '%Y-%m-%d')
             </if>