From 1e20f9b6c5bc642f92f77388c5f339f05a3ae9be Mon Sep 17 00:00:00 2001
From: chengf <cgf12138@163.com>
Date: 星期五, 27 三月 2026 16:47:00 +0800
Subject: [PATCH] 采购导入需求
---
service-job/src/main/java/com/java110/job/importData/adapt/ImportRoomOwnerV2QueueDataAdapt.java | 3
service-store/src/main/java/com/java110/store/cmd/purchaseApply/ListPurchaseApplysCmd.java | 3
service-api/src/main/java/com/java110/api/importData/adapt/ImportRoomOwnerDataV2CleaningAdapt.java | 10 +-
service-api/src/main/java/com/java110/api/importData/adapt/ImportPropertyWhiteListfFlowAdapt.java | 2
service-job/src/main/java/com/java110/job/importData/adapt/ImportOwnerCarQueueV2DataAdapt.java | 5
java110-db/src/main/resources/mapper/store/PurchaseApplyServiceDaoImplMapper.xml | 93 +++++++++++++-----
service-job/src/main/java/com/java110/job/importData/adapt/ImportPurchaseApplyQueueDataAdapt.java | 154 ++++++++++++++++++------------
service-api/src/main/java/com/java110/api/importData/adapt/ImportPurchaseApplyCleaningAdapt.java | 8
springboot/src/main/resources/application.yml | 2
9 files changed, 177 insertions(+), 103 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/store/PurchaseApplyServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/store/PurchaseApplyServiceDaoImplMapper.xml
index a06a7e8..e1b1a8e 100755
--- a/java110-db/src/main/resources/mapper/store/PurchaseApplyServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/store/PurchaseApplyServiceDaoImplMapper.xml
@@ -234,16 +234,17 @@
t.end_user_tel,
t.end_user_name endUserName,
t.end_user_tel endUserTel,
- t.description,
t.create_user_id createUserId,
t.create_user_name createUserName,
t.warehousing_way warehousingWay,
t.community_id communityId
from purchase_apply t
- left join purchase_apply_detail de on t.apply_order_id = de.apply_order_id and de.status_cd = '0'
- left join resource_store rs on de.res_id = rs.res_id and rs.status_cd = '0'
- left join t_dict d on t.state = d.status_cd and d.table_name = 'purchase_apply' and d.table_columns = 'state'
+ left join t_dict d
+ on t.state = d.status_cd
+ and d.table_name = 'purchase_apply'
+ and d.table_columns = 'state'
where 1 = 1
+
<if test="resOrderType !=null and resOrderType != ''">
and t.res_order_type= #{resOrderType}
</if>
@@ -255,8 +256,7 @@
</if>
<if test="applyOrderIds !=null ">
and t.apply_order_id in
- <foreach open="(" close=")"
- separator="," collection="applyOrderIds" item="item">
+ <foreach open="(" close=")" separator="," collection="applyOrderIds" item="item">
#{item}
</foreach>
</if>
@@ -290,15 +290,38 @@
<if test="communityId !=null and communityId != ''">
and t.community_id= #{communityId}
</if>
+
+ -- 璧勬簮鍚嶇О鏌ヨ锛堝叧閿慨鏀癸級
<if test="resName !=null and resName != ''">
- and rs.res_name like '%${resName}%'
+ and exists (
+ select 1
+ from purchase_apply_detail de
+ inner join resource_store rs
+ on de.res_id = rs.res_id
+ and rs.status_cd = '0'
+ where de.apply_order_id = t.apply_order_id
+ and de.status_cd = '0'
+ and rs.res_name like concat('%',#{resName},'%')
+ )
</if>
+
+ -- 鏃犺祫婧愬悕绉版椂锛屼粎鍒ゆ柇瀛樺湪鏈夋晥鏄庣粏
+ <if test="resName ==null or resName == ''">
+ and exists (
+ select 1
+ from purchase_apply_detail de
+ where de.apply_order_id = t.apply_order_id
+ and de.status_cd = '0'
+ )
+ </if>
+
<if test="startTime !=null and startTime != ''">
- and t.create_time >= #{startTime}
+ and t.create_time >= #{startTime}
</if>
<if test="endTime !=null and endTime != ''">
and t.create_time <= #{endTime}
</if>
+
order by t.create_time desc
<if test="page != -1 and page != null ">
limit #{page}, #{row}
@@ -455,9 +478,12 @@
<select id="queryPurchaseApplysCount" parameterType="Map" resultType="Map">
select count(1) count
from purchase_apply t
- left join purchase_apply_detail de on t.apply_order_id = de.apply_order_id and de.status_cd = '0'
- left join resource_store rs on de.res_id = rs.res_id and rs.status_cd = '0'
+ left join t_dict d
+ on t.state = d.status_cd
+ and d.table_name = 'purchase_apply'
+ and d.table_columns = 'state'
where 1 = 1
+
<if test="resOrderType !=null and resOrderType != ''">
and t.res_order_type= #{resOrderType}
</if>
@@ -469,8 +495,7 @@
</if>
<if test="applyOrderIds !=null ">
and t.apply_order_id in
- <foreach open="(" close=")"
- separator="," collection="applyOrderIds" item="item">
+ <foreach open="(" close=")" separator="," collection="applyOrderIds" item="item">
#{item}
</foreach>
</if>
@@ -480,14 +505,8 @@
<if test="statusCd !=null and statusCd != ''">
and t.status_cd= #{statusCd}
</if>
- <if test="warehousingWay !=null and warehousingWay != ''">
- and t.warehousing_way= #{warehousingWay}
- </if>
<if test="state !=null and state != ''">
and t.state= #{state}
- </if>
- <if test="communityId !=null and communityId != ''">
- and t.community_id= #{communityId}
</if>
<if test="storeId !=null and storeId != ''">
and t.store_id= #{storeId}
@@ -501,27 +520,47 @@
<if test="endUserTel !=null and endUserTel != ''">
and t.end_user_tel= #{endUserTel}
</if>
- <if test="createUserId !=null and createUserId != ''">
- and t.create_user_id= #{createUserId}
- </if>
<if test="userId !=null and userId != ''">
and t.user_id= #{userId}
</if>
+ <if test="createUserId !=null and createUserId != ''">
+ and t.create_user_id= #{createUserId}
+ </if>
<if test="communityId !=null and communityId != ''">
- and t.community_id = #{communityId}
+ and t.community_id= #{communityId}
</if>
+
+ -- 璧勬簮鍚嶇О鏌ヨ锛堝叧閿慨鏀癸級
<if test="resName !=null and resName != ''">
- and rs.res_name like '%${resName}%'
+ and exists (
+ select 1
+ from purchase_apply_detail de
+ inner join resource_store rs
+ on de.res_id = rs.res_id
+ and rs.status_cd = '0'
+ where de.apply_order_id = t.apply_order_id
+ and de.status_cd = '0'
+ and rs.res_name like concat('%',#{resName},'%')
+ )
</if>
+
+ -- 鏃犺祫婧愬悕绉版椂锛屼粎鍒ゆ柇瀛樺湪鏈夋晥鏄庣粏
+ <if test="resName ==null or resName == ''">
+ and exists (
+ select 1
+ from purchase_apply_detail de
+ where de.apply_order_id = t.apply_order_id
+ and de.status_cd = '0'
+ )
+ </if>
+
<if test="startTime !=null and startTime != ''">
- and t.create_time >= #{startTime}
+ and t.create_time >= #{startTime}
</if>
<if test="endTime !=null and endTime != ''">
and t.create_time <= #{endTime}
</if>
- <if test='urgentFlag !=null and urgentFlag == "1"'>
- and date_format(t.create_time,'%Y-%m') = date_format(now(),'%Y-%m')
- </if>
+
</select>
<!-- 淇濆瓨閲囪喘鐢宠淇℃伅 add by wuxw 2018-07-03 -->
diff --git a/service-api/src/main/java/com/java110/api/importData/adapt/ImportPropertyWhiteListfFlowAdapt.java b/service-api/src/main/java/com/java110/api/importData/adapt/ImportPropertyWhiteListfFlowAdapt.java
index f48d8ec..c7a0be4 100644
--- a/service-api/src/main/java/com/java110/api/importData/adapt/ImportPropertyWhiteListfFlowAdapt.java
+++ b/service-api/src/main/java/com/java110/api/importData/adapt/ImportPropertyWhiteListfFlowAdapt.java
@@ -103,7 +103,7 @@
if (osIndex == 0) { // 绗竴琛屾槸 澶撮儴淇℃伅 鐩存帴璺宠繃
continue;
}
- if (StringUtil.isNullOrNone(os[3])) {
+ if (os == null || os.length < 4 || StringUtil.isNullOrNone(os[3])) {
continue;
}
Assert.hasValue(os[3], (osIndex + 1) + "琛屾敹璐规棩鏈熶笉鑳戒负绌�");
diff --git a/service-api/src/main/java/com/java110/api/importData/adapt/ImportPurchaseApplyCleaningAdapt.java b/service-api/src/main/java/com/java110/api/importData/adapt/ImportPurchaseApplyCleaningAdapt.java
index 6030d5d..c502861 100644
--- a/service-api/src/main/java/com/java110/api/importData/adapt/ImportPurchaseApplyCleaningAdapt.java
+++ b/service-api/src/main/java/com/java110/api/importData/adapt/ImportPurchaseApplyCleaningAdapt.java
@@ -53,10 +53,10 @@
}
Object[] os = new Object[190];
System.arraycopy(oList.get(osIndex), 0, os, 0, Math.min(oList.get(osIndex).length, 178));
- os[179] = result.getStoreId();
- os[180] = result.getUserId();
- os[181] = result.getUserName();
- os[182] = result.getCommunityId();
+ os[186] = result.getStoreId();
+ os[187] = result.getUserId();
+ os[188] = result.getUserName();
+ os[189] = result.getCommunityId();
purchaseApply.add(os);
}
}
diff --git a/service-api/src/main/java/com/java110/api/importData/adapt/ImportRoomOwnerDataV2CleaningAdapt.java b/service-api/src/main/java/com/java110/api/importData/adapt/ImportRoomOwnerDataV2CleaningAdapt.java
index 93bee0e..f52dc33 100644
--- a/service-api/src/main/java/com/java110/api/importData/adapt/ImportRoomOwnerDataV2CleaningAdapt.java
+++ b/service-api/src/main/java/com/java110/api/importData/adapt/ImportRoomOwnerDataV2CleaningAdapt.java
@@ -63,9 +63,9 @@
}
// Assert.hasValue(os[3], (osIndex + 1) + "琛岄」鐩紪鐮佷笉鑳戒负绌�");
Assert.hasValue("浣忓畢鐗╀笟璐� 瀵煎叆鏂版ā鏉夸腑" + os[5], (osIndex + 1) + "琛岃矾涓嶈兘涓虹┖");
-// Assert.hasValue("浣忓畢鐗╀笟璐� 瀵煎叆鏂版ā鏉夸腑" + os[7], (osIndex + 1) + "琛岄棬鍙蜂笉鑳戒负绌�");
-// Assert.hasValue("浣忓畢鐗╀笟璐� 瀵煎叆鏂版ā鏉夸腑" + os[8], (osIndex + 1) + "琛屽鍙蜂笉鑳戒负绌�");
-// Assert.hasValue(os[9], (osIndex + 1) + "琛岄棬瀹ゅ彿涓嶈兘涓虹┖");
+ Assert.hasValue("浣忓畢鐗╀笟璐� 瀵煎叆鏂版ā鏉夸腑" + os[5], (osIndex + 1) + "琛岃矾涓嶈兘涓虹┖");
+ Assert.hasValue("浣忓畢鐗╀笟璐� 瀵煎叆鏂版ā鏉夸腑" + os[7], (osIndex + 1) + "琛岄棬鍙蜂笉鑳戒负绌�");
+ Assert.hasValue("浣忓畢鐗╀笟璐� 瀵煎叆鏂版ā鏉夸腑" + os[8], (osIndex + 1) + "琛屽鍙蜂笉鑳戒负绌�");
Assert.hasValue("浣忓畢鐗╀笟璐� 瀵煎叆鏂版ā鏉夸腑" + os[10], (osIndex + 1) + "琛屼笟涓诲湴鍧�涓嶈兘涓虹┖");
Assert.hasValue("浣忓畢鐗╀笟璐� 瀵煎叆鏂版ā鏉夸腑" + os[16], (osIndex + 1) + "琛屼綇瀹呴潰绉笉鑳戒负绌�");
os[169] = result.getUserId();
@@ -87,8 +87,8 @@
System.arraycopy(oList.get(osIndex), 0, os, 0, oList.get(osIndex).length);
// Assert.hasValue(os[3], (osIndex + 1) + "琛岄」鐩紪鐮佷笉鑳戒负绌�");
Assert.hasValue("鍟嗛摵鐗╀笟璐� 瀵煎叆鏂版ā鏉夸腑" + os[5], (osIndex + 1) + "琛岃矾涓嶈兘涓虹┖");
-// Assert.hasValue("鍟嗛摵鐗╀笟璐� 瀵煎叆鏂版ā鏉夸腑" + os[7], (osIndex + 1) + "琛岄棬鍙蜂笉鑳戒负绌�");
-// Assert.hasValue("鍟嗛摵鐗╀笟璐� 瀵煎叆鏂版ā鏉夸腑" + os[8], (osIndex + 1) + "琛屽鍙蜂笉鑳戒负绌�");
+ Assert.hasValue("鍟嗛摵鐗╀笟璐� 瀵煎叆鏂版ā鏉夸腑" + os[7], (osIndex + 1) + "琛岄棬鍙蜂笉鑳戒负绌�");
+ Assert.hasValue("鍟嗛摵鐗╀笟璐� 瀵煎叆鏂版ā鏉夸腑" + os[8], (osIndex + 1) + "琛屽鍙蜂笉鑳戒负绌�");
// Assert.hasValue(os[9], (osIndex + 1) + "琛岄棬瀹ゅ彿涓嶈兘涓虹┖");
Assert.hasValue("鍟嗛摵鐗╀笟璐� 瀵煎叆鏂版ā鏉夸腑" + os[10], (osIndex + 1) + "琛屼笟涓诲湴鍧�涓嶈兘涓虹┖");
Assert.hasValue("鍟嗛摵鐗╀笟璐� 瀵煎叆鏂版ā鏉夸腑" + os[16], (osIndex + 1) + "琛屼綇瀹呴潰绉笉鑳戒负绌�");
diff --git a/service-job/src/main/java/com/java110/job/importData/adapt/ImportOwnerCarQueueV2DataAdapt.java b/service-job/src/main/java/com/java110/job/importData/adapt/ImportOwnerCarQueueV2DataAdapt.java
index d0831c0..d754a2b 100644
--- a/service-job/src/main/java/com/java110/job/importData/adapt/ImportOwnerCarQueueV2DataAdapt.java
+++ b/service-job/src/main/java/com/java110/job/importData/adapt/ImportOwnerCarQueueV2DataAdapt.java
@@ -643,7 +643,10 @@
feeDtos.removeIf(feeConfigDto1 -> !feeConfigDto1.getFeeTypeCd().equals(feeConfigDto.getFeeTypeCd()));
}
- if (feeDtos.size() > 1) {
+ if (feeDtos.isEmpty()) {
+ ownerCarPo.setRemark("鍗曚环`"+ownerCarPo.getUnitPricePerMonth()+"`鏈煡璇㈠埌鏀惰垂椤�");
+ }
+ else if (feeDtos.size() > 1) {
throw new IllegalArgumentException("绯荤粺閿欒锛屾煡璇㈠埌鐨勮垂鐢ㄩ」瓒呰繃涓�涓�");
}
}
diff --git a/service-job/src/main/java/com/java110/job/importData/adapt/ImportPurchaseApplyQueueDataAdapt.java b/service-job/src/main/java/com/java110/job/importData/adapt/ImportPurchaseApplyQueueDataAdapt.java
index 1ee1ff5..622f2f0 100644
--- a/service-job/src/main/java/com/java110/job/importData/adapt/ImportPurchaseApplyQueueDataAdapt.java
+++ b/service-job/src/main/java/com/java110/job/importData/adapt/ImportPurchaseApplyQueueDataAdapt.java
@@ -10,6 +10,7 @@
import com.java110.dto.log.AssetImportLogDetailDto;
import com.java110.dto.oweFeeCallable.OweFeeCallableDto;
import com.java110.dto.owner.OwnerDto;
+import com.java110.dto.resource.ResourceStoreDto;
import com.java110.dto.room.RoomDto;
import com.java110.fee.dao.IApplyRoomDiscountServiceDao;
import com.java110.intf.community.ICommunityInnerServiceSMO;
@@ -20,6 +21,7 @@
import com.java110.intf.fee.IOweFeeCallableV1InnerServiceSMO;
import com.java110.intf.fee.IPayFeeV1InnerServiceSMO;
import com.java110.intf.store.IPurchaseApplyInnerServiceSMO;
+import com.java110.intf.store.IResourceStoreInnerServiceSMO;
import com.java110.intf.user.IOwnerInnerServiceSMO;
import com.java110.intf.user.IOwnerV1InnerServiceSMO;
import com.java110.job.importData.DefaultImportData;
@@ -34,14 +36,12 @@
import com.java110.po.room.LitigationInfoPo;
import com.java110.po.room.PayeeReceiveInfoPo;
import com.java110.utils.util.BeanConvertUtil;
+import com.java110.utils.util.DateUtil;
import org.mybatis.spring.SqlSessionTemplate;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
import java.util.stream.Collectors;
/**
@@ -57,6 +57,9 @@
@Autowired
private IPurchaseApplyInnerServiceSMO purchaseApplyInnerServiceSMOImpl;
+
+ @Autowired
+ private IResourceStoreInnerServiceSMO resourceStoreInnerServiceSMOImpl;
@Override
public void importData(List<AssetImportLogDetailDto> assetImportLogDetailDtos) {
@@ -106,10 +109,10 @@
PurchaseApplyPo purchaseApplyPo = new PurchaseApplyPo();
purchaseApplyPo.setApplyDate(Vtil.defaultValue(os.get(2)));
purchaseApplyPo.setBId("-1");
- purchaseApplyPo.setStoreId(os.getString(179));
- purchaseApplyPo.setCreateUserId(os.getString(180));
- purchaseApplyPo.setCreateUserName(os.getString(181));
- purchaseApplyPo.setCommunityId(os.getString(182));
+ purchaseApplyPo.setStoreId(os.getString(186));
+ purchaseApplyPo.setCreateUserId(os.getString(187));
+ purchaseApplyPo.setCreateUserName(os.getString(188));
+ purchaseApplyPo.setCommunityId(os.getString(189));
purchaseApplyPo.setDescription("");
purchaseApplyPo.setResOrderType("10000");
purchaseApplyPo.setWarehousingWay("20000");
@@ -143,6 +146,15 @@
sqlSessionTemplate.insert("purchaseApplyItemServiceDaoImpl.savePurchaseApplyItemInfo", BeanConvertUtil.beanCovertMap(purchaseApplyItem));
List<PurchaseApplyAudit> purchaseApplyAudits = new ArrayList<>();
+
+
+
+
+
+
+
+
+
builderPurchaseApplyAudits(purchaseApplyAudits, purchaseApplyPo.getApplyOrderId(), os);
for(PurchaseApplyAudit purchaseApplyAudit : purchaseApplyAudits){
@@ -152,33 +164,44 @@
PurchaseApplyStock purchaseApplyStock = new PurchaseApplyStock();
purchaseApplyStock.setId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_orderId));
purchaseApplyStock.setApplyOrderId(purchaseApplyPo.getApplyOrderId());
- purchaseApplyStock.setPurchaseTimes(os.getString(44));
- purchaseApplyStock.setPurchaseQuantity(os.getString(45));
- purchaseApplyStock.setPurchasePrice(os.getString(46));
- purchaseApplyStock.setPurchaseAmount(os.getString(47));
- purchaseApplyStock.setTotalQuantityJohn(os.getString(48));
- purchaseApplyStock.setPayableAmountJohn(os.getString(49));
- purchaseApplyStock.setPaymentTimes(os.getString(51));
- purchaseApplyStock.setPaymentTotalAmount(os.getString(52));
- purchaseApplyStock.setUnpaidAmountJohn(os.getString(53));
- purchaseApplyStock.setUnhappenJohn(os.getString(54));
- purchaseApplyStock.setStockQuantity(os.getString(55));
- purchaseApplyStock.setUseQuantity(os.getString(56));
- purchaseApplyStock.setStockQuantity(os.getString(57));
- purchaseApplyStock.setPriceJohn(os.getString(58));
- purchaseApplyStock.setSurplusAmount(os.getString(59));
- purchaseApplyStock.setKeeperJohn(os.getString(60));
+ purchaseApplyStock.setPurchaseTimes(os.getString(47));
+ purchaseApplyStock.setPurchaseQuantity(os.getString(48));
+ purchaseApplyStock.setPurchasePrice(os.getString(49));
+ purchaseApplyStock.setPurchaseAmount(os.getString(50));
+ purchaseApplyStock.setTotalQuantityJohn(os.getString(51));
+ purchaseApplyStock.setPayableAmountJohn(os.getString(52));
+ purchaseApplyStock.setPaymentTimes(os.getString(53));
+ purchaseApplyStock.setPaymentTotalAmount(os.getString(54));
+ purchaseApplyStock.setUnpaidAmountJohn(os.getString(55));
+ purchaseApplyStock.setUnhappenJohn(os.getString(56));
+ purchaseApplyStock.setStockQuantity(os.getString(58));
+ purchaseApplyStock.setUseQuantity(os.getString(59));
+ purchaseApplyStock.setStockQuantity(os.getString(60));
+ purchaseApplyStock.setPriceJohn(os.getString(61));
+ purchaseApplyStock.setSurplusAmount(os.getString(62));
+ purchaseApplyStock.setKeeperJohn(os.getString(63));
sqlSessionTemplate.insert("purchaseApplyStockServiceDaoImpl.savePurchaseApplyStockInfo", BeanConvertUtil.beanCovertMap(purchaseApplyStock));
- ResourceStorePo resourceStorePo = new ResourceStorePo();
+ ResourceStoreDto resourceStoreDto = new ResourceStoreDto();
-// resourceStorePo.setResId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_resId));
-// resourceStorePo.setStoreId(os.getString(179));
-// resourceStorePo.set
-// resourceStorePo.setCommunityId(os.getString(182));
+ resourceStoreDto.setResId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_resId));
+ resourceStoreDto.setStoreId(os.getString(186));
+ resourceStoreDto.setResName(os.getString(15));
+ resourceStoreDto.setResCode("00");
+ resourceStoreDto.setPrice(Vtil.defaultValue(os.getString(18), "0"));
+ resourceStoreDto.setCommunityId(os.getString(189));
+ resourceStoreDto.setTripleWaybillNo(os.getString(10));
+ resourceStoreDto.setModel(os.getString(16));
+ resourceStoreDto.setStock(os.getString(23));
+ resourceStoreDto.setIsFixed("N");
+ resourceStoreDto.setUnitCode(Vtil.defaultValue(os.getString(17), "绌�"));
+ resourceStoreDto.setCreateTime(new Date());
+
+ resourceStoreInnerServiceSMOImpl.saveResourceStore(resourceStoreDto);
+
List<PurchaseApplyDetailPo> purchaseApplyDetailPos = new ArrayList<>();
- builderPurchaseApplyDetailPos(purchaseApplyDetailPos, purchaseApplyPo.getApplyOrderId(), os);
+ builderPurchaseApplyDetailPos(purchaseApplyDetailPos, purchaseApplyPo.getApplyOrderId(), os, resourceStoreDto.getResId());
purchaseApplyPo.setPurchaseApplyDetailPos(purchaseApplyDetailPos);
purchaseApplyInnerServiceSMOImpl.savePurchaseApply(purchaseApplyPo);
@@ -193,31 +216,31 @@
PurchaseReceive purchaseReceive = new PurchaseReceive();
purchaseReceive.setId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_orderId));
purchaseReceive.setApplyOrderId(purchaseApplyPo.getApplyOrderId());
- purchaseReceive.setReceiveQuantity(os.getString(157));
- purchaseReceive.setReceiveDate(os.getString(158));
- purchaseReceive.setReceiveAddress(os.getString(159));
- purchaseReceive.setSigner(os.getString(160));
- purchaseReceive.setStockInNo(os.getString(161));
- purchaseReceive.setStockInDate(os.getString(162));
- purchaseReceive.setStockOutNo(os.getString(163));
- purchaseReceive.setStockOutDate(os.getString(164));
+ purchaseReceive.setReceiveQuantity(os.getString(161));
+ purchaseReceive.setReceiveDate(os.getString(162));
+ purchaseReceive.setReceiveAddress(os.getString(163));
+ purchaseReceive.setSigner(os.getString(164));
+ purchaseReceive.setStockInNo(os.getString(165));
+ purchaseReceive.setStockInDate(os.getString(166));
+ purchaseReceive.setStockOutNo(os.getString(167));
+ purchaseReceive.setStockOutDate(os.getString(168));
sqlSessionTemplate.insert("purchaseReceiveServiceDaoImpl.savePurchaseReceiveInfo", BeanConvertUtil.beanCovertMap(purchaseReceive));
PurchaseReturnRecord purchaseReturnRecord = new PurchaseReturnRecord();
purchaseReturnRecord.setId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_orderId));
purchaseReturnRecord.setOrderId(purchaseApplyPo.getApplyOrderId());
- purchaseReturnRecord.setReturnDate(os.getString(165));
- purchaseReturnRecord.setReturnQuantity(os.getString(166));
- purchaseReturnRecord.setReturnPerson(os.getString(167));
- purchaseReturnRecord.setApprover(os.getString(168));
- purchaseReturnRecord.setReturnPrice(os.getString(169));
- purchaseReturnRecord.setReturnTotalPrice(os.getString(170));
- purchaseReturnRecord.setSupplierName(os.getString(171));
- purchaseReturnRecord.setReturnStockInNo(os.getString(172));
- purchaseReturnRecord.setReturnStockInDate(os.getString(173));
- purchaseReturnRecord.setReturnStockOutNo(os.getString(174));
- purchaseReturnRecord.setReturnDirection(os.getString(175));
+ purchaseReturnRecord.setReturnDate(os.getString(168));
+ purchaseReturnRecord.setReturnQuantity(os.getString(169));
+ purchaseReturnRecord.setReturnPerson(os.getString(170));
+ purchaseReturnRecord.setApprover(os.getString(171));
+ purchaseReturnRecord.setReturnPrice(os.getString(172));
+ purchaseReturnRecord.setReturnTotalPrice(os.getString(173));
+ purchaseReturnRecord.setSupplierName(os.getString(174));
+ purchaseReturnRecord.setReturnStockInNo(os.getString(175));
+ purchaseReturnRecord.setReturnStockInDate(os.getString(176));
+ purchaseReturnRecord.setReturnStockOutNo(os.getString(177));
+ purchaseReturnRecord.setReturnDirection(os.getString(178));
sqlSessionTemplate.insert("purchaseReturnRecordServiceDaoImpl.insertPurchaseReturnRecord", BeanConvertUtil.beanCovertMap(purchaseReturnRecord));
@@ -225,7 +248,7 @@
}
private void builderPurchasePayment(List<PurchasePayment> purchasePayments, String applyOrderId, JSONArray os) {
- for (int i = 97; i <= 97 + 12 * 4; i += 12) {
+ for (int i = 100; i <= 100 + 12 * 4; i += 12) {
PurchasePayment purchasePayment = new PurchasePayment();
purchasePayment.setId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_orderId));
purchasePayment.setApplyOrderId(applyOrderId);
@@ -246,12 +269,12 @@
}
}
- private void builderPurchaseApplyDetailPos(List<PurchaseApplyDetailPo> purchaseApplyAudits, String applyOrderId, JSONArray os) {
- for (int i = 61; i <= 61 + 9 * 4; i += 9) {
+ private void builderPurchaseApplyDetailPos(List<PurchaseApplyDetailPo> purchaseApplyAudits, String applyOrderId, JSONArray os, String resId) {
+ for (int i = 64; i <= 64 + 9 * 4; i += 9) {
PurchaseApplyDetailPo purchaseApplyDetailPo = new PurchaseApplyDetailPo();
purchaseApplyDetailPo.setId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_orderId));
purchaseApplyDetailPo.setApplyOrderId(applyOrderId);
- purchaseApplyDetailPo.setResId(os.getString(15));//TODO 娣诲姞鐗╁搧
+ purchaseApplyDetailPo.setResId(resId);//TODO 娣诲姞鐗╁搧
purchaseApplyDetailPo.setPurchaseDate(os.getString(i));
purchaseApplyDetailPo.setQuantity(os.getString(i + 1));
purchaseApplyDetailPo.setPrice(os.getString(i + 2));
@@ -278,6 +301,7 @@
purchaseApplyAudit.setModel(os.getString(30));
purchaseApplyAudit.setAuditDept(os.getString(31));
purchaseApplyAudit.setAuditor(os.getString(32));
+ purchaseApplyAudit.setAuditEndTime(os.getString(33));
purchaseApplyAudits.add(purchaseApplyAudit);
}
@@ -287,13 +311,14 @@
purchaseApplyAudit.setId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_orderId));
purchaseApplyAudit.setAuditType("璐㈠姟閮ㄥ鏍�");
purchaseApplyAudit.setApplyOrderId(applyOrderId);
- purchaseApplyAudit.setAuditDate(os.getString(33));
- purchaseApplyAudit.setOperator(os.getString(34));
- purchaseApplyAudit.setAuditDate(os.getString(35));
- purchaseApplyAudit.setAuditDept(os.getString(36));
- purchaseApplyAudit.setAuditor(os.getString(37));
- purchaseApplyAudit.setAuditOpinion(os.getString(38));
- purchaseApplyAudit.setRemark(os.getString(39));
+ purchaseApplyAudit.setAuditDate(os.getString(34));
+ purchaseApplyAudit.setOperator(os.getString(35));
+ purchaseApplyAudit.setAuditDate(os.getString(36));
+ purchaseApplyAudit.setAuditDept(os.getString(37));
+ purchaseApplyAudit.setAuditor(os.getString(38));
+ purchaseApplyAudit.setAuditOpinion(os.getString(39));
+ purchaseApplyAudit.setRemark(os.getString(40));
+ purchaseApplyAudit.setAuditEndTime(os.getString(41));
purchaseApplyAudits.add(purchaseApplyAudit);
}
@@ -301,10 +326,11 @@
purchaseApplyAudit.setId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_orderId));
purchaseApplyAudit.setAuditType("棰嗗瀹℃牳");
purchaseApplyAudit.setApplyOrderId(applyOrderId);
- purchaseApplyAudit.setAuditDate(os.getString(40));
- purchaseApplyAudit.setOperator(os.getString(41));
- purchaseApplyAudit.setAuditor(os.getString(42));
- purchaseApplyAudit.setRemark(os.getString(43));
+ purchaseApplyAudit.setAuditDate(os.getString(42));
+ purchaseApplyAudit.setOperator(os.getString(43));
+ purchaseApplyAudit.setAuditor(os.getString(44));
+ purchaseApplyAudit.setRemark(os.getString(45));
+ purchaseApplyAudit.setAuditEndTime(os.getString(46));
purchaseApplyAudits.add(purchaseApplyAudit);
}
}
diff --git a/service-job/src/main/java/com/java110/job/importData/adapt/ImportRoomOwnerV2QueueDataAdapt.java b/service-job/src/main/java/com/java110/job/importData/adapt/ImportRoomOwnerV2QueueDataAdapt.java
index b3dff87..65a2795 100644
--- a/service-job/src/main/java/com/java110/job/importData/adapt/ImportRoomOwnerV2QueueDataAdapt.java
+++ b/service-job/src/main/java/com/java110/job/importData/adapt/ImportRoomOwnerV2QueueDataAdapt.java
@@ -238,6 +238,9 @@
if (!importOwnerRoomDto.getCommunityId().isEmpty()){
FeeConfigDto feeConfigDto = new FeeConfigDto();
feeConfigDto.setCommunityId(importOwnerRoomDto.getCommunityId());
+ if (importOwnerRoomDto.getPropertyType() == null) {
+ throw new IllegalArgumentException("鐗╀笟绫诲瀷涓虹┖");
+ }
feeConfigDto.setSecondaryFeeTypeCdName(importOwnerRoomDto.getPropertyType());
feeDtos = feeConfigInnerServiceSMOImpl.queryFeeConfigs(feeConfigDto);
if (feeDtos.isEmpty()) {
diff --git a/service-store/src/main/java/com/java110/store/cmd/purchaseApply/ListPurchaseApplysCmd.java b/service-store/src/main/java/com/java110/store/cmd/purchaseApply/ListPurchaseApplysCmd.java
index 1702ae8..2f3ffb3 100644
--- a/service-store/src/main/java/com/java110/store/cmd/purchaseApply/ListPurchaseApplysCmd.java
+++ b/service-store/src/main/java/com/java110/store/cmd/purchaseApply/ListPurchaseApplysCmd.java
@@ -147,6 +147,9 @@
BigDecimal purchaseTotalPrice = new BigDecimal(0);
Integer cursor = 0;
for (PurchaseApplyDetailVo purchaseApplyDetailVo : applyDetailList) {
+ if (purchaseApplyDetailVo.getQuantity() == null) {
+ continue;
+ }
//todo 鏄惁鏄浐瀹氱墿鍝�
apiPurchaseApplyDataVo.setIsFixed(purchaseApplyDetailVo.getIsFixed());
diff --git a/springboot/src/main/resources/application.yml b/springboot/src/main/resources/application.yml
index 7aa80ae..d7d549c 100644
--- a/springboot/src/main/resources/application.yml
+++ b/springboot/src/main/resources/application.yml
@@ -1,6 +1,6 @@
spring:
profiles:
- active: debug
+ active: devlocal
import:
line:
--
Gitblit v1.8.0