1

wangyi

4 天以前 cadd1baaae5ae32f5414b0277fabd52d76c8c1ea

1

 WebTM/WebTM.csproj

@@ -472,6 +472,7 @@
    <Content Include="views\基础资料\公用基础资料\Gy_MaterialPackingRelation_Edit.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_ItemMoney.html" />
    <Content Include="views\基础资料\公用基础资料\Cg_ContractTransportBillList.html" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_xiaoweizutuo.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_HGy_BarCodeBill_MiddleBox.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_Sc_ProcessExchangeBillList_stock.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlzuotuo_xiaowei.aspx" />
@@ -2699,6 +2700,13 @@
    <Compile Include="App_Data\MssqlReportData.cs" />
    <Compile Include="App_Data\ReportData.cs" />
    <Compile Include="Properties\AssemblyInfo.cs" />
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_xiaoweizutuo.aspx.cs">
      <DependentUpon>xmlLBM_xiaoweizutuo.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_xiaoweizutuo.aspx.designer.cs">
      <DependentUpon>xmlLBM_xiaoweizutuo.aspx</DependentUpon>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_HGy_BarCodeBill_MiddleBox.aspx.cs">
      <DependentUpon>xmlLBM_HGy_BarCodeBill_MiddleBox.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>

 WebTM/layuiadmin/Scripts/webConfig.js

@@ -7,13 +7,22 @@
    //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //杨乐本地配置
   /*  var WEBURL = "http://localhost:8082/API/";    //杜贺本地配置*/
    //var WEBURL = "http://localhost:8082/API/";    //张瑞广本地配置
<<<<<<< HEAD
=======
   /* var WEBURL = "http://localhost:8080/API/";    //王仪本地配置*/
>>>>>>> a8bfa0587bde2b16c87964720263ba3a0754e1f6
    //var WEBURL = "http://localhost:81/API/"    //翁涛涛本地配置
    var WEBURL = "http://localhost:8080/API/";    //王仪本地配置
// var WEBURL = "http://localhost:81/API/"    //翁涛涛本地配置
    //var WEBURL = "http://localhost:81/API/"    //翁涛涛本地配置
    //var WEBURL = "http://localhost:81/API/"    //翁涛涛本地配置
    //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //杨乐本地配置
<<<<<<< HEAD
   // var WEBURL = "http://localhost:81/API/"    //翁涛涛本地配置
=======

    /*var WEBURL = "http://localhost:81/API/"    //翁涛涛本地配置*/
>>>>>>> a8bfa0587bde2b16c87964720263ba3a0754e1f6
   /* var WEBURL = "http://localhost:8080/API/";    //王仪本地配置*/
  //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //杨乐本地配置
    //var WEBURL = "http://47.96.97.237/API/";          //智云服务器

 WebTM/views/Baseset/HBarPlanPrint.html

@@ -70,6 +70,9 @@
            case "HDepartMent"://部门基础资料打印
                CreateDisplayViewerEx("100%", "100%", "../grf/" + OpenTmp + ".grf", "xmlLBM_Gy_Department_Edit.aspx?linterid=" + value, true, "");
                break;
            case "HGy_BarCodeBill_xiaowei"://部门基础资料打印
                CreateDisplayViewerEx("100%", "100%", "../grf/" + OpenTmp + ".grf", "xmlLBM_xiaoweizutuo.aspx?linterid=" + value, true, "");
                break;
            //case "HPOOrderBill"://采购订单单打印
            //    CreateDisplayViewerEx("100%", "100%", "../../views/grf/" + OpenTmp + ".grf", "xmlSRM_POInStockBill.aspx?linterid=" + value, true, "");
            //    break;

 WebTM/views/Baseset/»ù´¡×ÊÁÏ/saomazutuo_xiaowei.html

@@ -539,7 +539,7 @@
                                resolve({
                                    HMaterID: data[0].HMaterID,
                                    HMaterNumber: data[0].HMaterNumber,
                                    HMaterName: data[0].HMaterName,
                                    HMaterName: data[0].HMaterName_m,
                                    HMaterModel: data[0].HMaterModel
                                });
                            } else {

 WebTM/views/WMSɨÂëÄ£¿é/¿â´æתÒÆ/kf_InventoryTransfer.html

@@ -49,7 +49,8 @@

                    <!-- è½¬ç§»æ¨¡å¼é€‰æ‹©æŒ‰é’® -->
                    <div class="transfer-mode-buttons">
                        <button type="button" class="layui-btn layui-btn-primary layui-btn-sm" id="btnCarWarehouseTransfer">小车-仓库绑定</button>
                        <button type="button" class="layui-btn layui-btn-primary layui-btn-sm" id="btnCarWarehouseTransfer">小车-仓库(入库)绑定</button>
                        <button type="button" class="layui-btn layui-btn-primary layui-btn-sm" id="btnCarWarehouseTransfer2">小车-仓库(出库)绑定</button>
                        <button type="button" class="layui-btn layui-btn-primary layui-btn-sm" id="btnCarTransfer">小车转移</button>
                        <button type="button" class="layui-btn layui-btn-primary layui-btn-sm" id="btnWarehouseTransfer">仓库转移</button>
                    </div>
@@ -184,7 +185,7 @@
                                                <input type="hidden" name="HStockOrgID" id="HStockOrgID" lay-verify="HStockOrgID" value="0" autocomplete="off" class="layui-input">
                                            </div>
                                        </div>
                                    </div>
                                    </div>cmdBind
                                </div>
                                <!--上架信息-->
                                <div class="layui-tab-item">
@@ -254,7 +255,7 @@
            var OperationType = params[params[0]] == null ? 1 : params[params[0]];  //从缓存列表中返回数据类型（1新增、2从缓存列表中返回）
            var HInterID_Temp = params[params[1]];      //从缓存列表中返回单据ID
            var HBillNo_Temp = params[params[2]];       //从缓存列表中返回单据号

            var bindsignal = 0;
            //#endregion

            // åˆå§‹åŒ–转移模式
@@ -276,6 +277,12 @@

            $('#btnCarWarehouseTransfer').on('click', function() {
                setTransferMode('car_warehouse');
                $(this).addClass('layui-btn-active').siblings().removeClass('layui-btn-active');
                setOrigin();
            });
            $('#btnCarWarehouseTransfer2').on('click', function () {
                setTransferMode('car_warehouse');
                bindsignal = 1;
                $(this).addClass('layui-btn-active').siblings().removeClass('layui-btn-active');
                setOrigin();
            });
@@ -1125,7 +1132,7 @@
                    type: "GET",
                    url: GetWEBURL() + "/WEBSController/BindCarAndWH",
                    async: false,    //async用于控制（false）同步和（true）异步，默认的是true，即请求默认的是异步请求
                    data: {  "HMaker": HMaker, "HWhID": sHWHID, "HSPID": sHSPID, "HCarBarCode": sCarBarCode, "HStockOrgID": HStockOrgID },
                    data: { "HMaker": HMaker, "HWhID": sHWHID, "HSPID": sHSPID, "HCarBarCode": sCarBarCode, "HStockOrgID": HStockOrgID, "bindsignal": bindsignal },
                    success: function (result) {
                        if (result.count == 1) {
                            playSound_OK();

 WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/xmlLBM_xiaoweizutuo.aspx

New file
@@ -0,0 +1,29 @@
<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="xmlLBM_xiaoweizutuo.aspx.cs" Inherits="WebTM.views.基础资料.公用基础资料.xmlLBM_EquipFileMainBill" %>

<!DOCTYPE html>

<html xmlns="http://www.w3.org/1999/xhtml">
<head runat="server">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
    <title></title>
     <script runat="server"> 
    protected void Page_Load(object sender, EventArgs e)
    {
        //★特别提示★：
        //不同的数据库应该选用不同的报表XML数据生成类，SQL Server数据库用SqlXMLReportData，Oracle数据库用OracleXMLReportData
        //OledbXMLReportData适合于Access等本地数据库，为了演示方便，这里从Grid++Report的Access例子数据库中获取报表数据

        //OledbXMLReportData.GenOneRecordset(this, "select * from Customers order by CustomerID");
        //SqlXMLReportData.GenOneRecordset(this, "select * from h_v_Kf_POStockInBillList_K3 where hmainid=1781");
        //SqlXMLReportData.GenOneRecordset(this, "select * from h_v_Gy_EquipFileMainList where hmainid=" + Request.Params["linterid"]);
        SqlXMLReportData.GenEntireData(this, "select a.HInterID,HBarCode_Pack æ ˆæ¿ç ,HBarCode ä¸­ç®±ç ,b.hnumber ç‰©æ–™ä»£ç ,b.hname ç‰©æ–™åç§° from Sc_PackUnionBillsub a left join Gy_Material b on a.HMaterID = b. hitemid  where HBarCode_Pack in (" + Request.Params["linterid"] + ") ", "select 1");
    }
</script>
</head>
<body>
    <form id="form1" runat="server">
        <div>
        </div>
    </form>
</body>
</html>

 WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/xmlLBM_xiaoweizutuo.aspx.cs

New file
@@ -0,0 +1,17 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;

namespace WebTM.views.基础资料.公用基础资料
{
    public partial class xmlLBM_xiaoweizutuo : System.Web.UI.Page
    {
        protected void Page_Load(object sender, EventArgs e)
        {

        }
    }
}

 WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/xmlLBM_xiaoweizutuo.aspx.designer.cs

New file
@@ -0,0 +1,26 @@
//------------------------------------------------------------------------------
// <自动生成>
//     æ­¤ä»£ç ç”±å·¥å…·ç”Ÿæˆã€‚
//
//     å¯¹æ­¤æ–‡ä»¶çš„更改可能导致不正确的行为，如果
//     é‡æ–°ç”Ÿæˆä»£ç ï¼Œåˆ™æ‰€åšæ›´æ”¹å°†ä¸¢å¤±ã€‚
// </自动生成>
//------------------------------------------------------------------------------

namespace WebTM.views.基础资料.公用基础资料
{


    public partial class xmlLBM_EquipFileMainBill
    {

        /// <summary>
        /// form1 æŽ§ä»¶ã€‚
        /// </summary>
        /// <remarks>
        /// è‡ªåŠ¨ç”Ÿæˆçš„字段。
        /// è‹¥è¦è¿›è¡Œä¿®æ”¹ï¼Œè¯·å°†å­—段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
    }
}

 WebTM/views/³µ¼ä¹ÜÀí/±¨±í·ÖÎö/Kf_WorkShopICStockBillList.html

@@ -38,7 +38,7 @@
                                            <option value="" selected="selected">全部</option>
                                            <option value="1253">上架</option>
                                            <option value="1252">下架</option>
                                            <option value="小车绑定">小车绑定</option>
                                            <option value="小车入库绑定">小车绑定</option>
                                            <option value="小车转移">小车转移</option>
                                            <option value="仓库转移">仓库转移</option>
                                            <option value="10004">小车锁定</option>

 WebTM/views/²É¹º¹ÜÀí/²É¹º¶©µ¥/Cg_POOrderBillEdit.html

@@ -1392,11 +1392,11 @@
                    layer.msg("请选择币别！", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" }); 
                    return; //return; é˜»æ­¢å‡½æ•°ç»§ç»­æ‰§è¡Œ
                }
                if ($("#HExRate").val() == 0) {
                     //提示请输入汇率，警示标志为5，选择按钮及按钮名称 ï¼Œæ—¶é—´ä¸º100秒  ï¼Œoffset: 't'和skin: 'layui-layer-lan'分别用于调整消息框的位置和样式  æ ‡é¢˜ä¸ºâ€™æ¸©é¦¨æç¤ºâ€˜
                    layer.msg("请输入汇率！", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return;
                }
                //if ($("#HExRate").val() == 0) {
                //     //提示请输入汇率，警示标志为5，选择按钮及按钮名称 ï¼Œæ—¶é—´ä¸º100秒  ï¼Œoffset: 't'和skin: 'layui-layer-lan'分别用于调整消息框的位置和样式  æ ‡é¢˜ä¸ºâ€™æ¸©é¦¨æç¤ºâ€˜
                //    layer.msg("请输入汇率！", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                //    return;
                //}
                //处理采购方式和结算方式值防止后端int转sting报错
                if ($("#HPSStyleID").val() == "" || $("#HPSStyleID").val() == null) {
                    $("#HPSStyleID").val(0)