20210420更新

zgq

2021-04-20 1f05db3493a583c2163d8c68754ddb388a75a47d

20210420更新

 WebTM/Properties/PublishProfiles/LAYUI.pubxml.user

@@ -588,7 +588,7 @@
      <publishTime>03/23/2021 14:14:38</publishTime>
    </File>
    <File Include="layuiadmin/Scripts/webConfig.js">
      <publishTime>04/16/2021 14:23:59</publishTime>
      <publishTime>04/19/2021 09:22:17</publishTime>
    </File>
    <File Include="layuiadmin/style/admin.css">
      <publishTime>03/23/2021 14:14:38</publishTime>
@@ -1188,7 +1188,7 @@
      <publishTime>04/08/2021 09:14:52</publishTime>
    </File>
    <File Include="views/生产工序管理/增加不良评审单/QC_Add_NoPassProdCheckBill.html">
      <publishTime>04/16/2021 14:21:33</publishTime>
      <publishTime>04/19/2021 09:13:13</publishTime>
    </File>
    <File Include="views/生产工序管理/增加不良评审单/QC_NoPassProdCheckBill.html">
      <publishTime>04/13/2021 10:12:44</publishTime>
@@ -1251,19 +1251,19 @@
      <publishTime>03/29/2021 10:48:22</publishTime>
    </File>
    <File Include="views/车间管理/委外工序发出单/Cj_StationEntrustInBill.html">
      <publishTime>04/08/2021 17:13:21</publishTime>
      <publishTime>04/19/2021 15:12:37</publishTime>
    </File>
    <File Include="views/车间管理/委外工序发出单/Cj_StationEntrustInBillList.html">
      <publishTime>04/08/2021 13:34:42</publishTime>
    </File>
    <File Include="views/车间管理/委外工序接收单/Cj_StationEntrustOutBill.html">
      <publishTime>04/08/2021 13:26:34</publishTime>
      <publishTime>04/19/2021 16:54:32</publishTime>
    </File>
    <File Include="views/车间管理/委外工序接收单/Cj_StationEntrustOutBillList.html">
      <publishTime>03/30/2021 10:39:26</publishTime>
    </File>
    <File Include="views/车间管理/委外工序发出单/Cj_StationEntrustInBill.html">
      <publishTime>04/08/2021 17:13:21</publishTime>
      <publishTime>04/19/2021 15:12:37</publishTime>
    </File>
    <File Include="views/车间管理/委外工序发出单/Cj_StationEntrustInBillList.html">
      <publishTime>04/08/2021 13:34:42</publishTime>
@@ -1275,7 +1275,7 @@
      <publishTime>03/29/2021 10:48:22</publishTime>
    </File>
    <File Include="views/车间管理/工序流转/MES_StationInBillList.html">
      <publishTime>03/23/2021 14:14:38</publishTime>
      <publishTime>04/20/2021 09:51:54</publishTime>
    </File>
    <File Include="views/车间管理/工序流转/MES_StationInBill_PDA.html">
      <publishTime>03/23/2021 14:14:38</publishTime>

 WebTM/layuiadmin/Scripts/webConfig.js

@@ -1,8 +1,8 @@
function GetWEBURL() {
    //var WEBURL = "http://192.168.16.80:8011/";          //办公室服务器
    //var WEBURL = "http://localhost:8081/SWEAPI/";       //ch本地
    //var WEBURL = "http://localhost:8085/JFAPI/";   //zgq本地
     var WEBURL = "http://localhost:8081/lubaoWebAPI/";//王永波本地配置，请勿更改
    var WEBURL = "http://localhost:8085/JFAPI/";   //zgq本地
     //var WEBURL = "http://localhost:8081/lubaoWebAPI/";//王永波本地配置，请勿更改
    return WEBURL
}


 WebTM/views/³µ¼ä¹ÜÀí/ίÍ⹤Ðò·¢³öµ¥/Cj_StationEntrustInBill.html

@@ -296,6 +296,7 @@
            //初始基本信息赋值
            $("#HEmpID").val(sessionStorage["Czybm"]);
            $("#HEmp").val(sessionStorage["HUserName"]);
            $("#HMaker").val(sessionStorage["HUserName"]);

            //获取最大单据号
            $.ajax({

 WebTM/views/³µ¼ä¹ÜÀí/ίÍ⹤Ðò½ÓÊÕµ¥/Cj_StationEntrustOutBill.html

@@ -55,7 +55,7 @@
                        <div class="layui-row">
                            <label class="layui-form-label" style="width: 85px;"><span style="color:red;">*</span>条形码</label>
                            <div class="layui-input-block" style="margin-left: 120px;width:46%;">
                                <input type="text" name="" id="" lay-verify="required" placeholder="请键入后回车" autocomplete="off" class="layui-input">
                                <input type="text" name="HBarCode" id="HBarCode" lay-verify="required" placeholder="请键入后回车" autocomplete="off" class="layui-input">
                            </div>
                        </div>
                    </div>
@@ -65,20 +65,20 @@
                            <div class="layui-inline">
                                <label class="layui-form-label" style="width: 85px;">流转卡</label>
                                <div class="layui-input-block" style="margin-left: 120px;">
                                    <input type="text" class="layui-input" name="" id="" style="background-color:#efefef4d;" readonly>
                                    <input type="text" class="layui-input" name="HProcExchBillNo" id="HProcExchBillNo" style="background-color:#efefef4d;" readonly>
                                </div>
                            </div>
                            <div class="layui-inline">
                                <label class="layui-form-label" style="width: 85px;">单据号</label>
                                <div class="layui-input-block" style="margin-left: 120px;">
                                    <input type="text" class="layui-input" name="" id="" style="background-color:#efefef4d;" readonly>
                                    <input type="hidden" name="" id="">
                                    <input type="text" class="layui-input" name="HBillNo" id="HBillNo" style="background-color:#efefef4d;" readonly>
                                    <input type="hidden" name="HInterID" id="HInterID">
                                </div>
                            </div>
                            <div class="layui-inline">
                                <label class="layui-form-label" style="width: 85px;">流水号</label>
                                <div class="layui-input-block" style="margin-left: 120px;">
                                    <input type="text" class="layui-input" name="" id="">
                                    <input type="text" class="layui-input" name="HProcNO" id="HProcNO">
                                </div>
                            </div>
                        </div>
@@ -86,63 +86,72 @@
                            <div class="layui-inline">
                                <label class="layui-form-label" style="width: 85px;">接收时间</label>
                                <div class="layui-input-block" style="margin-left: 120px;">
                                    <input type="text" class="layui-input" value="0" name="" id="">
                                    <input type="text" class="layui-input" name="HStationOutTime" id="HStationOutTime" style="background-color:#efefef4d;" readonly>
                                </div>
                            </div>
                            <div class="layui-inline">
                                <label class="layui-form-label" style="width: 85px;">生产订单</label>
                                <div class="layui-input-block" style="margin-left: 120px;">
                                    <input type="text" class="layui-input" name="" id="" style="background-color:#efefef4d;" readonly>
                                    <input type="hidden" name="" id="">
                                    <input type="text" class="layui-input" name="HICMOBillNo" id="HICMOBillNo" style="background-color:#efefef4d;" readonly>
                                </div>
                            </div>
                            <div class="layui-inline">
                                <label class="layui-form-label" style="width: 85px;">接收数量</label>
                                <div class="layui-input-block" style="margin-left: 120px;">
                                    <input type="text" class="layui-input" name="" id="" style="background-color:#efefef4d;" readonly>
                                    <input type="hidden" name="" id="">
                                    <input type="text" class="layui-input" name="HQty" id="HQty">
                                </div>
                            </div>
                        </div>
                        <div class="layui-row">
                            <div class="layui-inline">
                                <label class="layui-form-label" style="width: 85px;">当前工序</label>
                                <div class="layui-input-block" style="margin-left: 120px;">
                                    <input type="text" class="layui-input" name="" id="" style="background-color:#efefef4d;" readonly>
                                    <input type="text" class="layui-input" name="" id="">
                                <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">当前工序</label>
                                <div class="layui-input-block" style="margin-left: 77px;">
                                    <input type="text" class="layui-input" name="HProcName" id="HProcName" style="background-color:#efefef4d;width: 61%;display: inline-block;" readonly>
                                    <input type="hidden" name="HProcID" id="HProcID" value="0">
                                    <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchProc" id="btnSearchProc" style="padding: 0 10px;float: left;margin-right: 3px;background-color:gainsboro;">
                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="color:black;"></i>
                                    </button>
                                </div>
                            </div>
                            <div class="layui-inline">
                                <label class="layui-form-label" style="width: 85px;">供应商</label>
                                <div class="layui-input-block" style="margin-left: 120px;">
                                    <input type="text" class="layui-input" name="" id="">
                                <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">供应商</label>
                                <div class="layui-input-block" style="margin-left: 77px;">
                                    <input type="text" class="layui-input" name="HSup" id="HSup" style="background-color:#efefef4d;width: 61%;display: inline-block;" readonly>
                                    <input type="hidden" name="HSupID" id="HSupID">
                                    <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchSup" id="btnSearchSup" style="padding: 0 10px;float: left;margin-right: 3px;background-color:gainsboro;">
                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="color:black;"></i>
                                    </button>
                                </div>
                            </div>
                            <div class="layui-inline">
                                <label class="layui-form-label" style="width: 85px;">产品代码</label>
                                <div class="layui-input-block" style="margin-left: 120px;">
                                    <input type="text" class="layui-input" name="" id="" style="background-color:#efefef4d;" readonly>
                                <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">产品代码</label>
                                <div class="layui-input-block" style="margin-left: 77px;">
                                    <input type="text" class="layui-input" name="HMaterNumber" id="HMaterNumber" style="background-color:#efefef4d;width: 61%;display: inline-block;" readonly>
                                    <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchMater" id="btnSearchMater" style="padding: 0 10px;float: left;margin-right: 3px;background-color:gainsboro;">
                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="color:black;"></i>
                                    </button>
                                </div>
                            </div>
                        </div>
                        <div class="layui-row">
                            <div class="layui-inline">
                                <label class="layui-form-label" style="width: 85px;">税率</label>
                                <div class="layui-input-block" style="margin-left: 120px;">
                                    <input type="text" class="layui-input" name="" id="" style="background-color:#efefef4d;" readonly>
                                <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">税率</label>
                                <div class="layui-input-block" style="margin-left: 104px;">
                                    <input type="text" class="layui-input" name="HTaxRate" id="HTaxRate" value="16" style="background-color:#efefef4d;width: 80%;display: inline-block;" readonly>
                                    <span>%</span>
                                </div>
                            </div>
                            <div class="layui-inline">
                                <label class="layui-form-label" style="width: 85px;">产品名称</label>
                                <div class="layui-input-block" style="margin-left: 120px;">
                                    <input type="text" class="layui-input" name="" id="" style="background-color:#efefef4d;" readonly>
                                    <input type="text" class="layui-input" name="HMaterName" id="HMaterName" style="background-color:#efefef4d;" readonly>
                                    <input type="hidden" name="" id="">
                                </div>
                            </div>
                            <div class="layui-inline">
                                <label class="layui-form-label" style="width: 85px;">含税单价</label>
                                <div class="layui-input-block" style="margin-left: 120px;">
                                    <input type="text" class="layui-input" name="" id="" style="background-color:#efefef4d;" readonly>
                                    <input type="text" class="layui-input" name="HPrice" id="HPrice">
                                </div>
                            </div>
                        </div>
@@ -150,19 +159,19 @@
                            <div class="layui-inline">
                                <label class="layui-form-label" style="width: 85px;">规格型号</label>
                                <div class="layui-input-block" style="margin-left: 120px;">
                                    <input type="text" class="layui-input" name="" id="" onmouseover="this.title=this.value" style="background-color:#efefef4d;" readonly>
                                    <input type="text" class="layui-input" name="HMaterModel" id="HMaterModel" onmouseover="this.title=this.value" style="background-color:#efefef4d;" readonly>
                                </div>
                            </div>
                            <div class="layui-inline">
                                <label class="layui-form-label" style="width: 85px;">含税金额</label>
                                <div class="layui-input-block" style="margin-left: 120px;">
                                    <input type="text" class="layui-input" name="" id="">
                                    <input type="text" class="layui-input" name="HMoney" id="HMoney" value="0">
                                </div>
                            </div>
                            <div class="layui-inline">
                                <label class="layui-form-label" style="width: 85px;">不合格数量</label>
                                <div class="layui-input-block" style="margin-left: 120px;">
                                    <input type="text" class="layui-input" name="" id="" style="background-color:#efefef4d;" readonly>
                                    <input type="text" class="layui-input" name="HWasterQty" id="HWasterQty">
                                </div>
                            </div>
                        </div>
@@ -170,19 +179,19 @@
                            <div class="layui-inline">
                                <label class="layui-form-label" style="width: 85px;">订单跟踪号</label>
                                <div class="layui-input-block" style="margin-left: 120px;">
                                    <input type="text" class="layui-input" name="" id="" onmouseover="this.title=this.value" style="background-color:#efefef4d;" readonly>
                                    <input type="text" class="layui-input" name="HOrderProcNO" id="HOrderProcNO" onmouseover="this.title=this.value" style="background-color:#efefef4d;" readonly>
                                </div>
                            </div>
                            <div class="layui-inline">
                                <label class="layui-form-label" style="width: 85px;">送货单号</label>
                                <div class="layui-input-block" style="margin-left: 120px;">
                                    <input type="text" class="layui-input" name="" id="">
                                    <input type="text" class="layui-input" name="HInnerBillNo" id="HInnerBillNo">
                                </div>
                            </div>
                            <div class="layui-inline">
                                <label class="layui-form-label" style="width: 85px;">委外工单号</label>
                                <div class="layui-input-block" style="margin-left: 120px;">
                                    <input type="text" class="layui-input" name="" id="" style="background-color:#efefef4d;" readonly>
                                    <input type="text" class="layui-input" name="HWWWorkOrderBillNo" id="HWWWorkOrderBillNo">
                                </div>
                            </div>
                        </div>
@@ -190,7 +199,7 @@
                            <div class="" style="width: 85%;">
                                <label class="layui-form-label" style="width: 85px;">备注</label>
                                <div class="layui-input-block" style="margin-left: 120px;">
                                    <textarea name="" id="" placeholder="请输入内容" class="layui-textarea"></textarea>
                                    <textarea name="HRemark" id="HRemark" placeholder="请输入内容" class="layui-textarea"></textarea>
                                </div>
                            </div>
                        </div>
@@ -201,19 +210,19 @@
                            <div class="layui-inline">
                                <label class="layui-form-label" style="width: 85px;">发出件数</label>
                                <div class="layui-input-block" style="margin-left: 120px;">
                                    <input type="text" class="layui-input" name="" id="" style="background-color:#efefef4d;" readonly>
                                    <input type="text" class="layui-input" name="HPlanPieceQty" id="HPlanPieceQty" style="background-color:#efefef4d;" readonly>
                                </div>
                            </div>
                            <div class="layui-inline">
                                <label class="layui-form-label" style="width: 85px;">报废个数</label>
                                <div class="layui-input-block" style="margin-left: 120px;">
                                    <input type="text" class="layui-input" name="" id="" style="background-color:#efefef4d;" readonly>
                                    <input type="text" class="layui-input" name="HPieceQty" id="HPieceQty">
                                </div>
                            </div>
                            <div class="layui-inline">
                                <label class="layui-form-label" style="width: 85px;">任务单数量</label>
                                <div class="layui-input-block" style="margin-left: 120px;">
                                    <input type="text" class="layui-input" name="" id="" style="background-color:#efefef4d;" readonly>
                                    <input type="text" class="layui-input" name="HICMOQty" id="HICMOQty" style="background-color:#efefef4d;" readonly>
                                </div>
                            </div>
                        </div>
@@ -221,19 +230,19 @@
                            <div class="layui-inline">
                                <label class="layui-form-label" style="width: 85px;">操作员</label>
                                <div class="layui-input-block" style="margin-left: 120px;">
                                    <input type="text" class="layui-input" name="" id="">
                                    <input type="text" class="layui-input" name="HEmpID" id="HEmpID">
                                </div>
                            </div>
                            <div class="layui-inline">
                                <label class="layui-form-label" style="width: 85px;">报废件数</label>
                                <div class="layui-input-block" style="margin-left: 120px;">
                                    <input type="text" class="layui-input" value="0" name="" id="">
                                    <input type="text" class="layui-input" name="HBadPNL" id="HBadPNL">
                                </div>
                            </div>
                            <div class="layui-inline">
                                <label class="layui-form-label" style="width: 85px;">接收件数</label>
                                <div class="layui-input-block" style="margin-left: 120px;">
                                    <input type="text" class="layui-input" name="" id="" style="background-color:#efefef4d;" readonly>
                                    <input type="text" class="layui-input" name="HPlanQty" id="HPlanQty" style="background-color:#efefef4d;" readonly>
                                    <input type="hidden" value="0" name="" id="">
                                </div>
                            </div>
@@ -242,21 +251,20 @@
                            <div class="layui-inline">
                                <label class="layui-form-label" style="width: 85px;">送货单号</label>
                                <div class="layui-input-block" style="margin-left: 120px;">
                                    <input type="text" class="layui-input" name="" id="" style="background-color:#efefef4d;" readonly>
                                    <input type="text" class="layui-input" name="HSendBillNo" id="HSendBillNo" style="background-color:#efefef4d;" readonly>
                                    <input type="hidden" value="0" name="" id="">
                                </div>
                            </div>
                            <div class="layui-inline">
                                <label class="layui-form-label" style="width: 85px;">生产资源</label>
                                <div class="layui-input-block" style="margin-left: 120px;">
                                    <input type="text" class="layui-input" name="" id="">
                                    <input type="text" class="layui-input" name="HSourceID" id="HSourceID">
                                </div>
                            </div>
                            <div class="layui-inline">
                                <label class="layui-form-label" style="width: 85px;">不含税单价</label>
                                <div class="layui-input-block" style="margin-left: 120px;">
                                    <input type="text" class="layui-input" name="HGroup" id="HGroup" style="background-color:#efefef4d;" readonly>
                                    <input type="hidden" value="0" name="" id="">
                                    <input type="text" class="layui-input" name="HPrice_BHS" id="HPrice_BHS" value="0" style="background-color:#efefef4d;" readonly>
                                </div>
                            </div>
                        </div>
@@ -264,7 +272,7 @@
                            <div class="layui-inline">
                                <label class="layui-form-label" style="width: 85px;">不含税金额</label>
                                <div class="layui-input-block" style="margin-left: 120px;">
                                    <input type="text" class="layui-input" name="HDept" id="HDept" style="background-color:#efefef4d;" readonly>
                                    <input type="text" class="layui-input" name="HMoney_BHS" id="HMoney_BHS" style="background-color:#efefef4d;" readonly>
                                    <input type="hidden" value="0" name="" id="">
                                </div>
                            </div>
@@ -272,7 +280,7 @@
                                <label class="layui-form-label" style="width: 85px;">生产班组</label>
                                <div class="layui-input-block" style="margin-left: 120px;">
                                    <input type="text" class="layui-input" name="HGroup" id="HGroup" style="background-color:#efefef4d;" readonly>
                                    <input type="hidden" value="0" name="" id="">
                                    <input type="hidden" value="0" name="HGroupID" id="HGroupID">
                                </div>
                            </div>
                            <div class="layui-inline">
@@ -313,14 +321,16 @@
            $("#HBarCode").focus();

            //初始基本信息赋值
            $("#HStationOutTime").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));
            $("#HEmpID").val(sessionStorage["Czybm"]);
            $("#HEmp").val(sessionStorage["HUserName"]);
            $("#HMaker").val(sessionStorage["HUserName"]);

            //获取最大单据号
            $.ajax({
                url: GetWEBURL() + "/Web/GetMAXNum",
                type: "GET",
                data: { "HBillType": '3792' },
                data: { "HBillType": '3791' },
                success: function (d) {
                    //console.log(d.data);
                    $("#HInterID").val(d.data[0].HInterID);
@@ -361,9 +371,9 @@
                                    "HOrderProcNO": data.订单跟踪号,
                                    "HStationInTime": Format(new Date(), "yyyy-MM-dd hh:mm:ss"),
                                    "HMoney": 0,
                                    "HProcID": data.HProcID,
                                    "HProcNo": data.工序号,
                                    "HProcNumber": data.工序代码,
                                    //"HProcID": data.HProcID,
                                    //"HProcNo": data.工序号,
                                    //"HProcName": data.工序,
                                    "HSupID": data.HSupID,
                                    "HSup": data.供应商,
                                    "HSourceID": data.HSourceID,
@@ -395,10 +405,6 @@
                });
            })

            //form.on('submit(Saver)', function (data) {
            //    console.log(data.field) //当前容器的全部表单字段，名值对形式：{name: value}
            //});

            //提交
            form.on('submit(Saver)', function (data) {//提交
                //var tableData = data.field;
@@ -406,8 +412,8 @@
                var index = layer.load();
                $.ajax({
                    type: "POST",
                    url: GetWEBURL() + "/Cj_StationEntrustInBill/AddBill",
                    //url:"http://localhost:12761/Cj_StationEntrustInBill/AddBill",
                    url: GetWEBURL() + "/Cj_StationEntrustOutBill/AddBill",
                    //url:"http://localhost:12761/Cj_StationEntrustOutBill/AddBill",
                    async: true,
                    data: { "oMain": oMain },
                    dataType: "json",
@@ -436,10 +442,42 @@
                });
            });

            //选择工序
            form.on('submit(btnSearchProc)', function () {
                layer.msg('禁止选择');
                //layer.open({
                //    type: 2
                //    , area: ['100%', '100%']
                //    , title: '仓库列表'
                //    , shade: 0.6 //遮罩透明度
                //    , maxmin: true //允许全屏最小化
                //    , anim: 0 //0-6的动画形式，-1不开启
                //    , content: ['../../../views/Baseset/基础资料/Gy_ProcList.html?Type=HWHID']
                //    , resize: false
                //    , cancel: function () {
                //    }
                //})
            });

            //选择供应商
            form.on('submit(btnSearchSup)', function () {
                layer.msg('禁止选择');
            });

        //以上为layui模块
            //选择产品
            form.on('submit(btnSearchMater)', function () {
                layer.msg('禁止选择');
            });

            //以上为layui模块
        });

        //返回工序
        function GetHProcValue(obj) {
            $("#HProcName").val(obj[0].HName);
            $("#HProcID").val(obj[0].HItemID);
        }

    </script>
</body>
</html>