巡检任务 设备维修新增是否生成工单

shiyunteng

6 天以前 fc8c86e7a365d5c6bdc37c2b05b9f83115ac2bc3

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

@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.by4cloud.platformx.common.core.util.R;
import com.by4cloud.platformx.device.constant.CommonStatusContant;
import com.by4cloud.platformx.device.constant.MaxSizeContant;
import com.by4cloud.platformx.device.dto.ReceivingNoteQueryDTO;
import com.by4cloud.platformx.device.entity.*;
@@ -57,24 +58,26 @@
      QueryWrapper<ContractItem> queryWrapper = new QueryWrapper<>();
      queryWrapper.eq("contract_id",contract.getId());
      List<ContractItem> list = contractItemMapper.selectList(queryWrapper);

      //比较设备种类是否一致
      if (list.size()!=entity.getNoteItemList().size()){
         return R.failed("合同中设备种类与验收明细中不一致");
      }

//
//      //比较设备种类是否一致
//      if (list.size()!=entity.getNoteItemList().size()){
//         return R.failed("合同中设备种类与验收明细中不一致");
//      }
//
      //比较单个设备台账数量是否与合同中一致
      for (ContractItem contractItem:list
      ) {
         for (ReceivingNoteItem item:entity.getNoteItemList()
         ) {
            if (contractItem.getDeviceId().equals(item.getDeviceId())){
               if (contractItem.getNum()!=item.getNum()) {
                  return R.failed("合同中"+item.getDeviceName()+"设备数量与验收明细中不一致");
               if (contractItem.getNum() < item.getNum()) {
                  return R.failed("验收明细中"+item.getDeviceName()+"设备数量不能超过合同明细中签订的设备数量");
               }

               Integer deviceNum = itemMapper.selectDeviceNumByContractId(contractItem.getContractId(),item.getDeviceId());
               if (contractItem.getNum()<(deviceNum+item.getNum())){
                  return R.failed("实际验收明细中"+item.getDeviceName()+"设备数量不能超过合同明细中签订的设备数量");
               }
            }

            //设备序列号检查是否有相同的存在
            List<String> serialArr = Arrays.stream(item.getSerialNos().split(",")).collect(Collectors.toList());
            for (String serialNo:serialArr
@@ -116,12 +119,12 @@
                     inventory.setName(device.getName());
                     inventory.setSerialNo(serialNo);
                     if (contract!=null&&(contract.getType()==1||contract.getType()==2)){
                        inventory.setSource(1);
                        inventory.setInventoryStatus(1);
                        inventory.setSource(CommonStatusContant.DEVICE_INVENTORY_RESOURCE_WAREHOUSE);
                        inventory.setInventoryStatus(CommonStatusContant.DEVICE_INVENTORY_USABLE);
                     }
                     if (contract!=null&&contract.getType()==0){
                        inventory.setSource(1);
                        inventory.setInventoryStatus(2);
                        inventory.setSource(CommonStatusContant.DEVICE_INVENTORY_RESOURCE_WAREHOUSE);
                        inventory.setInventoryStatus(CommonStatusContant.DEVICE_INVENTORY_RENTING);
                     }
                     inventoryMapper.insert(inventory);
                     //设备库存流水同步新增
@@ -134,7 +137,7 @@
                        flowWater.setOperateType(2);
                     }
                     if (contract!=null&&contract.getType()==0){
                        flowWater.setOperateType(1);
                        flowWater.setOperateType(CommonStatusContant.DEVICE_INVENTORY_FLOW_WATER_OUT);
                     }
                     inventoryFlowWaterMapper.insert(flowWater);
                  }
@@ -144,6 +147,14 @@
         }
      }

      //合同明细中与实际验收对比
      for (ContractItem contractItem:list
      ) {
         Integer deviceNum = itemMapper.selectDeviceNumByContractId(contractItem.getContractId(),contractItem.getDeviceId());
         if (contractItem.getNum()!=deviceNum){
            return R.ok();
         }
      }
      //更新合同状态为完成
      contract.setStatus(2);
      contractMapper.updateById(contract);
@@ -178,8 +189,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);
   }
}