修改经度的字段名称

imcs-bt-be/imcs-business-biz/src/main/resources/mapper_business/base/productionresource/ProductionresourceMapper.xml

@@ -46,10 +46,10 @@
 
     <select id="pageList" resultMap="BaseResultMap">
         select
-        <include refid="Base_Column_List"/>, longtitude,latitude,areaIds,tenantDesc,pic, category,address
+        <include refid="Base_Column_List"/>, longitude,latitude,areaIds,tenantDesc,pic, category,address
         from (
         SELECT
-        a.*,b.label as lineDesc,v.longtitude,v.latitude,v.pic,v.category,v.tenantDesc,
+        a.*,b.label as lineDesc,v.longitude,v.latitude,v.pic,v.category,v.tenantDesc,
         v.areaIds,v.placeName,v.address from imcs_tenant_productionresource a
         left join c_core_org b on a.org_id = b.id
         left join view_productionresource v on a.id = v.id

imcs-bt-be/imcs-business-entity/src/main/java/com/github/zuihou/business/productionresource/dto/ProductionResourcePageDTO.java

@@ -186,4 +186,9 @@ public class ProductionResourcePageDTO implements Serializable {
     @ApiModelProperty(value = "区域地址")
     private String areaIds;
 
+    @ApiModelProperty(value = "经度")
+    private String longitude;
+
+    @ApiModelProperty(value = "纬度")
+    private String latitude;
 }

imcs-bt-be/imcs-business-entity/src/main/java/com/github/zuihou/business/productionresource/entity/ProductionResource.java

@@ -318,6 +318,14 @@ public class ProductionResource extends Entity<Long> {
     private String idBound;
 
 
+    @ApiModelProperty(value = "经度")
+    @TableField(exist = false)
+    private String longitude;
+
+    @ApiModelProperty(value = "纬度")
+    @TableField(exist = false)
+    private String latitude;
+
     @Builder
     public ProductionResource(Long id, LocalDateTime createTime, Long createUser, LocalDateTime updateTime, Long updateUser,
                               Long compnayId, String moduleId, String areaId, String name, String resourcesCategory,

imcs-bt-be/imcs-tenant-biz/src/main/resources/mapper_tenant/base/defaults/ProductionresourceMapper.xml

@@ -37,10 +37,10 @@
     <!-- 分页 -->
     <select id="pageList" resultMap="BaseResultMap">
         select
-        <include refid="Base_Column_List"/>, longtitude,latitude,areaIds
+        <include refid="Base_Column_List"/>, longitude,latitude,areaIds
         from (
             SELECT
-            a.*,b.label as lineDesc,c.name as moduleDesc,d.name as tenantDesc,c.pic,c.category,p.plc_lng as longtitude,p.plc_lat as latitude,
+            a.*,b.label as lineDesc,c.name as moduleDesc,d.name as tenantDesc,c.pic,c.category,p.plc_lng as longitude,p.plc_lat as latitude,
              concat_ws(',',p.plc_pid,p.plc_cid,p.plc_aid) as areaIds
             from imcs_tenant_productionresource a
             left join zuihou_base_bt_0000.c_core_org b on a.org_id = b.id

imcs-bt-be/imcs-tenant-biz/src/main/resources/mapper_tenant/base/defaults/ProductionresourceviewMapper.xml

@@ -27,7 +27,7 @@
             v.tenantDesc tenantDesc,
             v.create_time createTime,
             v.latitude latitude,
-            v.longtitude longtitude,
+            v.longitude longitude,
             v.placeName placeName,
             v.areaIds  areaIds,
             v.placeId  placeId,

imcs-bt-be/imcs-tenant-entity/src/main/java/com/github/zuihou/tenant/dto/ProductionresourcePageDTO.java

@@ -203,7 +203,7 @@ public class ProductionresourcePageDTO implements Serializable {
 
     @ApiModelProperty(value = "区域经度")
     @TableField(exist=false)
-    private String longtitude;
+    private String longitude;
 
     @ApiModelProperty(value = "区域纬度")
     @TableField(exist=false)

imcs-bt-be/imcs-tenant-entity/src/main/java/com/github/zuihou/tenant/entity/Productionresource.java

@@ -287,7 +287,7 @@ public class Productionresource extends Entity<Long> {
 
     @ApiModelProperty(value = "区域经度")
     @TableField(exist = false)
-    private String longtitude;
+    private String longitude;
 
     @ApiModelProperty(value = "区域纬度")
     @TableField(exist = false)

imcs-bt-fe/imcs-bt-fe/imcs-ui/src/views/zuihou/productionresource/components/Edit.vue

@@ -35,8 +35,8 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="经度坐标：" prop="longtitude">
-        <el-input disabled v-model="productionResource.longtitude" style="width: 93%;"/>
+      <el-form-item label="经度坐标：" prop="longitude">
+        <el-input disabled v-model="productionResource.longitude" style="width: 93%;"/>
       </el-form-item>
       <el-form-item label="纬度坐标：" prop="latitude">
         <el-input disabled v-model="productionResource.latitude" style="width: 93%;"/>
@@ -162,7 +162,7 @@ export default {
         port: '',
         areaIds: [],
         latitude: '',
-        longtitude: '',
+        longitude: '',
       };
     },
     initWidth() {
@@ -255,7 +255,7 @@ export default {
         let item = res.data.data[0];
         //this.productionResource.areaIds = [item.plcPid,item.plcCid, item.plcAid]
         this.productionResource.latitude = item.plcLat
-        this.productionResource.longtitude = item.plcLng
+        this.productionResource.longitude = item.plcLng
       })
     },
     save() {

imcs-bt-fe/imcs-bt-fe/imcs-ui/src/views/zuihou/productionresource/components/MaterialMgr.vue

@@ -268,7 +268,7 @@ export default {
         port: '',
         areaIds: [],
         latitude: '',
-        longtitude: '',
+        longitude: '',
       };
     },
 

imcs-bt-fe/imcs-bt-fe/imcs-ui/src/views/zuihou/productionresource/components/OrderMgr.vue

@@ -16,16 +16,7 @@
         <el-tab-pane name="allOrdersTab" :label="$t('btOrder.all')">
           <allOrdersTab ref="allOrdersTab" :resource-id="resourceId"></allOrdersTab>
         </el-tab-pane>
-        <!--      待生产-->
-        <!--<<<<<<< HEAD-->
-        <!--      <el-tab-pane name="toBeProduced" :label="$t('btOrder.toBeProduced')">-->
-        <!--        <toBeProducedTab ref="toBeProduced"></toBeProducedTab>-->
-        <!--      </el-tab-pane>-->
-        <!--      待取-->
-        <!--      <el-tab-pane name="toBeTaken" :label="$t('btOrder.toBeTaken')">-->
-        <!--        <toBeTakenTab ref="toBeProduced"></toBeTakenTab>-->
-        <!--      </el-tab-pane>-->
-        <!--=======-->
+        <!--      待生产-->        
         <!--      <el-tab-pane name="toBeProduced" :label="$t('btOrder.toBeProduced')">-->
         <!--        <toBeProducedTab ref="toBeProduced" :resource-id="resourceId"></toBeProducedTab>-->
         <!--      </el-tab-pane>-->
@@ -33,7 +24,7 @@
         <!--      <el-tab-pane name="toBeTaken" :label="$t('btOrder.toBeTaken')">-->
         <!--        <toBeTakenTab ref="toBeProduced" :resource-id="resourceId"></toBeTakenTab>-->
         <!--      </el-tab-pane>-->
-        <!--&gt;>>>>>> 9d69da426823d99ddb1d91e2dbfdd8a0ca5d49d9-->
+        <!-- -->
       </el-tabs>
     </div>
   </el-dialog>
@@ -112,9 +103,9 @@ export default {
         remark: '',
         ip: '',
         port: '',
-        areaIds: [],
-        latitude: '',
-        longtitude: '',
+        areaIds:[],
+        latitude:'',
+		    longitude:'',
       };
     },
     setTenant(val = {}) {

imcs-bt-fe/imcs-bt-fe/imcs-ui/src/views/zuihou/productionresource/components/addEquGoods.vue

@@ -234,7 +234,7 @@ export default {
         port: '',
         areaIds: [],
         latitude: '',
-        longtitude: '',
+        longitude: '',
       };
     },
     onSelectChange(selection) {