|
@@ -83,14 +83,11 @@ public class OldForNewUploadLogic {
|
|
|
@Autowired
|
|
|
YjhxAppraiseService yjhxAppraiseService;
|
|
|
|
|
|
-
|
|
|
-
|
|
|
private ObjectMapper mapper;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
-
|
|
|
public OldForNewUploadLogic() {
|
|
|
this.mapper = new ObjectMapper();
|
|
|
SimpleDateFormat smt = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
|
|
@@ -99,7 +96,7 @@ public class OldForNewUploadLogic {
|
|
|
}
|
|
|
|
|
|
|
|
|
- public String collection() {
|
|
|
+ public void collection() {
|
|
|
// 只有类型为35,36的工单需要同步回总部 自建以旧换新不需要传总部
|
|
|
// 提取待同步的以旧换新工单的签定单数据
|
|
|
List<OutJiasmToGreeUploadnotifylist> toGreeUploadList = outJiasmToGreeUploadnotifylistService.lambdaQuery()
|
|
@@ -111,6 +108,7 @@ public class OldForNewUploadLogic {
|
|
|
// 无数据不同步
|
|
|
if(CollectionUtils.isNotEmpty(toGreeUploadList)) {
|
|
|
LinkedHashSet<String> uploadOrderNos = new LinkedHashSet<>();
|
|
|
+
|
|
|
// 提取所有工单号
|
|
|
toGreeUploadList.stream().forEach(toGreeUpload->{
|
|
|
uploadOrderNos.add(toGreeUpload.getOrderNo());
|
|
@@ -134,6 +132,12 @@ public class OldForNewUploadLogic {
|
|
|
|
|
|
// 按单来处理 要有鉴定单
|
|
|
for(OutJiasmToGreeUploadnotifylist toGreeUpload : toGreeUploadList) {
|
|
|
+ // 查看该网点数据是否需要回传,不需要回传时直接修改同步状态将不再回传
|
|
|
+ // 工单号,名表,记录ID
|
|
|
+ if (publicService.checkWebsitSyncFlag(toGreeUpload.getOrderNo(),"out_jiasm_to_gree_uploadnotifylist",toGreeUpload.getSynReqId())){
|
|
|
+ continue;
|
|
|
+ }
|
|
|
+
|
|
|
// 存在鉴定单数据
|
|
|
if( !Objects.isNull(jddMap) && jddMap.containsKey(Integer.parseInt(toGreeUpload.getId()))) {
|
|
|
// 提取工单数据 目的看工单大类数据
|
|
@@ -198,7 +202,6 @@ public class OldForNewUploadLogic {
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
- return "";
|
|
|
}
|
|
|
|
|
|
private boolean setGreeImage(OrderBase orderBase, YjhxAppraise jdd) {
|
|
@@ -933,7 +936,6 @@ public class OldForNewUploadLogic {
|
|
|
getItfTblRecycleStockBarcodeInfoUploadWjtm(tradeNewForOldStockBarcodeInfoUploadList, yjhxJdd, order, product, websitSH, worderInfo, taskNo);
|
|
|
}
|
|
|
|
|
|
-
|
|
|
item.setSynStatus(Constant.SynStatus.SYN.getCode());
|
|
|
item.setSynTime(new Date());
|
|
|
}
|
|
@@ -1044,6 +1046,23 @@ public class OldForNewUploadLogic {
|
|
|
* 上传总部条码(需要上传了barcodeInfo主表数据,上传的stockin和stockout才有有效)
|
|
|
*/
|
|
|
public void stockBarcodeInfoUpload() {
|
|
|
+ // 查看该网点数据是否需要回传,不需要回传时直接修改同步状态将不再回传
|
|
|
+ List<ItfTblRecycleStockBarcodeInfoUpload> records = barcodeInfoUploadService.lambdaQuery()
|
|
|
+ .eq(ItfTblRecycleStockBarcodeInfoUpload::getSynStatus, Constant.SynStatus.UN_SYN.getCode()).list();
|
|
|
+ if(Collections.isEmpty(records)) {
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ for (ItfTblRecycleStockBarcodeInfoUpload item:records){
|
|
|
+ OrderBase order = orderBaseService.lambdaQuery()
|
|
|
+ .eq(OrderBase::getPgguid, item.getPgguid())
|
|
|
+ .last("limit 1")
|
|
|
+ .one();
|
|
|
+ // 工单号,名表,记录ID
|
|
|
+ publicService.checkWebsitSyncFlag(order.getId(),"itf_tbl_recycle_stock_barcode_info_upload",item.getSynReqId());
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
// 条码信息上传表中提取待同步的数据
|
|
|
final List<ItfTblRecycleStockBarcodeInfoUpload> barcodeInfoUploads = barcodeInfoUploadService.lambdaQuery()
|
|
|
.eq(ItfTblRecycleStockBarcodeInfoUpload::getSynStatus, Constant.SynStatus.UN_SYN.getCode()).list();
|
|
@@ -1064,6 +1083,10 @@ public class OldForNewUploadLogic {
|
|
|
String errMsg = "";
|
|
|
List<TradeNewForOldStockBarcodeInfoUploadBean> barcodeInfoBeanList = new ArrayList<>();
|
|
|
List<Map> infos = new ArrayList<>() ;
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
// 组装参数 infos
|
|
|
try {
|
|
|
barcodeInfoBeanList = this.mapper.readValue(this.mapper.writeValueAsString(barcodeInfoList), new TypeReference<List<TradeNewForOldStockBarcodeInfoUploadBean>>() {});
|