feat(hjgl): 优化焊口查询并同步更新相关数据模型
为支持焊口查询页面和静态页的新展示与交互能力， 同步调整了材料匹配统计逻辑、数据模型映射及前端构建产物。 同时补充实名制服务和数据库脚本，保证接口、页面与数据结构保持一致。
This commit is contained in:
+2
-1
@@ -837,6 +837,7 @@
|
||||
<Compile Include="ZHGL\RealName\OnPostService.cs" />
|
||||
<Compile Include="ZHGL\RealName\RealNameMonitorService.cs" />
|
||||
<Compile Include="ZHGL\RealName\RealName_ProjectService.cs" />
|
||||
<Compile Include="ZHGL\RealName\SedinRealName.Service.cs" />
|
||||
<Compile Include="ZHGL\RealName\SynchroSetService.cs" />
|
||||
<Compile Include="ZHGL\Supervise\SubUnitCheckRectifyItemService.cs" />
|
||||
<Compile Include="ZHGL\Supervise\SubUnitCheckRectifyService.cs" />
|
||||
@@ -935,4 +936,4 @@
|
||||
<Target Name="AfterBuild">
|
||||
</Target>
|
||||
-->
|
||||
</Project>
|
||||
</Project>
|
||||
|
||||
@@ -27,42 +27,54 @@ namespace BLL
|
||||
NeedNum = g.Sum(x => x.Number) ?? 0,
|
||||
};
|
||||
///实际材料入库数量列表
|
||||
var RealInMateriaList = from x in db.Tw_InputDetail
|
||||
join master in db.Tw_InputMaster on x.InputMasterId equals master.Id
|
||||
join y in db.HJGL_MaterialCodeLib on x.MaterialCode equals y.MaterialCode
|
||||
where master.ProjectId == projectid && master.WarehouseCode == WarehouseCode
|
||||
group x by x.MaterialCode
|
||||
var RealInMateriaList = (from x in db.Tw_InputDetail
|
||||
join master in db.Tw_InputMaster on x.InputMasterId equals master.Id
|
||||
join y in db.HJGL_MaterialCodeLib on x.MaterialCode equals y.MaterialCode
|
||||
where master.ProjectId == projectid && master.WarehouseCode == WarehouseCode
|
||||
group x by x.MaterialCode
|
||||
into g
|
||||
where (string.IsNullOrEmpty(materialCode) || g.Key.Contains(materialCode))
|
||||
select new
|
||||
{
|
||||
g.Key,
|
||||
RealNum = g.Sum(x => x.ActNum) ?? 0,
|
||||
};
|
||||
where (string.IsNullOrEmpty(materialCode) || g.Key.Contains(materialCode))
|
||||
select new
|
||||
{
|
||||
g.Key,
|
||||
RealNum = g.Sum(x => x.ActNum) ?? 0,
|
||||
}).ToList();
|
||||
//库存数量
|
||||
var tw_MaterialStock = from x in db.Tw_MaterialStock
|
||||
where x.WarehouseCode == WarehouseCode && x.ProjectId == projectid
|
||||
select x;
|
||||
var tw_MaterialStock = (from x in db.Tw_MaterialStock
|
||||
where x.WarehouseCode == WarehouseCode && x.ProjectId == projectid
|
||||
select x).ToList();
|
||||
|
||||
var needMateriaList = NeedOutMateriaList.ToList();
|
||||
var materialCodeList = needMateriaList.Select(x => x.Key)
|
||||
.Union(RealInMateriaList.Select(x => x.Key))
|
||||
.Distinct()
|
||||
.ToList();
|
||||
|
||||
var StatisticsList = (from x in NeedOutMateriaList
|
||||
join y in RealInMateriaList on x.Key equals y.Key into gg
|
||||
from y in gg.DefaultIfEmpty()
|
||||
join z in db.HJGL_MaterialCodeLib on x.Key equals z.MaterialCode into zz
|
||||
from z in zz.DefaultIfEmpty()
|
||||
join m in tw_MaterialStock on x.Key equals m.PipeLineMatCode into mm
|
||||
from m in mm.DefaultIfEmpty()
|
||||
var materialInfoList = (from x in db.HJGL_MaterialCodeLib
|
||||
where materialCodeList.Contains(x.MaterialCode)
|
||||
select x).ToList();
|
||||
|
||||
var StatisticsList = (from code in materialCodeList
|
||||
join x in needMateriaList on code equals x.Key into needGroup
|
||||
from x in needGroup.DefaultIfEmpty()
|
||||
join y in RealInMateriaList on code equals y.Key into realGroup
|
||||
from y in realGroup.DefaultIfEmpty()
|
||||
join z in materialInfoList on code equals z.MaterialCode into infoGroup
|
||||
from z in infoGroup.DefaultIfEmpty()
|
||||
join m in tw_MaterialStock on code equals m.PipeLineMatCode into stockGroup
|
||||
from m in stockGroup.DefaultIfEmpty()
|
||||
orderby code
|
||||
select new Tw_ArrivalStatisticsOutPut
|
||||
{
|
||||
MaterialCode = x.Key,
|
||||
MaterialCode = code,
|
||||
StockNum = m == null ? 0 : (decimal)m.StockNum,
|
||||
NeedNum = x.NeedNum,
|
||||
NeedNum = x == null ? 0 : x.NeedNum,
|
||||
RealNum = y == null ? 0 : y.RealNum,
|
||||
MaterialName = z.MaterialName,
|
||||
MaterialSpec = z.MaterialSpec,
|
||||
MaterialUnit = z.MaterialUnit,
|
||||
MaterialDef = z.MaterialDef,
|
||||
MatchRate = (x.NeedNum == 0 ? 0 : Math.Round((y == null ? 0 : y.RealNum) / x.NeedNum, 4, MidpointRounding.ToEven)),
|
||||
MaterialName = z == null ? null : z.MaterialName,
|
||||
MaterialSpec = z == null ? null : z.MaterialSpec,
|
||||
MaterialUnit = z == null ? null : z.MaterialUnit,
|
||||
MaterialDef = z == null ? null : z.MaterialDef,
|
||||
MatchRate = (x == null || x.NeedNum == 0 ? 0 : Math.Round((y == null ? 0 : y.RealNum) / x.NeedNum, 4, MidpointRounding.ToEven)),
|
||||
}).ToList();
|
||||
foreach (var item in StatisticsList)
|
||||
{
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -125,8 +125,10 @@
|
||||
DataField="PipelineCode" SortField="PipelineCode" FieldType="String" HeaderTextAlign="Center"
|
||||
Width="150px">
|
||||
</f:RenderField>--%>
|
||||
|
||||
|
||||
<f:RenderField HeaderText="任务单编号" ColumnID="TaskCode" DataField="TaskCode"
|
||||
SortField="TaskCode" FieldType="String" HeaderTextAlign="Center" Width="100px">
|
||||
</f:RenderField>
|
||||
<f:RenderField HeaderText="材质1" ColumnID="Material1Code" DataField="Material1Code" SortField="Material1Code" FieldType="String" HeaderTextAlign="Center"
|
||||
TextAlign="Left" Width="90px">
|
||||
</f:RenderField>
|
||||
|
||||
@@ -597,6 +597,7 @@ namespace FineUIPro.Web.HJGL.InfoQuery
|
||||
完成状态 = x.IsWeldOK,
|
||||
单位名称 = x.UnitName,
|
||||
流水段 = x.FlowingSection,
|
||||
任务单编号 = x.TaskCode,
|
||||
材质1 = x.Material1Code,
|
||||
材质2 = x.Material2Code,
|
||||
达因 = x.Size,
|
||||
@@ -678,6 +679,7 @@ namespace FineUIPro.Web.HJGL.InfoQuery
|
||||
完成状态 = x.IsWeldOK,
|
||||
单位名称 = x.UnitName,
|
||||
流水段 = x.FlowingSection,
|
||||
任务单编号 = x.TaskCode,
|
||||
材质1 = x.Material1Code,
|
||||
材质2 = x.Material2Code,
|
||||
达因 = x.Size,
|
||||
|
||||
File diff suppressed because one or more lines are too long
@@ -0,0 +1 @@
|
||||
.wrap[data-v-27b9583d]{padding-bottom:1.875rem}
|
||||
@@ -0,0 +1 @@
|
||||
.wrap[data-v-099af148]{padding-bottom:1.875rem}
|
||||
File diff suppressed because one or more lines are too long
@@ -0,0 +1 @@
|
||||
.wrap[data-v-f24308e9]{padding-bottom:1.875rem}
|
||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@@ -0,0 +1 @@
|
||||
import{h as e,s as l,a,_ as t,r as o,o as r,b as u,c as i,d as n,w as s,e as d,f as m,i as v,g as f,j as c}from"./index-BCk3NlG9.js";const p={baseURL:"https://sggl.sedin.com.cn/sgglapi/api/",validateStatus:e=>e>=200&&e<300};e.setConfig((e=>p)),e.interceptors.request.use((e=>(e.data=e.data||{},l(),e.header.token="AF17168B-87BD-4GLY-1111-F0A0A1158F9B",e)),(e=>Promise.reject(e))),e.interceptors.response.use((e=>{a();return e.data||{}}),(e=>Promise.reject(e)));const g=t({__name:"index",setup(l){const a=o({form:{}});return r((l=>{var t;console.log(l),t=null==l?void 0:l.id,e.get(`PipeJoint/getWeldJointByWeldJointId?WeldJointId=${t}`).then((e=>{console.log(e),a.form=e.data,a.form.CoverWelderName&&(a.form.welderName=a.form.CoverWelderName),a.form.BackingWelderName&&(a.form.welderName+="/"+a.form.BackingWelderName)}))})),(e,l)=>{const t=u(i("up-cell"),d),o=u(i("up-cell-group"),m),r=v;return f(),n(r,{class:"wrap"},{default:s((()=>[c(o,null,{default:s((()=>[c(t,{title:"管线",value:a.form.PipelineCode},null,8,["value"]),c(t,{title:"焊口",value:a.form.WeldJointCode},null,8,["value"]),c(t,{title:"焊接日期",value:a.form.WeldingDate},null,8,["value"]),c(t,{title:"材质一",value:a.form.Material1Code},null,8,["value"]),c(t,{title:"材质二",value:a.form.Material2Code},null,8,["value"]),c(t,{title:"达因",value:a.form.Size},null,8,["value"]),c(t,{title:"外径",value:a.form.Dia},null,8,["value"]),c(t,{title:"DN公称直径",value:a.form.DNDia},null,8,["value"]),c(t,{title:"壁厚",value:a.form.Thickness},null,8,["value"]),c(t,{title:"规格",value:a.form.Specification},null,8,["value"]),c(t,{title:"焊缝类型",value:a.form.WeldTypeCode},null,8,["value"]),c(t,{title:"焊接位置",value:a.form.WeldingLocationCode},null,8,["value"]),c(t,{title:"打底焊工",value:a.form.BackingWelderName},null,8,["value"]),c(t,{title:"盖面焊工",value:a.form.CoverWelderName},null,8,["value"])])),_:1})])),_:1})}}},[["__scopeId","data-v-099af148"]]);export{g as default};
|
||||
@@ -0,0 +1 @@
|
||||
import{h as e,s as l,a,_ as t,r as o,o as r,b as u,c as i,d as n,w as s,e as d,f as m,i as v,g as f,j as c}from"./index-Bvn6qVoR.js";const p={baseURL:"https://sggl.sedin.com.cn/sgglapi/api/",validateStatus:e=>e>=200&&e<300};e.setConfig((e=>p)),e.interceptors.request.use((e=>(e.data=e.data||{},l(),e.header.token="AF17168B-87BD-4GLY-1111-F0A0A1158F9B",e)),(e=>Promise.reject(e))),e.interceptors.response.use((e=>{a();return e.data||{}}),(e=>Promise.reject(e)));const g=t({__name:"index",setup(l){const a=o({form:{}});return r((l=>{var t;console.log(l),t=null==l?void 0:l.id,e.get(`PipeJoint/getWeldJointByWeldJointId?WeldJointId=${t}`).then((e=>{console.log(e),a.form=e.data,a.form.CoverWelderName&&(a.form.welderName=a.form.CoverWelderName),a.form.BackingWelderName&&(a.form.welderName+="/"+a.form.BackingWelderName)}))})),(e,l)=>{const t=u(i("up-cell"),d),o=u(i("up-cell-group"),m),r=v;return f(),n(r,{class:"wrap"},{default:s((()=>[c(o,null,{default:s((()=>[c(t,{title:"管线",value:a.form.PipelineCode},null,8,["value"]),c(t,{title:"焊口",value:a.form.WeldJointCode},null,8,["value"]),c(t,{title:"材质一",value:a.form.Material1Code},null,8,["value"]),c(t,{title:"材质二",value:a.form.Material2Code},null,8,["value"]),c(t,{title:"达因",value:a.form.Size},null,8,["value"]),c(t,{title:"外径",value:a.form.Dia},null,8,["value"]),c(t,{title:"DN公称直径",value:a.form.DNDia},null,8,["value"]),c(t,{title:"壁厚",value:a.form.Thickness},null,8,["value"]),c(t,{title:"规格",value:a.form.Specification},null,8,["value"]),c(t,{title:"焊缝类型",value:a.form.WeldTypeCode},null,8,["value"]),c(t,{title:"焊接位置",value:a.form.WeldingLocationCode},null,8,["value"]),c(t,{title:"打底焊工",value:a.form.BackingWelderName},null,8,["value"]),c(t,{title:"盖面焊工",value:a.form.CoverWelderName},null,8,["value"])])),_:1})])),_:1})}}},[["__scopeId","data-v-27b9583d"]]);export{g as default};
|
||||
@@ -0,0 +1 @@
|
||||
import{h as e,s as l,a,_ as t,r as o,o as u,b as r,c as i,d as n,w as s,e as d,f as m,i as v,g as f,j as c}from"./index-RspKKAD8.js";const p={baseURL:"https://sggl.sedin.com.cn/sgglapi/api/",validateStatus:e=>e>=200&&e<300};e.setConfig((e=>p)),e.interceptors.request.use((e=>(e.data=e.data||{},l(),e.header.token="AF17168B-87BD-4GLY-1111-F0A0A1158F9B",e)),(e=>Promise.reject(e))),e.interceptors.response.use((e=>{a();return e.data||{}}),(e=>Promise.reject(e)));const g=t({__name:"index",setup(l){const a=o({form:{}});return u((l=>{var t;console.log(l),t=null==l?void 0:l.id,e.get(`PipeJoint/getWeldJointByWeldJointId?WeldJointId=${t}`).then((e=>{console.log(e),a.form=e.data,a.form.CoverWelderName&&(a.form.welderName=a.form.CoverWelderName),a.form.BackingWelderName&&(a.form.welderName+="/"+a.form.BackingWelderName)}))})),(e,l)=>{const t=r(i("up-cell"),d),o=r(i("up-cell-group"),m),u=v;return f(),n(u,{class:"wrap"},{default:s((()=>[c(o,null,{default:s((()=>[c(t,{title:"管线",value:a.form.PipelineCode},null,8,["value"]),c(t,{title:"焊口",value:a.form.WeldJointCode},null,8,["value"]),c(t,{title:"焊接日期",value:a.form.WeldingDate},null,8,["value"]),c(t,{title:"焊工",value:a.form.welderName},null,8,["value"]),c(t,{title:"材质一",value:a.form.Material1Code},null,8,["value"]),c(t,{title:"材质二",value:a.form.Material2Code},null,8,["value"]),c(t,{title:"达因",value:a.form.Size},null,8,["value"]),c(t,{title:"外径",value:a.form.Dia},null,8,["value"]),c(t,{title:"DN公称直径",value:a.form.DNDia},null,8,["value"]),c(t,{title:"壁厚",value:a.form.Thickness},null,8,["value"]),c(t,{title:"规格",value:a.form.Specification},null,8,["value"]),c(t,{title:"焊接方法",value:a.form.WeldingMethodCode},null,8,["value"]),c(t,{title:"焊缝类型",value:a.form.WeldTypeCode},null,8,["value"]),c(t,{title:"焊接位置",value:a.form.WeldingLocationCode},null,8,["value"]),c(t,{title:"打底焊工",value:a.form.BackingWelderName},null,8,["value"]),c(t,{title:"盖面焊工",value:a.form.CoverWelderName},null,8,["value"])])),_:1})])),_:1})}}},[["__scopeId","data-v-f24308e9"]]);export{g as default};
|
||||
File diff suppressed because one or more lines are too long
@@ -1,7 +1,7 @@
|
||||
<!DOCTYPE html>
|
||||
<html lang="en">
|
||||
<head>
|
||||
<link rel="stylesheet" href="/StaticPage/HJGL/assets/uni.b8bf2949.css">
|
||||
<link rel="stylesheet" href="/StaticPage/HJGL/assets/uni.115a2c5d.css">
|
||||
|
||||
<meta charset="UTF-8" />
|
||||
<script>
|
||||
@@ -14,8 +14,8 @@
|
||||
<title>WebH5</title>
|
||||
<!--preload-links-->
|
||||
<!--app-context-->
|
||||
<script type="module" crossorigin src="/StaticPage/HJGL/assets/index-D_s_mHWI.js"></script>
|
||||
<link rel="stylesheet" crossorigin href="/StaticPage/HJGL/assets/index-Dz4tKtNa.css">
|
||||
<script type="module" crossorigin src="/StaticPage/HJGL/assets/index-BCk3NlG9.js"></script>
|
||||
<link rel="stylesheet" crossorigin href="/StaticPage/HJGL/assets/index-th1baVH-.css">
|
||||
</head>
|
||||
<body>
|
||||
<div id="app"><!--app-html--></div>
|
||||
|
||||
+734
-278
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user