|
|
|
@ -32,6 +32,7 @@ import java.nio.charset.StandardCharsets;
|
|
|
|
|
import java.text.ParseException;
|
|
|
|
|
import java.text.SimpleDateFormat;
|
|
|
|
|
import java.util.*;
|
|
|
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* Inventory
|
|
|
|
@ -823,12 +824,41 @@ public class YunguanInterfaceController {
|
|
|
|
|
QueryWrapper<BusinessOrderEntity> queryWrapper = new QueryWrapper<>();
|
|
|
|
|
queryWrapper.lambda().eq(BusinessOrderEntity::getCode,yunguanPurchaseOrderModel.getORD_NO());
|
|
|
|
|
BusinessOrderEntity businessOrderEntity = businessOrderService.getOne(queryWrapper);
|
|
|
|
|
if (ObjectUtil.isNotEmpty(businessOrderEntity)){
|
|
|
|
|
if (ObjectUtil.isNotEmpty(businessOrderEntity) && yunguanPurchaseOrderModel.getREAD_FLAG().equals("N")){
|
|
|
|
|
businessOrderEntity.setYunguanMark(yunguanPurchaseOrderModel.getREAD_FLAG());
|
|
|
|
|
businessOrderEntity.setYunguanTime(yunguanPurchaseOrderModel.getREAD_TIME());
|
|
|
|
|
businessOrderEntity.setYunguanMassage(yunguanPurchaseOrderModel.getERR_MESSAGE());
|
|
|
|
|
businessOrderService.updateById(businessOrderEntity);
|
|
|
|
|
}
|
|
|
|
|
//更新运管标志
|
|
|
|
|
String purchaseNo = yunguanPurchaseOrderModel.getORD_NO();
|
|
|
|
|
boolean inBoundNoExists = redisUtil.exists(purchaseNo);
|
|
|
|
|
if (inBoundNoExists){
|
|
|
|
|
QueryWrapper<BusinessOrderProductRelationalEntity> countQueryWrapper = new QueryWrapper<>();
|
|
|
|
|
countQueryWrapper.lambda().eq(BusinessOrderProductRelationalEntity::getBusinessOrderId,businessOrderEntity.getId());
|
|
|
|
|
countQueryWrapper.lambda().isNull(BusinessOrderProductRelationalEntity::getDeleteMark);
|
|
|
|
|
long count = businessOrderProductRelationalService.count(countQueryWrapper);
|
|
|
|
|
count++;
|
|
|
|
|
long size = redisUtil.getListSize(purchaseNo);
|
|
|
|
|
List<Object> objList = redisUtil.get(purchaseNo,0,size);
|
|
|
|
|
List<String> list = objList.stream().map(Object::toString).collect(Collectors.toList());
|
|
|
|
|
list.add(yunguanPurchaseOrderModel.getREAD_FLAG());
|
|
|
|
|
redisUtil.remove(purchaseNo);
|
|
|
|
|
redisUtil.insert(purchaseNo,list);
|
|
|
|
|
if (list.size() == count){
|
|
|
|
|
boolean dis = list.stream().distinct().count() <= 1;
|
|
|
|
|
if (dis){
|
|
|
|
|
businessOrderEntity.setYunguanMark(yunguanPurchaseOrderModel.getREAD_FLAG());
|
|
|
|
|
businessOrderEntity.setYunguanTime(yunguanPurchaseOrderModel.getREAD_TIME());
|
|
|
|
|
businessOrderEntity.setYunguanMassage(yunguanPurchaseOrderModel.getERR_MESSAGE());
|
|
|
|
|
businessOrderService.updateById(businessOrderEntity);
|
|
|
|
|
}
|
|
|
|
|
redisUtil.remove(purchaseNo);
|
|
|
|
|
}
|
|
|
|
|
}else {
|
|
|
|
|
List<String> list = new ArrayList<>(Collections.singleton(yunguanPurchaseOrderModel.getREAD_FLAG()));
|
|
|
|
|
redisUtil.insert(purchaseNo, list);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
} else if (jsonObject.get("TYPE").equals("采购订单行")) {
|
|
|
|
|
YunguanPurchaseOrderProductModel yunguanPurchaseOrderProductModel = JsonUtil.getJsonToBean(str,YunguanPurchaseOrderProductModel.class);
|
|
|
|
@ -853,6 +883,35 @@ public class YunguanInterfaceController {
|
|
|
|
|
businessOrderEntity.setYunguanMassage(yunguanPurchaseOrderProductModel.getERR_MESSAGE());
|
|
|
|
|
businessOrderService.updateById(businessOrderEntity);
|
|
|
|
|
}
|
|
|
|
|
//更新运管标志
|
|
|
|
|
String purchaseNo = yunguanPurchaseOrderProductModel.getORD_NO();
|
|
|
|
|
boolean inBoundNoExists = redisUtil.exists(purchaseNo);
|
|
|
|
|
if (inBoundNoExists){
|
|
|
|
|
QueryWrapper<BusinessOrderProductRelationalEntity> countQueryWrapper = new QueryWrapper<>();
|
|
|
|
|
countQueryWrapper.lambda().eq(BusinessOrderProductRelationalEntity::getBusinessOrderId,businessOrderEntity.getId());
|
|
|
|
|
countQueryWrapper.lambda().isNull(BusinessOrderProductRelationalEntity::getDeleteMark);
|
|
|
|
|
long count = businessOrderProductRelationalService.count(countQueryWrapper);
|
|
|
|
|
count++;
|
|
|
|
|
long size = redisUtil.getListSize(purchaseNo);
|
|
|
|
|
List<Object> objList = redisUtil.get(purchaseNo,0,size);
|
|
|
|
|
List<String> list = objList.stream().map(Object::toString).collect(Collectors.toList());
|
|
|
|
|
list.add(yunguanPurchaseOrderProductModel.getREAD_FLAG());
|
|
|
|
|
redisUtil.remove(purchaseNo);
|
|
|
|
|
redisUtil.insert(purchaseNo,list);
|
|
|
|
|
if (list.size() == count){
|
|
|
|
|
boolean dis = list.stream().distinct().count() <= 1;
|
|
|
|
|
if (dis){
|
|
|
|
|
businessOrderEntity.setYunguanMark(yunguanPurchaseOrderProductModel.getREAD_FLAG());
|
|
|
|
|
businessOrderEntity.setYunguanTime(yunguanPurchaseOrderProductModel.getREAD_TIME());
|
|
|
|
|
businessOrderEntity.setYunguanMassage(yunguanPurchaseOrderProductModel.getERR_MESSAGE());
|
|
|
|
|
businessOrderService.updateById(businessOrderEntity);
|
|
|
|
|
}
|
|
|
|
|
redisUtil.remove(purchaseNo);
|
|
|
|
|
}
|
|
|
|
|
}else {
|
|
|
|
|
List<String> list = new ArrayList<>(Collections.singleton(yunguanPurchaseOrderProductModel.getREAD_FLAG()));
|
|
|
|
|
redisUtil.insert(purchaseNo, list);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
} else if (jsonObject.get("TYPE").equals("销售订单头")) {
|
|
|
|
@ -861,12 +920,41 @@ public class YunguanInterfaceController {
|
|
|
|
|
QueryWrapper<BusinessOrderEntity> queryWrapper = new QueryWrapper<>();
|
|
|
|
|
queryWrapper.lambda().eq(BusinessOrderEntity::getCode,yunguanSaleOrderModel.getORD_NO());
|
|
|
|
|
BusinessOrderEntity businessOrderEntity = businessOrderService.getOne(queryWrapper);
|
|
|
|
|
if (ObjectUtil.isNotEmpty(businessOrderEntity)){
|
|
|
|
|
if (ObjectUtil.isNotEmpty(businessOrderEntity) && yunguanSaleOrderModel.getREAD_FLAG().equals("N")){
|
|
|
|
|
businessOrderEntity.setYunguanMark(yunguanSaleOrderModel.getREAD_FLAG());
|
|
|
|
|
businessOrderEntity.setYunguanTime(yunguanSaleOrderModel.getREAD_TIME());
|
|
|
|
|
businessOrderEntity.setYunguanMassage(yunguanSaleOrderModel.getERR_MESSAGE());
|
|
|
|
|
businessOrderService.updateById(businessOrderEntity);
|
|
|
|
|
}
|
|
|
|
|
//更新运管标志
|
|
|
|
|
String saleNo = yunguanSaleOrderModel.getORD_NO();
|
|
|
|
|
boolean inBoundNoExists = redisUtil.exists(saleNo);
|
|
|
|
|
if (inBoundNoExists){
|
|
|
|
|
QueryWrapper<BusinessOrderProductRelationalEntity> countQueryWrapper = new QueryWrapper<>();
|
|
|
|
|
countQueryWrapper.lambda().eq(BusinessOrderProductRelationalEntity::getBusinessOrderId,businessOrderEntity.getId());
|
|
|
|
|
countQueryWrapper.lambda().isNull(BusinessOrderProductRelationalEntity::getDeleteMark);
|
|
|
|
|
long count = businessOrderProductRelationalService.count(countQueryWrapper);
|
|
|
|
|
count++;
|
|
|
|
|
long size = redisUtil.getListSize(saleNo);
|
|
|
|
|
List<Object> objList = redisUtil.get(saleNo,0,size);
|
|
|
|
|
List<String> list = objList.stream().map(Object::toString).collect(Collectors.toList());
|
|
|
|
|
list.add(yunguanSaleOrderModel.getREAD_FLAG());
|
|
|
|
|
redisUtil.remove(saleNo);
|
|
|
|
|
redisUtil.insert(saleNo,list);
|
|
|
|
|
if (list.size() == count){
|
|
|
|
|
boolean dis = list.stream().distinct().count() <= 1;
|
|
|
|
|
if (dis){
|
|
|
|
|
businessOrderEntity.setYunguanMark(yunguanSaleOrderModel.getREAD_FLAG());
|
|
|
|
|
businessOrderEntity.setYunguanTime(yunguanSaleOrderModel.getREAD_TIME());
|
|
|
|
|
businessOrderEntity.setYunguanMassage(yunguanSaleOrderModel.getERR_MESSAGE());
|
|
|
|
|
businessOrderService.updateById(businessOrderEntity);
|
|
|
|
|
}
|
|
|
|
|
redisUtil.remove(saleNo);
|
|
|
|
|
}
|
|
|
|
|
}else {
|
|
|
|
|
List<String> list = new ArrayList<>(Collections.singleton(yunguanSaleOrderModel.getREAD_FLAG()));
|
|
|
|
|
redisUtil.insert(saleNo, list);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
} else if (jsonObject.get("TYPE").equals("销售订单行")) {
|
|
|
|
|
YunguanSaleOrderProductModel yunguanSaleOrderProductModel = JsonUtil.getJsonToBean(str,YunguanSaleOrderProductModel.class);
|
|
|
|
@ -891,6 +979,35 @@ public class YunguanInterfaceController {
|
|
|
|
|
businessOrderEntity.setYunguanMassage(yunguanSaleOrderProductModel.getERR_MESSAGE());
|
|
|
|
|
businessOrderService.updateById(businessOrderEntity);
|
|
|
|
|
}
|
|
|
|
|
//更新运管标志
|
|
|
|
|
String saleNo = yunguanSaleOrderProductModel.getORD_NO();
|
|
|
|
|
boolean inBoundNoExists = redisUtil.exists(saleNo);
|
|
|
|
|
if (inBoundNoExists){
|
|
|
|
|
QueryWrapper<BusinessOrderProductRelationalEntity> countQueryWrapper = new QueryWrapper<>();
|
|
|
|
|
countQueryWrapper.lambda().eq(BusinessOrderProductRelationalEntity::getBusinessOrderId,businessOrderEntity.getId());
|
|
|
|
|
countQueryWrapper.lambda().isNull(BusinessOrderProductRelationalEntity::getDeleteMark);
|
|
|
|
|
long count = businessOrderProductRelationalService.count(countQueryWrapper);
|
|
|
|
|
count++;
|
|
|
|
|
long size = redisUtil.getListSize(saleNo);
|
|
|
|
|
List<Object> objList = redisUtil.get(saleNo,0,size);
|
|
|
|
|
List<String> list = objList.stream().map(Object::toString).collect(Collectors.toList());
|
|
|
|
|
list.add(yunguanSaleOrderProductModel.getREAD_FLAG());
|
|
|
|
|
redisUtil.remove(saleNo);
|
|
|
|
|
redisUtil.insert(saleNo,list);
|
|
|
|
|
if (list.size() == count){
|
|
|
|
|
boolean dis = list.stream().distinct().count() <= 1;
|
|
|
|
|
if (dis){
|
|
|
|
|
businessOrderEntity.setYunguanMark(yunguanSaleOrderProductModel.getREAD_FLAG());
|
|
|
|
|
businessOrderEntity.setYunguanTime(yunguanSaleOrderProductModel.getREAD_TIME());
|
|
|
|
|
businessOrderEntity.setYunguanMassage(yunguanSaleOrderProductModel.getERR_MESSAGE());
|
|
|
|
|
businessOrderService.updateById(businessOrderEntity);
|
|
|
|
|
}
|
|
|
|
|
redisUtil.remove(saleNo);
|
|
|
|
|
}
|
|
|
|
|
}else {
|
|
|
|
|
List<String> list = new ArrayList<>(Collections.singleton(yunguanSaleOrderProductModel.getREAD_FLAG()));
|
|
|
|
|
redisUtil.insert(saleNo, list);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
} else if (jsonObject.get("TYPE").equals("采购入库")) {
|
|
|
|
@ -900,20 +1017,36 @@ public class YunguanInterfaceController {
|
|
|
|
|
warehousingStorageQueryWrapper.lambda().eq(WarehousingStorageEntity::getDocumentNo,yunguanPurchaseInBoundModel.getRECEIPT_NO());
|
|
|
|
|
WarehousingStorageEntity warehousingStorageEntity = warehousingStorageService.getOne(warehousingStorageQueryWrapper);
|
|
|
|
|
if (ObjectUtil.isNotEmpty(warehousingStorageEntity)){
|
|
|
|
|
QueryWrapper<WarehousingStorageProductEntity> warehousingStorageProductQueryWrapper = new QueryWrapper<>();
|
|
|
|
|
warehousingStorageProductQueryWrapper.lambda().eq(WarehousingStorageProductEntity::getWarehousingStorageId,warehousingStorageEntity.getId());
|
|
|
|
|
warehousingStorageProductQueryWrapper.lambda().eq(WarehousingStorageProductEntity::getOrdLn,yunguanPurchaseInBoundModel.getORD_LN().replaceFirst("^0*",""));
|
|
|
|
|
WarehousingStorageProductEntity warehousingStorageProductEntity = warehousingStorageProductService.getOne(warehousingStorageProductQueryWrapper);
|
|
|
|
|
if (ObjectUtil.isNotEmpty(warehousingStorageProductEntity)){
|
|
|
|
|
warehousingStorageProductEntity.setYunguanMark(yunguanPurchaseInBoundModel.getREAD_FLAG());
|
|
|
|
|
warehousingStorageProductEntity.setYunguanTime(yunguanPurchaseInBoundModel.getREAD_TIME());
|
|
|
|
|
warehousingStorageProductEntity.setYunguanMassage(yunguanPurchaseInBoundModel.getERR_MESSAGE());
|
|
|
|
|
warehousingStorageProductService.updateById(warehousingStorageProductEntity);
|
|
|
|
|
if (yunguanPurchaseInBoundModel.getREAD_FLAG().equals("N")){
|
|
|
|
|
warehousingStorageEntity.setYunguanMark(yunguanPurchaseInBoundModel.getREAD_FLAG());
|
|
|
|
|
warehousingStorageEntity.setYunguanTime(yunguanPurchaseInBoundModel.getREAD_TIME());
|
|
|
|
|
warehousingStorageEntity.setYunguanMassage(yunguanPurchaseInBoundModel.getERR_MESSAGE());
|
|
|
|
|
warehousingStorageService.updateById(warehousingStorageEntity);
|
|
|
|
|
}
|
|
|
|
|
//更新运管标志
|
|
|
|
|
String inBound = yunguanPurchaseInBoundModel.getRECEIPT_NO();
|
|
|
|
|
boolean inBoundNoExists = redisUtil.exists(inBound);
|
|
|
|
|
if (inBoundNoExists){
|
|
|
|
|
QueryWrapper<WarehousingStorageProductEntity> countQueryWrapper = new QueryWrapper<>();
|
|
|
|
|
countQueryWrapper.lambda().eq(WarehousingStorageProductEntity::getWarehousingStorageId,warehousingStorageEntity.getId());
|
|
|
|
|
countQueryWrapper.lambda().isNull(WarehousingStorageProductEntity::getDeleteMark);
|
|
|
|
|
long count = warehousingStorageProductService.count(countQueryWrapper); //入库单子表size
|
|
|
|
|
String s = redisUtil.getString(inBound).toString();
|
|
|
|
|
List<String> list = Arrays.asList(s.split(","));
|
|
|
|
|
long lenght = list.size();
|
|
|
|
|
if (lenght < count){
|
|
|
|
|
long size = redisUtil.getListSize(inBound);
|
|
|
|
|
List<Object> objList = redisUtil.get(inBound,0,size);
|
|
|
|
|
List<String> list = objList.stream().map(Object::toString).collect(Collectors.toList());
|
|
|
|
|
list.add(yunguanPurchaseInBoundModel.getREAD_FLAG());
|
|
|
|
|
redisUtil.remove(inBound);
|
|
|
|
|
redisUtil.insert(inBound,list);
|
|
|
|
|
}else if (lenght == count){
|
|
|
|
|
if (list.size() == count){
|
|
|
|
|
boolean dis = list.stream().distinct().count() <= 1;
|
|
|
|
|
if (dis){
|
|
|
|
|
warehousingStorageEntity.setYunguanMark(yunguanPurchaseInBoundModel.getREAD_FLAG());
|
|
|
|
@ -921,29 +1054,11 @@ public class YunguanInterfaceController {
|
|
|
|
|
warehousingStorageEntity.setYunguanMassage(yunguanPurchaseInBoundModel.getERR_MESSAGE());
|
|
|
|
|
warehousingStorageService.updateById(warehousingStorageEntity);
|
|
|
|
|
}
|
|
|
|
|
redisUtil.remove(inBound);
|
|
|
|
|
}
|
|
|
|
|
}else {
|
|
|
|
|
redisUtil.insert(inBound, yunguanPurchaseInBoundModel.getREAD_FLAG());
|
|
|
|
|
}
|
|
|
|
|
QueryWrapper<WarehousingStorageProductEntity> warehousingStorageProductQueryWrapper = new QueryWrapper<>();
|
|
|
|
|
warehousingStorageProductQueryWrapper.lambda().eq(WarehousingStorageProductEntity::getWarehousingStorageId,warehousingStorageEntity.getId());
|
|
|
|
|
warehousingStorageProductQueryWrapper.lambda().eq(WarehousingStorageProductEntity::getOrdLn,yunguanPurchaseInBoundModel.getORD_LN().replaceFirst("^0*",""));
|
|
|
|
|
WarehousingStorageProductEntity warehousingStorageProductEntity = warehousingStorageProductService.getOne(warehousingStorageProductQueryWrapper);
|
|
|
|
|
if (ObjectUtil.isNotEmpty(warehousingStorageProductEntity)){
|
|
|
|
|
warehousingStorageProductEntity.setYunguanMark(yunguanPurchaseInBoundModel.getREAD_FLAG());
|
|
|
|
|
warehousingStorageProductEntity.setYunguanTime(yunguanPurchaseInBoundModel.getREAD_TIME());
|
|
|
|
|
warehousingStorageProductEntity.setYunguanMassage(yunguanPurchaseInBoundModel.getERR_MESSAGE());
|
|
|
|
|
warehousingStorageProductService.updateById(warehousingStorageProductEntity);
|
|
|
|
|
if (StringUtils.isEmpty(warehousingStorageEntity.getYunguanMark())){
|
|
|
|
|
warehousingStorageEntity.setYunguanMark(yunguanPurchaseInBoundModel.getREAD_FLAG());
|
|
|
|
|
warehousingStorageEntity.setYunguanTime(yunguanPurchaseInBoundModel.getREAD_TIME());
|
|
|
|
|
warehousingStorageEntity.setYunguanMassage(yunguanPurchaseInBoundModel.getERR_MESSAGE());
|
|
|
|
|
warehousingStorageService.updateById(warehousingStorageEntity);
|
|
|
|
|
} else if (warehousingStorageEntity.getYunguanMark().equals("Y")) {
|
|
|
|
|
warehousingStorageEntity.setYunguanMark(yunguanPurchaseInBoundModel.getREAD_FLAG());
|
|
|
|
|
warehousingStorageEntity.setYunguanTime(yunguanPurchaseInBoundModel.getREAD_TIME());
|
|
|
|
|
warehousingStorageEntity.setYunguanMassage(yunguanPurchaseInBoundModel.getERR_MESSAGE());
|
|
|
|
|
warehousingStorageService.updateById(warehousingStorageEntity);
|
|
|
|
|
List<String> list = new ArrayList<>(Collections.singleton(yunguanPurchaseInBoundModel.getREAD_FLAG()));
|
|
|
|
|
redisUtil.insert(inBound, list);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
@ -964,17 +1079,40 @@ public class YunguanInterfaceController {
|
|
|
|
|
warehousingOutboundProductEntity.setYunguanTime(yunguanSaleOutBoundModel.getREAD_TIME());
|
|
|
|
|
warehousingOutboundProductEntity.setYunguanMassage(yunguanSaleOutBoundModel.getERR_MESSAGE());
|
|
|
|
|
warehousingOutboundProductService.updateById(warehousingOutboundProductEntity);
|
|
|
|
|
if (StringUtils.isEmpty(warehousingOutboundEntity.getYunguanMark())){
|
|
|
|
|
if (yunguanSaleOutBoundModel.getREAD_FLAG().equals("N")){
|
|
|
|
|
warehousingOutboundEntity.setYunguanMark(yunguanSaleOutBoundModel.getREAD_FLAG());
|
|
|
|
|
warehousingOutboundEntity.setYunguanTime(yunguanSaleOutBoundModel.getREAD_TIME());
|
|
|
|
|
warehousingOutboundEntity.setYunguanMassage(yunguanSaleOutBoundModel.getERR_MESSAGE());
|
|
|
|
|
warehousingOutboundService.updateById(warehousingOutboundEntity);
|
|
|
|
|
}else if(warehousingOutboundEntity.getYunguanMark().equals("Y")){
|
|
|
|
|
}
|
|
|
|
|
//更新运管标志
|
|
|
|
|
String outBound = yunguanSaleOutBoundModel.getPROD_ZL();
|
|
|
|
|
boolean inBoundNoExists = redisUtil.exists(outBound);
|
|
|
|
|
if (inBoundNoExists){
|
|
|
|
|
QueryWrapper<WarehousingOutboundProductEntity> countQueryWrapper = new QueryWrapper<>();
|
|
|
|
|
countQueryWrapper.lambda().eq(WarehousingOutboundProductEntity::getWarehousingOutboundId,warehousingOutboundEntity.getId());
|
|
|
|
|
countQueryWrapper.lambda().isNull(WarehousingOutboundProductEntity::getDeleteMark);
|
|
|
|
|
long count = warehousingOutboundProductService.count(countQueryWrapper); //入库单子表size
|
|
|
|
|
long size = redisUtil.getListSize(outBound);
|
|
|
|
|
List<Object> objList = redisUtil.get(outBound,0,size);
|
|
|
|
|
List<String> list = objList.stream().map(Object::toString).collect(Collectors.toList());
|
|
|
|
|
list.add(yunguanSaleOutBoundModel.getREAD_FLAG());
|
|
|
|
|
redisUtil.remove(outBound);
|
|
|
|
|
redisUtil.insert(outBound,list);
|
|
|
|
|
if (list.size() == count){
|
|
|
|
|
boolean dis = list.stream().distinct().count() <= 1;
|
|
|
|
|
if (dis){
|
|
|
|
|
warehousingOutboundEntity.setYunguanMark(yunguanSaleOutBoundModel.getREAD_FLAG());
|
|
|
|
|
warehousingOutboundEntity.setYunguanTime(yunguanSaleOutBoundModel.getREAD_TIME());
|
|
|
|
|
warehousingOutboundEntity.setYunguanMassage(yunguanSaleOutBoundModel.getERR_MESSAGE());
|
|
|
|
|
warehousingOutboundService.updateById(warehousingOutboundEntity);
|
|
|
|
|
}
|
|
|
|
|
redisUtil.remove(outBound);
|
|
|
|
|
}
|
|
|
|
|
}else {
|
|
|
|
|
List<String> list = new ArrayList<>(Collections.singleton(yunguanSaleOutBoundModel.getREAD_FLAG()));
|
|
|
|
|
redisUtil.insert(outBound, list);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
@ -984,12 +1122,41 @@ public class YunguanInterfaceController {
|
|
|
|
|
QueryWrapper<CwsettlementEntity> cwsettlementQueryWrapper = new QueryWrapper<>();
|
|
|
|
|
cwsettlementQueryWrapper.lambda().eq(CwsettlementEntity::getCode,yunguanPurchaseSettlementModel.getACCOUNT_NO());
|
|
|
|
|
CwsettlementEntity cwsettlementEntity = cwsettlementService.getOne(cwsettlementQueryWrapper);
|
|
|
|
|
if (ObjectUtil.isNotEmpty(cwsettlementEntity)){
|
|
|
|
|
if (ObjectUtil.isNotEmpty(cwsettlementEntity) && yunguanPurchaseSettlementModel.getREAD_FLAG().equals("N")){
|
|
|
|
|
cwsettlementEntity.setYunguanMark(yunguanPurchaseSettlementModel.getREAD_FLAG());
|
|
|
|
|
cwsettlementEntity.setYunguanTime(yunguanPurchaseSettlementModel.getREAD_TIME());
|
|
|
|
|
cwsettlementEntity.setYunguanMassage(yunguanPurchaseSettlementModel.getERR_MESSAGE());
|
|
|
|
|
cwsettlementService.updateById(cwsettlementEntity);
|
|
|
|
|
}
|
|
|
|
|
//更新运管标志
|
|
|
|
|
String purSettlement = yunguanPurchaseSettlementModel.getACCOUNT_NO();
|
|
|
|
|
boolean inBoundNoExists = redisUtil.exists(purSettlement);
|
|
|
|
|
if (inBoundNoExists){
|
|
|
|
|
QueryWrapper<CwsettlementsummaryEntity> countQueryWrapper = new QueryWrapper<>();
|
|
|
|
|
countQueryWrapper.lambda().eq(CwsettlementsummaryEntity::getSettlementId,cwsettlementEntity.getId());
|
|
|
|
|
countQueryWrapper.lambda().isNull(CwsettlementsummaryEntity::getDeleteMark);
|
|
|
|
|
long count = cwsettlementsummaryService.count(countQueryWrapper);
|
|
|
|
|
count++;
|
|
|
|
|
long size = redisUtil.getListSize(purSettlement);
|
|
|
|
|
List<Object> objList = redisUtil.get(purSettlement,0,size);
|
|
|
|
|
List<String> list = objList.stream().map(Object::toString).collect(Collectors.toList());
|
|
|
|
|
list.add(yunguanPurchaseSettlementModel.getREAD_FLAG());
|
|
|
|
|
redisUtil.remove(purSettlement);
|
|
|
|
|
redisUtil.insert(purSettlement,list);
|
|
|
|
|
if (list.size() == count){
|
|
|
|
|
boolean dis = list.stream().distinct().count() <= 1;
|
|
|
|
|
if (dis){
|
|
|
|
|
cwsettlementEntity.setYunguanMark(yunguanPurchaseSettlementModel.getREAD_FLAG());
|
|
|
|
|
cwsettlementEntity.setYunguanTime(yunguanPurchaseSettlementModel.getREAD_TIME());
|
|
|
|
|
cwsettlementEntity.setYunguanMassage(yunguanPurchaseSettlementModel.getERR_MESSAGE());
|
|
|
|
|
cwsettlementService.updateById(cwsettlementEntity);
|
|
|
|
|
}
|
|
|
|
|
redisUtil.remove(purSettlement);
|
|
|
|
|
}
|
|
|
|
|
}else {
|
|
|
|
|
List<String> list = new ArrayList<>(Collections.singleton(yunguanPurchaseSettlementModel.getREAD_FLAG()));
|
|
|
|
|
redisUtil.insert(purSettlement, list);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
} else if (jsonObject.get("TYPE").equals("采购结算行")) {
|
|
|
|
|
YunguanPurchaseSettlementProductModel yunguanPurchaseSettlementProductModel = JsonUtil.getJsonToBean(str, YunguanPurchaseSettlementProductModel.class);
|
|
|
|
@ -1014,6 +1181,35 @@ public class YunguanInterfaceController {
|
|
|
|
|
cwsettlementEntity.setYunguanMassage(yunguanPurchaseSettlementProductModel.getERR_MESSAGE());
|
|
|
|
|
cwsettlementService.updateById(cwsettlementEntity);
|
|
|
|
|
}
|
|
|
|
|
//更新运管标志
|
|
|
|
|
String purSettlement = yunguanPurchaseSettlementProductModel.getACCOUNT_NO();
|
|
|
|
|
boolean inBoundNoExists = redisUtil.exists(purSettlement);
|
|
|
|
|
if (inBoundNoExists){
|
|
|
|
|
QueryWrapper<CwsettlementsummaryEntity> countQueryWrapper = new QueryWrapper<>();
|
|
|
|
|
countQueryWrapper.lambda().eq(CwsettlementsummaryEntity::getSettlementId,cwsettlementEntity.getId());
|
|
|
|
|
countQueryWrapper.lambda().isNull(CwsettlementsummaryEntity::getDeleteMark);
|
|
|
|
|
long count = cwsettlementsummaryService.count(countQueryWrapper);
|
|
|
|
|
count++;
|
|
|
|
|
long size = redisUtil.getListSize(purSettlement);
|
|
|
|
|
List<Object> objList = redisUtil.get(purSettlement,0,size);
|
|
|
|
|
List<String> list = objList.stream().map(Object::toString).collect(Collectors.toList());
|
|
|
|
|
list.add(yunguanPurchaseSettlementProductModel.getREAD_FLAG());
|
|
|
|
|
redisUtil.remove(purSettlement);
|
|
|
|
|
redisUtil.insert(purSettlement,list);
|
|
|
|
|
if (list.size() == count){
|
|
|
|
|
boolean dis = list.stream().distinct().count() <= 1;
|
|
|
|
|
if (dis){
|
|
|
|
|
cwsettlementEntity.setYunguanMark(yunguanPurchaseSettlementProductModel.getREAD_FLAG());
|
|
|
|
|
cwsettlementEntity.setYunguanTime(yunguanPurchaseSettlementProductModel.getREAD_TIME());
|
|
|
|
|
cwsettlementEntity.setYunguanMassage(yunguanPurchaseSettlementProductModel.getERR_MESSAGE());
|
|
|
|
|
cwsettlementService.updateById(cwsettlementEntity);
|
|
|
|
|
}
|
|
|
|
|
redisUtil.remove(purSettlement);
|
|
|
|
|
}
|
|
|
|
|
}else {
|
|
|
|
|
List<String> list = new ArrayList<>(Collections.singleton(yunguanPurchaseSettlementProductModel.getREAD_FLAG()));
|
|
|
|
|
redisUtil.insert(purSettlement, list);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
} else if (jsonObject.get("TYPE").equals("销售结算头")) {
|
|
|
|
@ -1022,12 +1218,41 @@ public class YunguanInterfaceController {
|
|
|
|
|
QueryWrapper<CwsettlementEntity> cwsettlementQueryWrapper = new QueryWrapper<>();
|
|
|
|
|
cwsettlementQueryWrapper.lambda().eq(CwsettlementEntity::getCode,yunguanSaleSettlementModel.getINVOICE_NO());
|
|
|
|
|
CwsettlementEntity cwsettlementEntity = cwsettlementService.getOne(cwsettlementQueryWrapper);
|
|
|
|
|
if (ObjectUtil.isNotEmpty(cwsettlementEntity)){
|
|
|
|
|
if (ObjectUtil.isNotEmpty(cwsettlementEntity) && yunguanSaleSettlementModel.getREAD_FLAG().equals("N")){
|
|
|
|
|
cwsettlementEntity.setYunguanMark(yunguanSaleSettlementModel.getREAD_FLAG());
|
|
|
|
|
cwsettlementEntity.setYunguanTime(yunguanSaleSettlementModel.getREAD_TIME());
|
|
|
|
|
cwsettlementEntity.setYunguanMassage(yunguanSaleSettlementModel.getERR_MESSAGE());
|
|
|
|
|
cwsettlementService.updateById(cwsettlementEntity);
|
|
|
|
|
}
|
|
|
|
|
//更新运管标志
|
|
|
|
|
String salSettlement = yunguanSaleSettlementModel.getINVOICE_NO();
|
|
|
|
|
boolean inBoundNoExists = redisUtil.exists(salSettlement);
|
|
|
|
|
if (inBoundNoExists){
|
|
|
|
|
QueryWrapper<CwsettlementsummaryEntity> countQueryWrapper = new QueryWrapper<>();
|
|
|
|
|
countQueryWrapper.lambda().eq(CwsettlementsummaryEntity::getSettlementId,cwsettlementEntity.getId());
|
|
|
|
|
countQueryWrapper.lambda().isNull(CwsettlementsummaryEntity::getDeleteMark);
|
|
|
|
|
long count = cwsettlementsummaryService.count(countQueryWrapper);
|
|
|
|
|
count++;
|
|
|
|
|
long size = redisUtil.getListSize(salSettlement);
|
|
|
|
|
List<Object> objList = redisUtil.get(salSettlement,0,size);
|
|
|
|
|
List<String> list = objList.stream().map(Object::toString).collect(Collectors.toList());
|
|
|
|
|
list.add(yunguanSaleSettlementModel.getREAD_FLAG());
|
|
|
|
|
redisUtil.remove(salSettlement);
|
|
|
|
|
redisUtil.insert(salSettlement,list);
|
|
|
|
|
if (list.size() == count){
|
|
|
|
|
boolean dis = list.stream().distinct().count() <= 1;
|
|
|
|
|
if (dis){
|
|
|
|
|
cwsettlementEntity.setYunguanMark(yunguanSaleSettlementModel.getREAD_FLAG());
|
|
|
|
|
cwsettlementEntity.setYunguanTime(yunguanSaleSettlementModel.getREAD_TIME());
|
|
|
|
|
cwsettlementEntity.setYunguanMassage(yunguanSaleSettlementModel.getERR_MESSAGE());
|
|
|
|
|
cwsettlementService.updateById(cwsettlementEntity);
|
|
|
|
|
}
|
|
|
|
|
redisUtil.remove(salSettlement);
|
|
|
|
|
}
|
|
|
|
|
}else {
|
|
|
|
|
List<String> list = new ArrayList<>(Collections.singleton(yunguanSaleSettlementModel.getREAD_FLAG()));
|
|
|
|
|
redisUtil.insert(salSettlement, list);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
} else if (jsonObject.get("TYPE").equals("销售结算行")) {
|
|
|
|
|
YunguanSaleSettlementProductModel yunguanSaleSettlementProductModel = JsonUtil.getJsonToBean(str, YunguanSaleSettlementProductModel.class);
|
|
|
|
@ -1055,6 +1280,35 @@ public class YunguanInterfaceController {
|
|
|
|
|
cwsettlementEntity.setYunguanMassage(yunguanSaleSettlementProductModel.getERR_MESSAGE());
|
|
|
|
|
cwsettlementService.updateById(cwsettlementEntity);
|
|
|
|
|
}
|
|
|
|
|
//更新运管标志
|
|
|
|
|
String salSettlement = yunguanSaleSettlementProductModel.getINVOICE_NO();
|
|
|
|
|
boolean inBoundNoExists = redisUtil.exists(salSettlement);
|
|
|
|
|
if (inBoundNoExists){
|
|
|
|
|
QueryWrapper<CwsettlementsummaryEntity> countQueryWrapper = new QueryWrapper<>();
|
|
|
|
|
countQueryWrapper.lambda().eq(CwsettlementsummaryEntity::getSettlementId,cwsettlementEntity.getId());
|
|
|
|
|
countQueryWrapper.lambda().isNull(CwsettlementsummaryEntity::getDeleteMark);
|
|
|
|
|
long count = cwsettlementsummaryService.count(countQueryWrapper);
|
|
|
|
|
count++;
|
|
|
|
|
long size = redisUtil.getListSize(salSettlement);
|
|
|
|
|
List<Object> objList = redisUtil.get(salSettlement,0,size);
|
|
|
|
|
List<String> list = objList.stream().map(Object::toString).collect(Collectors.toList());
|
|
|
|
|
list.add(yunguanSaleSettlementProductModel.getREAD_FLAG());
|
|
|
|
|
redisUtil.remove(salSettlement);
|
|
|
|
|
redisUtil.insert(salSettlement,list);
|
|
|
|
|
if (list.size() == count){
|
|
|
|
|
boolean dis = list.stream().distinct().count() <= 1;
|
|
|
|
|
if (dis){
|
|
|
|
|
cwsettlementEntity.setYunguanMark(yunguanSaleSettlementProductModel.getREAD_FLAG());
|
|
|
|
|
cwsettlementEntity.setYunguanTime(yunguanSaleSettlementProductModel.getREAD_TIME());
|
|
|
|
|
cwsettlementEntity.setYunguanMassage(yunguanSaleSettlementProductModel.getERR_MESSAGE());
|
|
|
|
|
cwsettlementService.updateById(cwsettlementEntity);
|
|
|
|
|
}
|
|
|
|
|
redisUtil.remove(salSettlement);
|
|
|
|
|
}
|
|
|
|
|
}else {
|
|
|
|
|
List<String> list = new ArrayList<>(Collections.singleton(yunguanSaleSettlementProductModel.getREAD_FLAG()));
|
|
|
|
|
redisUtil.insert(salSettlement, list);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
@ -1064,11 +1318,16 @@ public class YunguanInterfaceController {
|
|
|
|
|
QueryWrapper<WorkOrderEntity> workOrderQueryWrapper = new QueryWrapper<>();
|
|
|
|
|
workOrderQueryWrapper.lambda().eq(WorkOrderEntity::getCode,yunguanProductProcessModel.getTASK_NO());
|
|
|
|
|
WorkOrderEntity workOrderEntity = workOrderService.getOne(workOrderQueryWrapper);
|
|
|
|
|
QueryWrapper<WorkOrderPrimaryEntity> countPrimaryQueryWrapper = new QueryWrapper<>();
|
|
|
|
|
countPrimaryQueryWrapper.lambda().eq(WorkOrderPrimaryEntity::getWorkId,workOrderEntity.getId());
|
|
|
|
|
countPrimaryQueryWrapper.lambda().isNull(WorkOrderPrimaryEntity::getDeleteMark);
|
|
|
|
|
long countPrimary = workOrderPrimaryService.count(countPrimaryQueryWrapper);
|
|
|
|
|
QueryWrapper<WorkOrderProductEntity> countProductQueryWrapper = new QueryWrapper<>();
|
|
|
|
|
countProductQueryWrapper.lambda().eq(WorkOrderProductEntity::getWorkId,workOrderEntity.getId());
|
|
|
|
|
countProductQueryWrapper.lambda().isNull(WorkOrderProductEntity::getDeleteMark);
|
|
|
|
|
long countProduct = workOrderProductService.count(countProductQueryWrapper);
|
|
|
|
|
long count = countPrimary+countProduct;
|
|
|
|
|
if (ObjectUtil.isNotEmpty(workOrderEntity)){
|
|
|
|
|
// QueryWrapper<ProductWarehouseEntity> productQueryWrapper = new QueryWrapper<>();
|
|
|
|
|
// productQueryWrapper.lambda().eq(ProductWarehouseEntity::getCode,yunguanProductProcessModel.getITEM_CD());
|
|
|
|
|
// productQueryWrapper.lambda().isNull(ProductWarehouseEntity::getDeleteMark);
|
|
|
|
|
// ProductWarehouseEntity productWarehouseEntity = productWarehouseService.getOne(productQueryWrapper);
|
|
|
|
|
if (StringUtils.isNotEmpty(yunguanProductProcessModel.getPRD_TY()) && yunguanProductProcessModel.getPRD_TY().equals("投入")){
|
|
|
|
|
QueryWrapper<WorkOrderPrimaryEntity> workOrderPrimaryQueryWrapper = new QueryWrapper<>();
|
|
|
|
|
workOrderPrimaryQueryWrapper.lambda().eq(WorkOrderPrimaryEntity::getWorkId,workOrderEntity.getId());
|
|
|
|
@ -1079,11 +1338,37 @@ public class YunguanInterfaceController {
|
|
|
|
|
workOrderPrimaryEntity.setYunguanTime(yunguanProductProcessModel.getREAD_TIME());
|
|
|
|
|
workOrderPrimaryEntity.setYunguanMassage(yunguanProductProcessModel.getERR_MESSAGE());
|
|
|
|
|
workOrderPrimaryService.updateById(workOrderPrimaryEntity);
|
|
|
|
|
if (yunguanProductProcessModel.getREAD_FLAG().equals("N")) {
|
|
|
|
|
workOrderEntity.setYunguanMark(yunguanProductProcessModel.getREAD_FLAG());
|
|
|
|
|
workOrderEntity.setYunguanTime(yunguanProductProcessModel.getREAD_TIME());
|
|
|
|
|
workOrderEntity.setYunguanMassage(yunguanProductProcessModel.getERR_MESSAGE());
|
|
|
|
|
workOrderService.updateById(workOrderEntity);
|
|
|
|
|
}
|
|
|
|
|
//更新运管标志
|
|
|
|
|
String taskNo = yunguanProductProcessModel.getTASK_NO();
|
|
|
|
|
boolean inBoundNoExists = redisUtil.exists(taskNo);
|
|
|
|
|
if (inBoundNoExists){
|
|
|
|
|
long size = redisUtil.getListSize(taskNo);
|
|
|
|
|
List<Object> objList = redisUtil.get(taskNo,0,size);
|
|
|
|
|
List<String> list = objList.stream().map(Object::toString).collect(Collectors.toList());
|
|
|
|
|
list.add(yunguanProductProcessModel.getREAD_FLAG());
|
|
|
|
|
redisUtil.remove(taskNo);
|
|
|
|
|
redisUtil.insert(taskNo,list);
|
|
|
|
|
if (list.size() == count){
|
|
|
|
|
boolean dis = list.stream().distinct().count() <= 1;
|
|
|
|
|
if (dis){
|
|
|
|
|
workOrderEntity.setYunguanMark(yunguanProductProcessModel.getREAD_FLAG());
|
|
|
|
|
workOrderEntity.setYunguanTime(yunguanProductProcessModel.getREAD_TIME());
|
|
|
|
|
workOrderEntity.setYunguanMassage(yunguanProductProcessModel.getERR_MESSAGE());
|
|
|
|
|
workOrderService.updateById(workOrderEntity);
|
|
|
|
|
}
|
|
|
|
|
redisUtil.remove(taskNo);
|
|
|
|
|
}
|
|
|
|
|
}else {
|
|
|
|
|
List<String> list = new ArrayList<>(Collections.singleton(yunguanProductProcessModel.getREAD_FLAG()));
|
|
|
|
|
redisUtil.insert(taskNo, list);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
} else if (StringUtils.isNotEmpty(yunguanProductProcessModel.getPRD_TY()) && yunguanProductProcessModel.getPRD_TY().equals("产出")) {
|
|
|
|
|
QueryWrapper<WorkOrderProductEntity> workOrderProductQueryWrapper = new QueryWrapper<>();
|
|
|
|
|
workOrderProductQueryWrapper.lambda().eq(WorkOrderProductEntity::getWorkId,workOrderEntity.getId());
|
|
|
|
@ -1094,11 +1379,37 @@ public class YunguanInterfaceController {
|
|
|
|
|
workOrderProductEntity.setYunguanTime(yunguanProductProcessModel.getREAD_TIME());
|
|
|
|
|
workOrderProductEntity.setYunguanMassage(yunguanProductProcessModel.getERR_MESSAGE());
|
|
|
|
|
workOrderProductService.updateById(workOrderProductEntity);
|
|
|
|
|
if (yunguanProductProcessModel.getREAD_FLAG().equals("N")) {
|
|
|
|
|
workOrderEntity.setYunguanMark(yunguanProductProcessModel.getREAD_FLAG());
|
|
|
|
|
workOrderEntity.setYunguanTime(yunguanProductProcessModel.getREAD_TIME());
|
|
|
|
|
workOrderEntity.setYunguanMassage(yunguanProductProcessModel.getERR_MESSAGE());
|
|
|
|
|
workOrderService.updateById(workOrderEntity);
|
|
|
|
|
}
|
|
|
|
|
//更新运管标志
|
|
|
|
|
String taskNo = yunguanProductProcessModel.getTASK_NO();
|
|
|
|
|
boolean inBoundNoExists = redisUtil.exists(taskNo);
|
|
|
|
|
if (inBoundNoExists){
|
|
|
|
|
long size = redisUtil.getListSize(taskNo);
|
|
|
|
|
List<Object> objList = redisUtil.get(taskNo,0,size);
|
|
|
|
|
List<String> list = objList.stream().map(Object::toString).collect(Collectors.toList());
|
|
|
|
|
list.add(yunguanProductProcessModel.getREAD_FLAG());
|
|
|
|
|
redisUtil.remove(taskNo);
|
|
|
|
|
redisUtil.insert(taskNo,list);
|
|
|
|
|
if (list.size() == count){
|
|
|
|
|
boolean dis = list.stream().distinct().count() <= 1;
|
|
|
|
|
if (dis){
|
|
|
|
|
workOrderEntity.setYunguanMark(yunguanProductProcessModel.getREAD_FLAG());
|
|
|
|
|
workOrderEntity.setYunguanTime(yunguanProductProcessModel.getREAD_TIME());
|
|
|
|
|
workOrderEntity.setYunguanMassage(yunguanProductProcessModel.getERR_MESSAGE());
|
|
|
|
|
workOrderService.updateById(workOrderEntity);
|
|
|
|
|
}
|
|
|
|
|
redisUtil.remove(taskNo);
|
|
|
|
|
}
|
|
|
|
|
}else {
|
|
|
|
|
List<String> list = new ArrayList<>(Collections.singleton(yunguanProductProcessModel.getREAD_FLAG()));
|
|
|
|
|
redisUtil.insert(taskNo, list);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|