1

zzr99

2022-07-07 b7238e3d561370ae89119e7c7ded17f3ed64ff21

1

 WebTM/WebTM.csproj.user

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <NameOfLastUsedPublishProfile>D:\智云MES\Lay-Ui\MESWMS-LayUI\WebTM\Properties\PublishProfiles\JFTM.pubxml</NameOfLastUsedPublishProfile>
    <NameOfLastUsedPublishProfile>JFTM</NameOfLastUsedPublishProfile>
    <ProjectView>ShowAllFiles</ProjectView>
    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
    <UseIISExpress>true</UseIISExpress>

 WebTM/views/index.html

@@ -106,7 +106,7 @@
                    </div>
                    <ul class="layui-nav layui-nav-tree" lay-shrink="all" id="LAY-system-side-menu" lay-filter="layadmin-system-side-menu">
                        <!-- é‡‡è´­ç®¡ç† -->
                        <li data-name="set" class="layui-nav-item">
                        <!--<li data-name="set" class="layui-nav-item">
                            <a><i class="layui-icon layui-icon-set"></i><cite>采购管理</cite></a>
                            <dl class="layui-nav-child">
                                <dd>
@@ -150,9 +150,9 @@
                                    </dl>
                                </dd>
                            </dl>
                        </li>
                        </li>-->
                        <!-- é”€å”®ç®¡ç† -->
                        <li data-name="set" class="layui-nav-item">
                        <!--<li data-name="set" class="layui-nav-item">
                            <a><i class="layui-icon layui-icon-set"></i><cite>销售管理</cite></a>
                            <dl class="layui-nav-child">
                                <dd>
@@ -188,7 +188,7 @@
                                    </dl>
                                </dd>
                            </dl>
                        </li>
                        </li>-->
                        <!-- ä»“存管理 -->
                        <li data-name="set" class="layui-nav-item">
                            <a><i class="layui-icon layui-icon-set"></i><cite>仓存管理</cite></a>
@@ -211,7 +211,7 @@
                                    <dl class="layui-nav-child">
                                        <dd><a lay-href="领料发货/领料出库/Kf_MateOutBillList.html">生产领料单维护</a></dd>
                                        <dd><a lay-href="领料发货/领料出库/Kf_MateOutBackBillList.html">生产退料单维护</a></dd>
                                        <dd><a lay-href="">生产补料单维护n</a></dd>
                                        <!--<dd><a lay-href="">生产补料单维护n</a></dd>-->
                                        <dd><a lay-href="领料发货/销售出库/Kf_SellOutBillList.html">销售出库单维护</a></dd>
                                        <dd><a lay-href="销售管理/销售退货单/Kf_ICStockBillMainList.html">销售退货单维护</a></dd>
                                        <dd><a lay-href="领料发货/其他出库/Kf_OtherOutBillList.html">其他出库单维护</a></dd>
@@ -231,8 +231,17 @@
                                <dd>
                                    <a>条码主档</a>
                                    <dl class="layui-nav-child">
                                        <dd><a lay-href="仓存管理/条码生成/Gy_BarCodeBill.html">条码生成</a></dd>
                                        <!--<dd><a lay-href="仓存管理/条码生成/Gy_BarCodeBill.html">条码生成</a></dd>-->
                                        <dd><a lay-href="模治具管理/模治具管理/Gy_BarCodeBillList.html">条码主档维护</a></dd>
                                    </dl>
                                </dd>
                                <dd>
                                    <a>缓存列表</a>
                                    <dl class="layui-nav-child">
                                        <dd><a lay-href="验收入库/其他入库/Kf_OtherInBill_FastList.html">其他入库单缓存列表</a></dd>
                                        <dd><a lay-href="领料发货/其他出库/Kf_OtherOutBill_FastList.html">其他出库单缓存列表</a></dd>
                                        <dd><a lay-href="仓存管理/仓库调拨/Kf_MoveStockBill_FastList.html">调拨单缓存列表</a></dd>
                                        <dd><a lay-href="领料发货/销售出库/Kf_SellOutBill_FastList.html">销售出库缓存列表</a></dd>
                                    </dl>
                                </dd>
                                <dd>
@@ -247,7 +256,7 @@
                            </dl>
                        </li>
                        <!-- è®¡åˆ’管理 -->
                        <li data-name="set" class="layui-nav-item">
                        <!--<li data-name="set" class="layui-nav-item">
                            <a><i class="layui-icon layui-icon-set"></i><cite>计划管理</cite></a>
                            <dl class="layui-nav-child">
                                <dd>
@@ -290,9 +299,9 @@
                                <dd>
                                <dd><a lay-href="计划管理/工艺路线大类/Gy_RoutingGroupList.html">工艺路线大类</a></dd>
                            </dl>
                        </li>
                        </li>-->
                        <!-- ç”Ÿäº§ç®¡ç† -->
                        <li data-name="set" class="layui-nav-item">
                        <!--<li data-name="set" class="layui-nav-item">
                            <a><i class="layui-icon layui-icon-set"></i><cite>生产管理</cite></a>
                            <dl class="layui-nav-child">
                                <dd>
@@ -372,9 +381,9 @@
                                        <dd>
                                            <a>日计划工单</a>
                                            <dl class="layui-nav-child">
                                                <dd><a lay-href="生产管理/生产日计划工单/JIT_DayPlanBillList.html" style="margin: 0 0 0 13px;">日计划工单列表</a></dd>
                                                <dd><a lay-href="生产管理/生产日计划工单/JIT_DayPlanBillList.html" style="margin: 0 0 0 13px;">日计划工单列表</a></dd>-->
                                                <!--<dd><a lay-href="生产管理/生产日计划工单/JIT_DayPlanBillEdit.html" style="margin: 0 0 0 13px;">日计划工单</a></dd>-->
                                            </dl>
                                            <!--</dl>
                                        </dd>
                                        <dd>
                                            <a>要料计划</a>
@@ -415,9 +424,9 @@
                                    </dl>
                                </dd>
                            </dl>
                        </li>
                        </li>-->
                        <!-- è½¦é—´ç®¡ç† -->
                        <li data-name="set" class="layui-nav-item">
                        <!--<li data-name="set" class="layui-nav-item">
                            <a><i class="layui-icon layui-icon-set"></i><cite>车间管理</cite></a>
                            <dl class="layui-nav-child">
                                <dd>
@@ -488,9 +497,9 @@
                                    </dl>
                                </dd>
                            </dl>
                        </li>
                        </li>-->
                        <!-- è´¨é‡ç®¡ç† -->
                        <li data-name="set" class="layui-nav-item">
                        <!--<li data-name="set" class="layui-nav-item">
                            <a><i class="layui-icon layui-icon-set"></i><cite>质量管理</cite></a>
                            <dl class="layui-nav-child">
                                <dd>
@@ -546,9 +555,9 @@
                                    </dl>
                                </dd>
                            </dl>
                        </li>
                        </li>-->
                        <!-- å™¨å…·ç®¡ç† -->
                        <li data-name="set" class="layui-nav-item">
                        <!--<li data-name="set" class="layui-nav-item">
                            <a><i class="layui-icon layui-icon-set"></i><cite>器具管理</cite></a>
                            <dl class="layui-nav-child">
                                <dd>
@@ -639,9 +648,9 @@
                                    </dl>
                                </dd>
                            </dl>
                        </li>
                        </li>-->
                        <!-- è®¾å¤‡ç®¡ç† -->
                        <li data-name="set" class="layui-nav-item">
                        <!--<li data-name="set" class="layui-nav-item">
                            <a><i class="layui-icon layui-icon-set"></i><cite>设备管理</cite></a>
                            <dl class="layui-nav-child">
                                <dd>
@@ -689,9 +698,9 @@
                                    </dl>
                                </dd>
                            </dl>
                        </li>
                        </li>-->
                        <!-- å·¥èµ„管理 -->
                        <li data-name="set" class="layui-nav-item">
                        <!--<li data-name="set" class="layui-nav-item">
                            <a><i class="layui-icon layui-icon-set"></i><cite>工资管理</cite></a>
                            <dl class="layui-nav-child">
                                <dd>
@@ -762,9 +771,9 @@
                                    </dl>
                                </dd>
                            </dl>
                        </li>
                        </li>-->
                        <!-- å¯è§†åŒ–看板 -->
                        <li data-name="template" class="layui-nav-item">
                        <!--<li data-name="template" class="layui-nav-item">
                            <a href="javascript:;" lay-tips="可视化看板" lay-direction="2">
                                <i class="layui-icon layui-icon-chart-screen"></i>
                                <cite>可视化看板</cite>
@@ -856,8 +865,8 @@
                                    </a>
                                </dd>
                            </dl>
                        </li>
                        <!-- åŸºç¡€å»ºæ¨¡ -->
                        </li>-->
                         <!--基础建模--> 
                        <li data-name="set" class="layui-nav-item">
                            <a><i class="layui-icon layui-icon-set"></i><cite>基础建模</cite></a>
                            <dl class="layui-nav-child">

 WebTM/views/index_Mobile.html

@@ -77,7 +77,7 @@
          </div>
          <ul class="layui-nav layui-nav-tree" lay-shrink="all" id="LAY-system-side-menu" lay-filter="layadmin-system-side-menu" style="width:260p                                                                             x;">
              <!-- è½¦é—´ç®¡ç† -->
              <li data-name="set" class="layui-nav-item">
              <!--<li data-name="set" class="layui-nav-item">
                  <a style="padding-left:20px;">
                      <img src="../layuiadmin/myicon/车间管理.svg" alt="车间管理" style="width:25px;height:25px;margin-right: 5px;" />
                      <cite>车间管理</cite>
@@ -156,9 +156,9 @@
                          </a>
                      </dd>
                  </dl>
              </li>
              </li>-->
              <!-- æ¨¡æ²»å…·ç®¡ç† -->
              <li data-name="set" class="layui-nav-item">
              <!--<li data-name="set" class="layui-nav-item">
                  <a style="padding-left:20px;">
                      <img src="../layuiadmin/myicon/车间管理.svg" alt="车间管理" style="width:25px;height:25px;margin-right: 5px;" />
                      <cite>模治具管理</cite>
@@ -279,7 +279,7 @@
                          </a>
                      </dd>
                  </dl>
              </li>
              </li>-->
              <!-- ä»“储条码管理 -->
              <li data-name="set" class="layui-nav-item">
                  <a style="padding-left:20px;">
@@ -432,7 +432,7 @@
                  </dl>
              </li>
              <!-- è®¾å¤‡ç®¡ç† -->
              <li data-name="set" class="layui-nav-item">
              <!--<li data-name="set" class="layui-nav-item">
                  <a style="padding-left:20px;">
                      <img src="../layuiadmin/myicon/车间管理.svg" alt="车间管理" style="width:25px;height:25px;margin-right: 5px;" />
                      <cite>设备管理</cite>
@@ -463,7 +463,7 @@
                          </a>
                      </dd>
                  </dl>
              </li>
              </li>-->
              <!-- ç¼“存列表 -->
              <li data-name="set" class="layui-nav-item">
                  <a style="padding-left:20px;">

 WebTM/views/¹¤×ʹÜÀí/¹¤×ʽáËãµ¥(¸öÈË)/Pay_SingleBalBillEdit.html

@@ -102,7 +102,7 @@
                                            </div>
                                        </div>
                                        <div class="layui-col-xs4 layui-inline">
                                            <label class="layui-form-label">主管</label>
                                            <label class="layui-form-label">职员</label>
                                            <div class="layui-input-inline">
                                                <input type="text" name="HEmpName" id="HEmpName" readonly class="layui-input" value="" style="float:left;width:150px;">
                                                <input type="hidden" name="HEmpID" id="HEmpID" class="layui-input" value="" style="float:left;width:150px;">
@@ -113,27 +113,27 @@
                                        </div>
                                    </div>
                                    <!--<div class="layui-row">
                                        <div class="layui-col-xs4 layui-inline">
                                            <label class="layui-form-label">源单类型</label>
                                            <div class="layui-input-inline">
                                                <select name="HSourceBillType" lay-filter="aihao" id="HSourceBillType">
                                                    <option value="产品入库单">产品入库单</option>
                                                    <option value="产品入库单(红单)">产品入库单(红单)</option>
                                                    <option value="调拨单">调拨单</option>
                                                    <option value="生产任务单">生产任务单</option>
                                                    <option value="工序汇报单">工序汇报单</option>
                                                    <option value="生产汇报单">生产汇报单</option>
                                                    <option value="手工录入">手工录入</option>
                                                </select>
                                            </div>
                                        </div>
                                        <div class="layui-col-xs4 layui-inline">
                                            <label class="layui-form-label">选单号</label>
                                            <div class="layui-input-inline">
                                                <input class="layui-input" name="Box2" id="Box2" autocomplete="off">
                                            </div>
                                        </div>
                                    </div>-->
        <div class="layui-col-xs4 layui-inline">
            <label class="layui-form-label">源单类型</label>
            <div class="layui-input-inline">
                <select name="HSourceBillType" lay-filter="aihao" id="HSourceBillType">
                    <option value="产品入库单">产品入库单</option>
                    <option value="产品入库单(红单)">产品入库单(红单)</option>
                    <option value="调拨单">调拨单</option>
                    <option value="生产任务单">生产任务单</option>
                    <option value="工序汇报单">工序汇报单</option>
                    <option value="生产汇报单">生产汇报单</option>
                    <option value="手工录入">手工录入</option>
                </select>
            </div>
        </div>
        <div class="layui-col-xs4 layui-inline">
            <label class="layui-form-label">选单号</label>
            <div class="layui-input-inline">
                <input class="layui-input" name="Box2" id="Box2" autocomplete="off">
            </div>
        </div>
    </div>-->
                                    <div class="layui-row">
                                        <div class="layui-col-xs4 layui-inline">
                                            <label class="layui-form-label">工资类型</label>
@@ -157,6 +157,15 @@
                                                <textarea placeholder="请输入维备注" class="layui-textarea" name="HRemark" id="HRemark"></textarea>
                                            </div>
                                        </div>
                                    </div>
                                    <div class="layui-row">
                                        <div class="layui-col-xs4 layui-inline">
                                            <label class="layui-form-label">总金额</label>
                                            <div class="layui-input-inline">
                                                <input type="text" name="HSumMoney" id="HSumMoney" readonly class="layui-input" value="" style="float:left;width:150px;">
                                            </div>
                                        </div>
                                        
                                    </div>
                                </div>
                                <!--制单信息-->
@@ -722,6 +731,7 @@
                                , "HCloseDate": data.关闭日期
                                , "HUpDateDate": data.修改日期
                                , "HDeleteDate": data.作废日期
                                , "HSumMoney": data.总金额
                            });

                        } else {

 WebTM/views/¹¤×ʹÜÀí/¹¤×ʽáËãµ¥(¸öÈË)/Pay_SingleBalBillList.html

@@ -159,6 +159,7 @@
                        , { field: 'HEmpID', title: 'HEmpID', width: 200, hide: true }
                        , { field: 'HEmpNumber', title: '职员代码', width: 180 }
                        , { field: 'HEmpName', title: '职员', width: 125 }
                        , { field: '总金额', title: '总金额', width: 125 }
                        , { field: 'HPayID', title: 'HPayID', width: 200, hide: true }
                        //, { field: '工资代码', title: '工资代码', width: 180 }
                        , { field: '工资类型', title: '工资类型', width: 125 }

 WebTM/views/ÁìÁÏ·¢»õ/ÆäËû³ö¿â/Kf_OtherOutBill_Fast.html

@@ -287,8 +287,8 @@
                    , where: { HBillID: linterid, HBillType: '1206', sWhere: '' }
                    , cols: [[
                        { type: 'radio' }
                        , { field: 'HQty', title: '数量', width: 150 }
                        , { field: 'HQtyMust', title: '应收数量', width: 150 }
                        , { field: 'HQty', title: '重量', width: 150 }
                        , { field: 'HAuxQty', title: '箱数', width: 150, totalRow: true }
                        , { field: 'HMaterNumber', title: '物料代码', width: 150 }
                        , { field: 'HMaterName', title: '物料名称', width: 150 }
                        , { field: 'HMaterModel', title: '规格型号', width: 150 }
@@ -560,8 +560,8 @@
                                    , where: { HBillID: sInterID, HBillType: '1206', sWhere: '' }
                                    , cols: [[
                                        { type: 'radio' }
                                        , { field: 'HQty', title: '数量', width: 80 }
                                        , { field: 'HQtyMust', title: '应收数量', width: 80 }
                                        , { field: 'HQty', title: '重量', width: 150 }
                                        , { field: 'HAuxQty', title: '箱数', width: 150, totalRow: true }
                                        , { field: 'HMaterNumber', title: '物料代码', width: 100 }
                                        , { field: 'HMaterName', title: '物料名称', width: 150 }
                                        , { field: 'HMaterModel', title: '规格型号', width: 100 }
@@ -848,9 +848,11 @@
                elem: '#wl-table'
                , toolbar: '#toolbarDemo'
                , cellMinWidth: 90
                , totalRow: true
                , cols: [[
                    { type: 'radio' }
                    , { field: 'HQty', title: '数量', width: 150 }
                    , { field: 'HQty', title: '重量', width: 150, totalRow: true }
                    , { field: 'HAuxQty', title: '箱数', width: 150, totalRow: true }
                    , { field: 'HQtyMust', title: '应发数量', width: 150 }
                    , { field: 'HMaterNumber', title: '物料代码', width: 150 }
                    , { field: 'HMaterName', title: '物料名称', width: 150 }
@@ -924,7 +926,8 @@
                                , where: { HBillID: sInterID, HBillNo: sBillNo, HBillType: '1206', sMouldManagerCtl: sMouldManagerCtl, sFIFOCtl: sFIFOCtl }
                                , cols: [[
                                    { type: 'radio' }
                                    , { field: 'HQty', title: '数量', width: 150 }
                                    , { field: 'HQty', title: '重量', width: 150 }
                                    , { field: 'HAuxQty', title: '箱数', width: 150, totalRow: true }
                                    , { field: 'HQtyMust', title: '应收数量', width: 150 }
                                    , { field: 'HMaterNumber', title: '物料代码', width: 150 }
                                    , { field: 'HMaterName', title: '物料名称', width: 150 }

 WebTM/views/ÁìÁÏ·¢»õ/ÏúÊÛ³ö¿â/Kf_SellOutBill_Fast.html

@@ -443,6 +443,8 @@
                        $("#HBillNo").val(d.data[0].HBillNo);
                        $("#HBillType").val(d.data[0].HSourceBillType);
                        $("#HSourceBillNo").val(d.data[0].HSourceBillNo);
                        $("#HDeptID").val(result.data[0].HDeptID);
                        $("#HDeptName").val(result.data[0].HDeptName);
                        $("#HSourceBillNo").attr("disabled", "true");
                        HSourceFlag = true;
                        //$("#HWHID").val(d.data[0].HWhID);

 WebTM/views/ÑéÊÕÈë¿â/ÆäËûÈë¿â/Kf_OtherInBill_Fast.html

@@ -1048,9 +1048,12 @@
                elem: '#wl-table'
                , toolbar: '#toolbarDemo'
                , cellMinWidth: 90
                ,limit:3000
                , totalRow: true
                , cols: [[
                    { type: 'radio' }
                    , { field: 'HQty', title: '数量', width: 150 }
                    , { field: 'HQty', title: '重量', width: 150, totalRow: true }
                    , { field: 'HAuxQty', title: '箱数', width: 150, totalRow: true }
                    , { field: 'HQtyMust', title: '应收数量', width: 150 }
                    , { field: 'HMaterNumber', title: '物料代码', width: 150 }
                    , { field: 'HMaterName', title: '物料名称', width: 150 }

 WebTM/views/ÑéÊÕÈë¿â/Í⹺Èë¿â/Kf_POStockInBill_Fast.html

@@ -971,7 +971,7 @@
                    url: GetWEBURL() + "/POStockInBill/get_CheckTypeByBarCode_Json",
                    type: "GET",
                    async: false,
                    data: { "sCode": sBarCode, "sInterID": sInterID, "sBillNo": sBillNo, "sBillType": sBillType, "sMaker": sessionStorage["HUserName"], "WhID": sHWHID, "SPID": sHSPID, "sQty": sQty, "sRedBlue": false, "SourceFlag": HSourceFlag, "sSourceBillNo": sSourceBillNo, "sSourceType": sHBillType, "HOWNERID": sessionStorage["OrganizationID"] },
                    data: { "sCode": sBarCode, "sInterID": sInterID, "sBillNo": sBillNo, "sBillType": sBillType, "sMaker": sessionStorage["HUserName"], "WhID": sHWHID, "SPID": sHSPID, "sQty": sQty, "sRedBlue": false, "SourceFlag": sessionStorage["SourceFlag"], "sSourceBillNo": sSourceBillNo, "sSourceType": sHBillType, "HOWNERID": sessionStorage["OrganizationID"] },
                    success: function (result) {
                        if (result.count == 1) {
                            playSound1();
@@ -1027,8 +1027,8 @@
                                    $("#HSupID").val(result.data.hSupIDField);
                                    //$("#HDeptName").val(result.data.HDept);
                                    //$("#HDeptID").val(result.data.HDeptID);
                                    $("#HSourceBillNo").val(result.data.hSourceBillNoField);
                                    $("#HBillType").val(result.data.hSourceBillTypeField)
                                    //$("#HSourceBillNo").val(result.data.hSourceBillNoField);
                                    //$("#HBillType").val(result.data.hSourceBillTypeField)
                                    HSourceFlag = true;
                                    //获取源单类型、源单单号
                                    if (result.data.hSourceBillTypeField == "1102") {