|
|
@@ -138,6 +138,9 @@
|
|
|
<option value="0">不合格</option>
|
|
|
</select>
|
|
|
</div>
|
|
|
+ <div class="form-group col-1 align-self-end mb-1">
|
|
|
+ <button onclick="OpenFinal()" id="强制启动" type="button" class="btn btn-info btn-block">强制启动</button>
|
|
|
+ </div>
|
|
|
</div>
|
|
|
</form>
|
|
|
</div>
|
|
|
@@ -949,9 +952,9 @@
|
|
|
var text = event.data.toString();
|
|
|
var values = text.split("#");
|
|
|
console.log('text',text);
|
|
|
- console.log('checkprocedureId', checkprocedureId);
|
|
|
- console.log('checkworkstationname', checkworkstationname);
|
|
|
- console.log('servicePort', servicePort);
|
|
|
+ //console.log('checkprocedureId', checkprocedureId);
|
|
|
+ //console.log('checkworkstationname', checkworkstationname);
|
|
|
+ //console.log('servicePort', servicePort);
|
|
|
if (procedureId == checkprocedureId && request('NAME') == checkworkstationname && values[0].toString() == servicePort) {
|
|
|
|
|
|
$('#urltext').val(values[1].toString());
|
|
|
@@ -961,6 +964,12 @@
|
|
|
}
|
|
|
};
|
|
|
|
|
|
+ //智能装配强制启动
|
|
|
+ function OpenFinal() {
|
|
|
+ var result = $.ajax({ url: 'api/GetBarcodeByScan.ashx?startfinal=1', dataType: "json", type: "get" });
|
|
|
+ console.log('result', result);
|
|
|
+ }
|
|
|
+
|
|
|
function Printer() {
|
|
|
var userbarcodeprinter = $.ajax({ url: 'api/GetUserBarcodePrinter.ashx?', dataType: "json", type: "get" });
|
|
|
console.log($('#生产工号').val());
|
|
|
@@ -1680,7 +1689,7 @@
|
|
|
function (json) {
|
|
|
if (json["success"] == true) {
|
|
|
procedureName = json["rows"][0]["PROCEDURENAME"];
|
|
|
- console.log('procedureName', procedureName)
|
|
|
+ //console.log('procedureName', procedureName)
|
|
|
if (procedureName.search("养水") > 0) {
|
|
|
$('#养水').prop('disabled', false);
|
|
|
$('#养水不合格位置').prop('disabled', true);
|
|
|
@@ -1709,7 +1718,7 @@
|
|
|
//$('#下线标识').prop('disabled', true);
|
|
|
}
|
|
|
else if (procedureName.search("补裂") > 0 || procedureName == "补裂") {
|
|
|
- console.log('procedureName11', 11)
|
|
|
+ //console.log('procedureName11', 11)
|
|
|
$('#养水').prop('disabled', true);
|
|
|
$('#养水不合格位置').prop('disabled', true);
|
|
|
$('#漏气').prop('disabled', true);
|
|
|
@@ -1741,8 +1750,8 @@
|
|
|
);
|
|
|
}
|
|
|
else if (code.length > 11) {
|
|
|
- console.log('procedureId', procedureId)
|
|
|
- console.log('code', code)
|
|
|
+ //console.log('procedureId', procedureId)
|
|
|
+ //console.log('code', code)
|
|
|
var code1 = code.toString();
|
|
|
//3车间打印 校验水效标识
|
|
|
if (procedureId == 152 && code1.substring(0, 4) == "http") {
|
|
|
@@ -1751,7 +1760,7 @@
|
|
|
$('#urltext').val('');
|
|
|
$('#urltext').focus();
|
|
|
|
|
|
- console.log('waterLabelCode', code)
|
|
|
+ //console.log('waterLabelCode', code)
|
|
|
|
|
|
for (var i = 0; i < idnrkList.length; i++) {
|
|
|
|
|
|
@@ -1885,7 +1894,7 @@
|
|
|
if (json['rows']["leakFlag6Table"] != undefined) {
|
|
|
var positions = [];
|
|
|
for (var i = 0; i < json['rows']["leakFlag6Table"].length; i++) {
|
|
|
- console.log(json['rows']["leakFlag6Table"][i]["POSITION"])
|
|
|
+ //console.log(json['rows']["leakFlag6Table"][i]["POSITION"])
|
|
|
positions.push(json['rows']["leakFlag6Table"][i]["POSITION"]);
|
|
|
|
|
|
}
|
|
|
@@ -2023,7 +2032,7 @@
|
|
|
//$('#下线标识').prop('disabled', true);
|
|
|
}
|
|
|
else if (procedureName.search("补裂") > 0 || procedureName == "补裂") {
|
|
|
- console.log('procedureName11', 11)
|
|
|
+ //console.log('procedureName11', 11)
|
|
|
$('#养水').prop('disabled', true);
|
|
|
$('#养水不合格位置').prop('disabled', true);
|
|
|
$('#漏气').prop('disabled', true);
|
|
|
@@ -2067,7 +2076,7 @@
|
|
|
//var idnrk1 = idnrkOnlycode1.replaceAll('?', '1');
|
|
|
|
|
|
|
|
|
- console.log('idnrk1', idnrk1)
|
|
|
+ //console.log('idnrk1', idnrk1)
|
|
|
var barcodeTable = $.ajax({ url: 'api/GetBarcodeByOutLabelCoe_WCF.ashx?outLabelCode=' + idnrk1, dataType: "json", type: "get" });
|
|
|
$.when(barcodeTable).then(
|
|
|
function (json) {
|
|
|
@@ -2075,15 +2084,15 @@
|
|
|
|
|
|
//扫描的是组件唯一编码
|
|
|
if (json["rows"][0] == undefined) {
|
|
|
- console.log('idnrk1', idnrk1)
|
|
|
+ //console.log('idnrk1', idnrk1)
|
|
|
var idnrk = idnrk1.substr(0, 14);
|
|
|
$('#urltext').val('');
|
|
|
$('#urltext').focus();
|
|
|
- console.log('idnrk', idnrk)
|
|
|
+ //console.log('idnrk', idnrk)
|
|
|
var idnrkOnlycodeflag = 0;
|
|
|
for (var i = 0; i < bindIdnrkList.length; i++) {
|
|
|
- console.log('idnrk', idnrk)
|
|
|
- console.log('bindIdnrkList[i]["IDNRK"]', bindIdnrkList[i]["IDNRK"])
|
|
|
+ //console.log('idnrk', idnrk)
|
|
|
+ //console.log('bindIdnrkList[i]["IDNRK"]', bindIdnrkList[i]["IDNRK"])
|
|
|
if (bindIdnrkList[i]["IDNRK"] == idnrk) {
|
|
|
|
|
|
bindIdnrkList[i]["IDNRKONLYCODE"] = idnrk1;
|
|
|
@@ -2237,7 +2246,7 @@
|
|
|
if (json['rows']["leakFlag6Table"] != undefined) {
|
|
|
var positions = [];
|
|
|
for (var i = 0; i < json['rows']["leakFlag6Table"].length; i++) {
|
|
|
- console.log(json['rows']["leakFlag6Table"][i]["POSITION"])
|
|
|
+ //console.log(json['rows']["leakFlag6Table"][i]["POSITION"])
|
|
|
positions.push(json['rows']["leakFlag6Table"][i]["POSITION"]);
|
|
|
|
|
|
}
|
|
|
@@ -2551,7 +2560,7 @@
|
|
|
function (json) {
|
|
|
if (json["success"] == true) {
|
|
|
procedureName = json["rows"][0]["PROCEDURENAME"];
|
|
|
- console.log('procedureName', procedureName)
|
|
|
+ //console.log('procedureName', procedureName)
|
|
|
if (procedureName.search("养水") > 0) {
|
|
|
$('#养水').prop('disabled', false);
|
|
|
$('#养水不合格位置').prop('disabled', true);
|
|
|
@@ -2580,7 +2589,7 @@
|
|
|
//$('#下线标识').prop('disabled', true);
|
|
|
}
|
|
|
else if (procedureName.search("补裂") > 0 || procedureName == "补裂") {
|
|
|
- console.log('procedureName11', 11)
|
|
|
+ //console.log('procedureName11', 11)
|
|
|
$('#养水').prop('disabled', true);
|
|
|
$('#养水不合格位置').prop('disabled', true);
|
|
|
$('#漏气').prop('disabled', true);
|
|
|
@@ -2623,7 +2632,7 @@
|
|
|
var idnrkOnlycode = $('#urltext').val();
|
|
|
idnrkOnlycode = idnrkOnlycode.replace(' ', '');
|
|
|
var idnrk1 = idnrkOnlycode.replace('?', '');
|
|
|
- console.log('idnrkOnlycode', idnrkOnlycode)
|
|
|
+ //console.log('idnrkOnlycode', idnrkOnlycode)
|
|
|
var idnrk = idnrkOnlycode.substr(0, 14);
|
|
|
$('#urltext').val('');
|
|
|
$('#urltext').focus();
|
|
|
@@ -2699,9 +2708,9 @@
|
|
|
}).then((ok) => {
|
|
|
if (!ok) {
|
|
|
//替换
|
|
|
- console.log('checkIdnrkList', checkIdnrkList)
|
|
|
- console.log('jsonUser["userCode"]', jsonUser["userCode"])
|
|
|
- console.log('index', index)
|
|
|
+ //console.log('checkIdnrkList', checkIdnrkList)
|
|
|
+ //console.log('jsonUser["userCode"]', jsonUser["userCode"])
|
|
|
+ //console.log('index', index)
|
|
|
checkIdnrkList[index]["CREATEUSERNAME"] = jsonUser["userCode"];
|
|
|
let time = new Date();
|
|
|
checkIdnrkList[index]["CREATETIME"] = time.toLocaleString();
|
|
|
@@ -2725,7 +2734,7 @@
|
|
|
$('#' + flag).after(temp);
|
|
|
$('#' + flag).remove();
|
|
|
$('#' + flag + checkIdnrkList[index]["IDNRK"]).prop("checked", true);
|
|
|
- console.log('checkd', $('#' + flag + checkIdnrkList[index]["IDNRK"]).is(':checked'))
|
|
|
+ //console.log('checkd', $('#' + flag + checkIdnrkList[index]["IDNRK"]).is(':checked'))
|
|
|
}
|
|
|
});
|
|
|
|
|
|
@@ -2759,18 +2768,18 @@
|
|
|
var idnrkOnlycode = $('#urltext').val();
|
|
|
idnrkOnlycode = idnrkOnlycode.replace(' ', '');
|
|
|
var idnrk1 = idnrkOnlycode.replace('?', '');
|
|
|
- console.log('idnrkOnlycode', idnrkOnlycode)
|
|
|
+ //console.log('idnrkOnlycode', idnrkOnlycode)
|
|
|
var idnrk = idnrkOnlycode.substr(0, 14);
|
|
|
$('#urltext').val('');
|
|
|
$('#urltext').focus();
|
|
|
|
|
|
// if (cancleFlag == '1') {
|
|
|
- console.log('idnrk', idnrk)
|
|
|
- console.log('bindIdnrkList.length', bindIdnrkList.length)
|
|
|
+ //console.log('idnrk', idnrk)
|
|
|
+ //console.log('bindIdnrkList.length', bindIdnrkList.length)
|
|
|
|
|
|
for (var i = 0; i < bindIdnrkList.length; i++) {
|
|
|
- console.log('idnrk', idnrk)
|
|
|
- console.log('bindIdnrkList[i]["IDNRK"]', bindIdnrkList[i]["IDNRK"])
|
|
|
+ //console.log('idnrk', idnrk)
|
|
|
+ //console.log('bindIdnrkList[i]["IDNRK"]', bindIdnrkList[i]["IDNRK"])
|
|
|
if (bindIdnrkList[i]["IDNRK"] == idnrk) {
|
|
|
|
|
|
bindIdnrkList[i]["IDNRKONLYCODE"] = idnrkOnlycode;
|
|
|
@@ -4433,8 +4442,8 @@
|
|
|
);
|
|
|
}
|
|
|
else if (code.length > 11) {
|
|
|
- console.log('procedureId', procedureId)
|
|
|
- console.log('code', code)
|
|
|
+ //console.log('procedureId', procedureId)
|
|
|
+ //console.log('code', code)
|
|
|
var code1 = code.toString();
|
|
|
//3车间打印 校验水效标识
|
|
|
if (procedureId == 152 && code1.substring(0, 4) == "http") {
|
|
|
@@ -5381,18 +5390,18 @@
|
|
|
var idnrkOnlycode = $('#urltext').val();
|
|
|
idnrkOnlycode = idnrkOnlycode.replace(' ', '');
|
|
|
var idnrk1 = idnrkOnlycode.replace('?', '');
|
|
|
- console.log('idnrkOnlycode', idnrkOnlycode)
|
|
|
+ //console.log('idnrkOnlycode', idnrkOnlycode)
|
|
|
var idnrk = idnrkOnlycode.substr(0, 14);
|
|
|
$('#urltext').val('');
|
|
|
$('#urltext').focus();
|
|
|
|
|
|
// if (cancleFlag == '1') {
|
|
|
- console.log('idnrk', idnrk)
|
|
|
- console.log('bindIdnrkList.length', bindIdnrkList.length)
|
|
|
+ //console.log('idnrk', idnrk)
|
|
|
+ //console.log('bindIdnrkList.length', bindIdnrkList.length)
|
|
|
|
|
|
for (var i = 0; i < bindIdnrkList.length; i++) {
|
|
|
- console.log('idnrk', idnrk)
|
|
|
- console.log('bindIdnrkList[i]["IDNRK"]', bindIdnrkList[i]["IDNRK"])
|
|
|
+ //console.log('idnrk', idnrk)
|
|
|
+ //console.log('bindIdnrkList[i]["IDNRK"]', bindIdnrkList[i]["IDNRK"])
|
|
|
if (bindIdnrkList[i]["IDNRK"] == idnrk) {
|
|
|
|
|
|
bindIdnrkList[i]["IDNRKONLYCODE"] = idnrkOnlycode;
|
|
|
@@ -5776,7 +5785,7 @@
|
|
|
|
|
|
$.when(productionPlanData).then(
|
|
|
function (productionPlanData) {
|
|
|
- console.log(productionPlanData)
|
|
|
+ //console.log(productionPlanData)
|
|
|
$('#生产计划列表').empty();
|
|
|
//加载生产计划
|
|
|
productionPlanList = productionPlanData["rows"];
|
|
|
@@ -6165,8 +6174,8 @@
|
|
|
//已报损数量-1
|
|
|
for (var i = 0; i < idnrkList.length; i++) {
|
|
|
|
|
|
- console.log(idnrk)
|
|
|
- console.log(idnrkList[i]["IDNRK"])
|
|
|
+ //console.log(idnrk)
|
|
|
+ //console.log(idnrkList[i]["IDNRK"])
|
|
|
if (idnrkList[i]["IDNRK"] == idnrk) {
|
|
|
//当前报损数量
|
|
|
if (idnrkList[i]["Quantity"] != "") {
|
|
|
@@ -6291,7 +6300,7 @@
|
|
|
|
|
|
//商标变更
|
|
|
function leakFlag4_onChange() {
|
|
|
- console.log($('#养水').val())
|
|
|
+ //console.log($('#养水').val())
|
|
|
if ($('#养水').val() == 1) {
|
|
|
$('#养水不合格位置').get(0).selectedIndex = 0;
|
|
|
$('#养水不合格位置').prop('disabled', true);
|
|
|
@@ -6304,7 +6313,7 @@
|
|
|
|
|
|
//商标变更
|
|
|
function leakFlag5_onChange() {
|
|
|
- console.log($('#试水').val())
|
|
|
+ //console.log($('#试水').val())
|
|
|
if ($('#试水').val() == 1) {
|
|
|
$('#试水不合格位置').get(0).selectedIndex = 0;
|
|
|
$('#试水不合格位置').prop('disabled', true);
|
|
|
@@ -6394,7 +6403,7 @@
|
|
|
//产品分级按钮事件
|
|
|
function pinguanGoodsLevelSelect(value) {
|
|
|
pinguanGoodsLevelName = value;
|
|
|
- console.log('pinguanGoodsLevelName', pinguanGoodsLevelName)
|
|
|
+ //console.log('pinguanGoodsLevelName', pinguanGoodsLevelName)
|
|
|
}
|
|
|
|
|
|
//启用禁用 产品分级 保存按钮
|
|
|
@@ -6949,8 +6958,8 @@
|
|
|
var defectResponsibles = [];
|
|
|
|
|
|
//获取责任人
|
|
|
- console.log($("#责任人").selectpicker('val'));
|
|
|
- console.log(jsonStaff);
|
|
|
+ //console.log($("#责任人").selectpicker('val'));
|
|
|
+ //console.log(jsonStaff);
|
|
|
|
|
|
for (var i = 0; i < jsonStaff.length; i++) {
|
|
|
if ($("#责任人").selectpicker('val').indexOf(jsonStaff[i]["STAFFID"].toString()) >= 0) {
|
|
|
@@ -7166,7 +7175,7 @@
|
|
|
|
|
|
//全选 20230720
|
|
|
function chooseAllCheckBox() {
|
|
|
- console.log('idnrkList', idnrkList)
|
|
|
+ //console.log('idnrkList', idnrkList)
|
|
|
if ($('#AllCheck').is(':checked')) {
|
|
|
for (var i = 0; i < idnrkList.length; i++) {
|
|
|
var id = i + 1000;
|
|
|
@@ -7208,9 +7217,9 @@
|
|
|
//20240514 addby qq 连体装配固定的页面,勾选事件
|
|
|
function chooseCheckBoxLT(id) {
|
|
|
var i = id - 1000000;
|
|
|
- console.log('checkIdnrkList', checkIdnrkList)
|
|
|
- console.log('id', id)
|
|
|
- console.log('i', i)
|
|
|
+ //console.log('checkIdnrkList', checkIdnrkList)
|
|
|
+ //console.log('id', id)
|
|
|
+ //console.log('i', i)
|
|
|
//给操作员赋值
|
|
|
checkIdnrkList[i]["CREATEUSERNAME"] = jsonUser["userCode"];
|
|
|
let time = new Date();
|
|
|
@@ -7523,7 +7532,7 @@
|
|
|
}
|
|
|
|
|
|
}
|
|
|
- console.log('bindIdnrkList', bindIdnrkList)
|
|
|
+ //console.log('bindIdnrkList', bindIdnrkList)
|
|
|
//if ($('#urltext').val() == "") {
|
|
|
// swal({
|
|
|
// title: "产品分级",
|
|
|
@@ -7596,7 +7605,7 @@
|
|
|
|
|
|
//保存方法
|
|
|
function save(ok) {
|
|
|
- console.log("产品编码:" + $('#产品编码').val());
|
|
|
+ //console.log("产品编码:" + $('#产品编码').val());
|
|
|
if ($('#产品编码').val() == "") {
|
|
|
swal({
|
|
|
title: "产品分级",
|
|
|
@@ -7610,7 +7619,7 @@
|
|
|
if (ok) {
|
|
|
//生成时间戳避免重复提交
|
|
|
var dataKey = new Date().getTime() + '-' + $('#生产工号').val();
|
|
|
- console.log(dataKey);
|
|
|
+ //console.log(dataKey);
|
|
|
//3#条码打印 保存时修改用户打印机
|
|
|
if (procedureId == 152) {
|
|
|
var BARCODEPRINTERID = $("#条码打印机 option:selected").val();
|
|
|
@@ -7690,8 +7699,8 @@
|
|
|
//"OfflineFlag": $("#下线标识").val(),
|
|
|
}];
|
|
|
}
|
|
|
- console.log(action);
|
|
|
- console.log(productionDataEntitys);
|
|
|
+ //console.log(action);
|
|
|
+ //console.log(productionDataEntitys);
|
|
|
// 获取<audio>元素
|
|
|
var audioSuccess = document.getElementById("audioPlayerSuccess");
|
|
|
var audioFail = document.getElementById("audioPlayerFail");
|
|
|
@@ -7771,7 +7780,7 @@
|
|
|
if (ok) {
|
|
|
//生成时间戳避免重复提交
|
|
|
var dataKey = new Date().getTime() + '-' + $('#生产工号').val();
|
|
|
- console.log(dataKey);
|
|
|
+ //console.log(dataKey);
|
|
|
|
|
|
var productionDataEntitys;
|
|
|
productionDataEntitys = [{
|
|
|
@@ -7784,8 +7793,8 @@
|
|
|
"IdnrkList": bindIdnrkList,
|
|
|
"IdnrkScrapList": idnrkScrapList
|
|
|
}];
|
|
|
- console.log('idnrkScrapList', bindIdnrkList)
|
|
|
- console.log('idnrkScrapList', idnrkScrapList)
|
|
|
+ //console.log('idnrkScrapList', bindIdnrkList)
|
|
|
+ //console.log('idnrkScrapList', idnrkScrapList)
|
|
|
//提交到接口 报损BARCODEIDNRKSCRAP
|
|
|
$.post('api/AddBarcodeIdnrkScrap_WCF.ashx', { 'procedureID': procedureId, 'productionDataEntitys': JSON.stringify(productionDataEntitys), 'barcode': barcode }, function (data) {
|
|
|
var json = JSON.parse(data);
|
|
|
@@ -7996,7 +8005,7 @@
|
|
|
}];
|
|
|
}
|
|
|
|
|
|
- console.log(productionDataEntitys);
|
|
|
+ //console.log(productionDataEntitys);
|
|
|
|
|
|
|
|
|
//提交到接口
|