1

yusijie

2023-06-08 db1b6e4059213c4aeb8927415d1c74d2505ade4f

1

 WebTM/WebTM.csproj

@@ -1257,7 +1257,6 @@
    <Content Include="views\领料发货\领料出库\Kf_MateOutBill_Check_New.html" />
    <Content Include="views\领料发货\领料出库\Kf_StockOutRequestBill.html" />
    <Content Include="views\领料发货\领料出库\Kf_StockOutRequestBillList.html" />
    <Content Include="views\验收入库\Kf_OtherInBill_Fast.html" />
    <Content Include="views\验收入库\产品入库\Kf_ICStockBillSub_WMS_List.html" />
    <Content Include="views\验收入库\产品入库\Kf_ProductInBillList.html" />
    <Content Include="views\验收入库\其他入库\Kf_OtherInBillList.html" />

 WebTM/views/home/console.html

@@ -35,7 +35,7 @@
                                                    <i class="layui-icon layui-icon-mike"></i>
                                                    <cite>派工单列表</cite>
                                                </a>
                                            </li>                                            
                                            </li>
                                            <li class="layui-col-xs3">
                                                <a lay-href="车间管理/工序出站汇报单/Cj_StationOutBill.html">
                                                    <i class="layui-icon layui-icon-theme"></i>
@@ -59,7 +59,13 @@
                                                    <i class="layui-icon layui-icon-addition"></i>
                                                    <cite>条码列表</cite>
                                                </a>
                                            </li>                                            
                                            </li>
                                            <li class="layui-col-xs3">
                                                <a lay-href="模治具管理/模治具管理/Gy_SplitBarCode.html">
                                                    <i class="layui-icon layui-icon-addition"></i>
                                                    <cite>条码拆码</cite>
                                                </a>
                                            </li>
                                        </ul>
                                        <ul class="layui-row layui-col-space10">
                                            <li class="layui-col-xs3">

 WebTM/views/²Ö´æ¹ÜÀí/ÌõÂë³öÈë¿â¼Ç¼±í/Kf_ICStockBillSubList.html

@@ -206,14 +206,32 @@
                        switch (data[i].name) {
                            //int
                            case '数量':
                                cols_arr[0][i + 1] = { field: data[i].id, title: data[i].name, align: 'center', totalRow: true, sort: true };
                                cols_arr[0][i + 1] = { field: data[i].id, title: data[i].name, align: 'center', totalRow: true, sort: true, width:90 };
                                break;
                            case '条码':
                                cols_arr[0][i + 1] = { field: data[i].id, title: data[i].name, align: 'center', totalRow: true, sort: true, width: 210 };
                                break;
                            case '日期':
                                cols_arr[0][i + 1] = { field: data[i].id, title: data[i].name, align: 'center', totalRow: true, sort: true, width: 160 };
                                break;
                            case '单据号':
                                cols_arr[0][i + 1] = { field: data[i].id, title: data[i].name, align: 'center', totalRow: true, sort: true, width: 135 };
                                break;
                            case '物料代码':
                                cols_arr[0][i + 1] = { field: data[i].id, title: data[i].name, align: 'center', totalRow: true, sort: true, width: 180 };
                                break;
                            case '物料名称':
                                cols_arr[0][i + 1] = { field: data[i].id, title: data[i].name, align: 'center', totalRow: true, sort: true, width: 150 };
                                break;
                            case '规格型号':
                                cols_arr[0][i + 1] = { field: data[i].id, title: data[i].name, align: 'center', totalRow: true, sort: true, width: 180 };
                                break;
                            //Decimal
                            //case 'Decimal':
                            //    cols_arr[0][i + 1] = { field: data[i].id, title: data[i].name, align: 'center', totalRow: true, sort: true };
                            //    break;
                            default:
                                cols_arr[0][i + 1] = { field: data[i].id, title: data[i].name, align: 'center', sort: true };
                                cols_arr[0][i + 1] = { field: data[i].id, title: data[i].name, align: 'center', sort: true,width:120 };
                        }
                    }
                }

 WebTM/views/¼Æ»®¹ÜÀí/¹¤ÒÕ·Ïß/Gy_RoutingBill.html

@@ -1900,7 +1900,7 @@
                                    , "供应商代码": d.data[i].供应商代码, "供应商": d.data[i].供应商, "HSupFlag": d.data[i].委外标记 == 0 ? false : true, "HTimeUnit": d.data[i].时间单位, "HUnitTime": d.data[i].运行时间
                                    , "HWorkQty": d.data[i].加工数量, "HPassRate": d.data[i].良率, "HOverRate": d.data[i].超额比例, "HReadyTime": d.data[i].准备时间, "HQueueTime": d.data[i].排队时间
                                    , "HMoveTime": d.data[i].转移时间, "HNextProcFlag": d.data[i].HNextProcFlag == 0 ? false : true, "HFlowProc": d.data[i].流转工序 == 0 ? false : true, "HSubStdEmpQty": d.data[i].标准人数, "HSubCanUseSourceQty": d.data[i].可操作设备数
                                    , "HFixPrice": d.data[i].班产定额, "HProcPrice": d.data[i].加工单价, "HBadPrice": d.data[i].不合格单价, "HWasterPrice": d.data[i].报废单价, "HStdFlag": d.data[i].标准定额
                                    , "HFixPrice": d.data[i].班产定额, "HProcPrice": d.data[i].加工单价 == null ? 0 : d.data[i].加工单价, "HBadPrice": d.data[i].不合格单价, "HWasterPrice": d.data[i].报废单价, "HStdFlag": d.data[i].标准定额
                                    , "HBeginDayQty": d.data[i].开工余量天数, "HBeginFixQty": d.data[i].开工余量固数, "HFixWorkDays": d.data[i].上道固定天数, "HTrunWorkDays": d.data[i].上道循环周期, "HReadyTimes": d.data[i].本道准备时间
                                    , "HICMOReadyTimes": d.data[i].换单准备时间, "HAutoTrunFlag": d.data[i].自动移转, "HTechnologyParameter": d.data[i].工艺参数, "HPicNum": d.data[i].图纸编号, "HProcCheckNote": d.data[i].本工序确认记录
                                    , "HProcWorkNum": d.data[i].程序号, "HBadWHID": d.data[i].HBadWHID, "HBadWHName": d.data[i].HBadWHName, "HWasterWHID": d.data[i].HWasterWHID, "HWasterWHName": d.data[i].HWasterWHName

 WebTM/views/³µ¼ä¹ÜÀí/¹¤Ðò³öÕ¾»ã±¨µ¥/Cj_StationOutBillList.html

@@ -718,12 +718,12 @@
                    sWhere += " and " + ColName+    " "+ com;
                }

                //if (HBeginDate) {
                //    sWhere += " and CONVERT(varchar(100),汇报日期, 23) >= '" + HBeginDate + "'";
                //}
                //if (HEndDate) {
                //    sWhere += " and CONVERT(varchar(100),汇报日期, 23) <= '" + HEndDate + "'";
                //}
                if (HBeginDate) {
                    sWhere += " and CONVERT(varchar(100),汇报日期, 23) >= '" + HBeginDate + "'";
                }
                if (HEndDate) {
                    sWhere += " and CONVERT(varchar(100),汇报日期, 23) <= '" + HEndDate + "'";
                }
                if (HWorkBillNo) {
                    sWhere += " and ä»»åŠ¡å• like '%" + HWorkBillNo + "%'";
                }

 WebTM/views/³µ¼ä¹ÜÀí/¹¤ÐòÁ÷ת¿¨/Gy_ProcessBatchReport.html

@@ -482,7 +482,6 @@
                , { field: 'lngBillSubKey', title: '流转卡子ID', hide: true }
                , { field: 'HCenterID', title: '工作中心ID', hide: true }
                , { field: 'HWorkCenterName', title: '工作中心名称' }
                , { field: 'HProcExchBillNo', title: '派工单号', width: 150 }
                , { field: 'HSourceBillType', title: '单据类型', hide: true }
                , { field: 'HProcNo', title: '流水号', width: 80 }
                , { field: 'HICMOQty', title: '任务单数量', hide: true }
@@ -498,6 +497,7 @@
                , { field: 'HEmpID', title: '操作员ID', hide: true }
                , { field: 'HEmpNumber', title: '操作员代码', edit: 'text', event: "HEmpNumber" }
                , { field: 'HEmpName', title: '操作员名称' }
                , { field: 'HProcExchBillNo', title: '派工单号', width: 150 }
                , { field: 'HPlanQty', title: '流转卡数量', width: 100 }
                , { field: 'HInterID', title: '工序汇报ID', hide: true }
                , { field: 'HBillNo', title: '工序汇报单号', width: 195 }