1.位置描述新增编辑导入时进行插入或者更新

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/EquipmentDetailController.java

@@ -107,15 +107,6 @@ public class EquipmentDetailController extends AbstractBaseController {
             throw new BadRequest("管理方式未输入");
         }
         EquipmentSpecific vo = equipmentDate.getEquipmentSpecific();
-
-//        int code = equipmentSpecificSerivce.count(new QueryWrapper<EquipmentSpecific>().eq("code", vo.getCode()));
-//        int iotCode = equipmentSpecificSerivce.count(new QueryWrapper<EquipmentSpecific>().eq("iot_code", vo.getIotCode()));
-//        if (code > 0){
-//            throw new BadRequest("设备编码重复");
-//        }
-//        if (iotCode > 0){
-//            throw new BadRequest("设备物联编码重复");
-//        }
         String sysCode = vo.getCode();
         if (StringUtils.isNotEmpty(sysCode) && StringUtils.isNotEmpty(sysCode.trim())){
             int code = equipmentSpecificSerivce.count(new QueryWrapper<EquipmentSpecific>().eq("code", sysCode.trim()));
@@ -238,6 +229,7 @@ public class EquipmentDetailController extends AbstractBaseController {
                 equipmentSpecific.setPosition(warehouseStructure.getFullName());
             }
         }
+        equipmentSpecific.getStockDetail().setDescription(equipmentDetail.getArea());
         equipmentSpecificSerivce.updateEquipmentSpecific(equipmentSpecific, getSelectedOrgInfo(), getUserInfo());
         // TODO 后续判断成功，执行同步
         // 编辑同步redis装备iotcode数据

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/EquipmentSpecificSerivceImpl.java

@@ -1216,6 +1216,7 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM
                 equipmentSpecific.getStockDetail().setEquipmentSpecificId(equipmentSpecific.getId());
                 equipmentSpecific.getStockDetail().setQrCode(qrCode);
                 equipmentSpecific.getStockDetail().setBatchNum(new SimpleDateFormat("yyyy-MM-dd").format(new Date()));
+                equipmentSpecific.getStockDetail().setDescription(equipmentDetail.getArea());
                 stockDetailService.save(equipmentSpecific.getStockDetail());
 
                 //4.3生成入库单
@@ -1301,9 +1302,9 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM
                         stockDetail.setUpdateDate(new Date());
                         stockDetail.setQrCode(list.get(i));
                         stockDetail.setEquipmentSpecificId(equipmentSpecifics.get(i).getId());
+                        stockDetail.setDescription(equipmentDetail.getArea());
                         stockDetails.add(stockDetail);
                         stockDetail.setBatchNum(new SimpleDateFormat("yyyy-MM-dd").format(new Date()));
-
                     }
                     stockDetailService.saveBatch(stockDetails);
                     //5.3生成入库单
@@ -1399,6 +1400,7 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM
                     equipmentSpecific.getStockDetail().setWarehouseId(equipmentSpecific.getStock().getWarehouseId());
                     equipmentSpecific.getStockDetail().setEquipmentSpecificId(equipmentSpecific.getId());
                     equipmentSpecific.getStockDetail().setBatchNum(new SimpleDateFormat("yyyy-MM-dd").format(new Date()));
+                    equipmentSpecific.getStockDetail().setDescription(equipmentDetail.getArea());
                     stockDetailService.save(equipmentSpecific.getStockDetail());
                     //生成入库单
                     StockBill stockBill = buildStockBills(equipmentSpecific, reginParams, agencyUserModel);

amos-boot-system-equip/src/main/resources/changelog/wl-3.0.1.xml

@@ -2330,5 +2330,17 @@
             SET eard.is_alarm = ( SELECT is_alarm FROM wl_equipment_index wei WHERE eard.index_id = wei.id );
         </sql>
     </changeSet>
-
+    <changeSet author="suhuiguang" id="1646103800910-2">
+        <comment>wl_stock_detail 更新区域描述 之前新增编辑未更新 alarm表使用到</comment>
+        <sql>
+            update wl_stock_detail
+            sd set sd.description =
+            (select
+            ed.area from wl_equipment_detail ed
+            where
+            ed.id = sd.equipment_detail_id and ed.area <![CDATA[<>]]>''
+            )
+            where sd.description is null;
+        </sql>
+    </changeSet>
 </databaseChangeLog>
\ No newline at end of file