整体流程测试修改0401-1

shiyunteng

2025-04-01 ffbddedac17c4a7d18d382c4917b3f375356e061

 platformx-device-biz/src/main/java/com/by4cloud/platformx/device/service/impl/ReceivingNoteServiceImpl.java

@@ -69,19 +69,12 @@
         for (ReceivingNoteItem item:entity.getNoteItemList()
         ) {
            if (contractItem.getDeviceId().equals(item.getDeviceId())){
               if (contractItem.getNum()>=item.getNum()) {
               if (contractItem.getNum() < item.getNum()) {
                  return R.failed("验收明细中"+item.getDeviceName()+"设备数量不能超过合同明细中签订的设备数量");
               }
               //查询是否有历史验收
               QueryWrapper<ReceivingNoteItem> queryWrapperNoteItem = new QueryWrapper<>();
               queryWrapperNoteItem.eq("contract_id",contract.getId());
               queryWrapperNoteItem.eq("device_id",contractItem.getDeviceId());
               List<ReceivingNoteItem> noteItemList = itemMapper.selectList(queryWrapperNoteItem);
               if (noteItemList != null&&noteItemList.size()>0) {
                  Integer deviceNum = noteItemList.stream().mapToInt(ReceivingNoteItem::getNum).sum();
                  if (contractItem.getNum()>=(item.getNum()+deviceNum)) {
                     return R.failed("合同中"+item.getDeviceName()+"设备数量与实际验收明细中不一致");
                  }
               Integer deviceNum = itemMapper.selectDeviceNumByContractId(contractItem.getContractId(),item.getDeviceId());
               if (contractItem.getNum()<(deviceNum+item.getNum())){
                  return R.failed("实际验收明细中"+item.getDeviceName()+"设备数量不能超过合同明细中签订的设备数量");
               }
            }
            //设备序列号检查是否有相同的存在
@@ -156,17 +149,8 @@
      //合同明细中与实际验收对比
      for (ContractItem contractItem:list
      ) {
         //查询实际验收情况
         QueryWrapper<ReceivingNoteItem> queryWrapperNoteItem = new QueryWrapper<>();
         queryWrapperNoteItem.eq("contract_id",contract.getId());
         queryWrapperNoteItem.eq("device_id",contractItem.getDeviceId());
         List<ReceivingNoteItem> noteItemList = itemMapper.selectList(queryWrapperNoteItem);
         if (noteItemList != null&&noteItemList.size()>0) {
            Integer deviceNum = noteItemList.stream().mapToInt(ReceivingNoteItem::getNum).sum();
            if (contractItem.getNum()!=deviceNum) {
               return R.ok();
            }
         }else {
         Integer deviceNum = itemMapper.selectDeviceNumByContractId(contractItem.getContractId(),contractItem.getDeviceId());
         if (contractItem.getNum()!=deviceNum){
            return R.ok();
         }
      }
@@ -204,8 +188,8 @@
   }

   public static void main(String[] args) {
      Long l1= 1905442028714270722l;
      long l2 = 1905442028714270722l;
      System.out.println(l1==l2);
      int l1= 2;
      int l2 = 3;
      System.out.println(l1>=l2);
   }
}