| | |
|---|
| | | |
|---|
| | | |
|---|
| | | var query = db |
|---|
| | | .Queryable<QsItemOqcReq, MesItems, Womdaa, MesLine, SysUser,Womcaa, SysDepartment,MesUserDepartmentQc>((a, b, |
|---|
| | | da, c, us, ca, d, dq) => |
|---|
| | | .Queryable<QsItemOqcReq, MesItems, Womdaa, MesLine, SysUser, Womcaa, SysDepartment,MesUserDepartmentQc, SysUser>((a, b, |
|---|
| | | da, c, us, ca, d, dq, us2) => |
|---|
| | | new JoinQueryInfos( |
|---|
| | | JoinType.Left, a.ItemNo == b.ItemNo, // 关联物料信息 |
|---|
| | | JoinType.Left, a.BillNo == da.Daa001, // 关联工单信息 |
|---|
| | |
|---|
| | | JoinType.Left, us.Fcode == a.CreateBy, // 关联工单信息 |
|---|
| | | JoinType.Left, da.Daa021 == ca.Caa020,//任务单，用于查询销售订单号 |
|---|
| | | JoinType.Left, d.Departmentid == Convert.ToDecimal(da.Daa013),//查询车间 |
|---|
| | | JoinType.Left, dq.Departmentcode == d.Departmentcode//查询用户权限 |
|---|
| | | JoinType.Left, dq.Departmentcode == d.Departmentcode,//查询用户权限 |
|---|
| | | JoinType.Left, us2.Fcode == a.FcheckBy |
|---|
| | | )) |
|---|
| | | // 用户线体过滤条件 |
|---|
| | | //.WhereIF(lineNo != null && lineNo.Length > 0 && !"PL017".Equals(queryObj.createUser), |
|---|
| | |
|---|
| | | .WhereIF(!string.IsNullOrEmpty(queryObj.LoginUser), |
|---|
| | | (a, b, da, c, us, ca, d, dq) => dq.Usercode == queryObj.LoginUser) |
|---|
| | | // 查询字段 |
|---|
| | | .Select((a, b, da, c, us, ca,d,dq) => new QsItemOqcReq |
|---|
| | | .Select((a, b, da, c, us, ca,d,dq,us2) => new QsItemOqcReq |
|---|
| | | { |
|---|
| | | Id = a.Id, |
|---|
| | | BillNo = a.BillNo, |
|---|
| | |
|---|
| | | ItemModel = b.ItemModel, |
|---|
| | | CreateDate = a.CreateDate, |
|---|
| | | CreateBy = a.CreateBy, |
|---|
| | | CreateUser = us.Fname, |
|---|
| | | CreateUser = us.Fname==null ? a.CreateBy: us.Fname, |
|---|
| | | FcheckResu = a.FcheckResu, |
|---|
| | | FcheckBy = a.FcheckBy, |
|---|
| | | FcheckBy = us2.Fname,//a.FcheckBy, |
|---|
| | | FcheckDate = a.FcheckDate, |
|---|
| | | ReleaseNo = a.ReleaseNo, |
|---|
| | | Remarks = a.Remarks, |
|---|
| | | Daa015 = da.Daa015, // 工单线体 |
|---|
| | | Daa015 = d.Departmentname=="注塑车间" ? da.Daa020:da.Daa015, // 工单线体 |
|---|
| | | Fsubmit = a.Fsubmit, |
|---|
| | | Quantity = da.Daa008, |
|---|
| | | LineNo = c.LineName, |
|---|
| | | LineNo = d.Departmentname == "注塑车间" ? da.Daa020 : c.LineName, |
|---|
| | | SaleOrderNo = ca.Caa015, |
|---|
| | | DepartName = d.Departmentname |
|---|
| | | }) |
|---|
| | |
|---|
| | | return 0; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public int reSubmit(RKJDto dto) |
|---|
| | | { |
|---|
| | | SqlSugarHelper.UseTransactionWithOracle(db => |
|---|
| | | { |
|---|
| | | return db.Updateable<QsItemOqcReq>() |
|---|
| | | .SetColumns(a => a.Fsubmit == 0) |
|---|
| | | .SetColumns(a => a.FsubmitBy == null) |
|---|
| | | .SetColumns(a => a.FsubmitDate == null) |
|---|
| | | .Where(a => a.ReleaseNo == dto.releaseNo) |
|---|
| | | .ExecuteCommand(); |
|---|
| | | }); |
|---|
| | | |
|---|
| | | return 0; |
|---|
| | | } |
|---|
| | | |
|---|
| | | // 备份：原始版本的saveItem方法 |
|---|
| | | public int saveItemOriginal(RKJDto rkjDto) |
|---|
| | | { |
|---|
