diff --git a/WMS-BS/NFine.Application/WMS/BasicSettingsApp.cs b/WMS-BS/NFine.Application/WMS/BasicSettingsApp.cs
index f09e514..abbb285 100644
--- a/WMS-BS/NFine.Application/WMS/BasicSettingsApp.cs
+++ b/WMS-BS/NFine.Application/WMS/BasicSettingsApp.cs
@@ -1731,23 +1731,28 @@ Values(NEWID(),'{0}','{1}','{2}','{3}','{4}','{5}','{6}','{7}','{8}','{9}','{10}
         /// <returns></returns>
         public string InsertICSContainer(string keyValue)
         {
-            var queryParam = keyValue.ToJObject();
+            string msg = "";
+            try
+            {
+                var queryParam = keyValue.ToJObject();
             string MUSER = NFine.Code.OperatorProvider.Provider.GetCurrent().UserCode;
             string MUSERNAME = NFine.Code.OperatorProvider.Provider.GetCurrent().UserName;
             string WorkPoint = NFine.Code.OperatorProvider.Provider.GetCurrent().Location;
-            string msg = "";
+           
             string sql = string.Empty;
-            sql = @"INSERT INTO dbo.ICSContainer
+            sql = @"IF EXISTS(select ContainerCODE from ICSContainer where ContainerCODE='{1}' )
+	                                         RAISERROR('容器：{1}，已存在！',16,1)
+                            else
+                            INSERT INTO dbo.ICSContainer
                             ( ID ,ContainerID ,ContainerCODE ,ContainerName,Memo,MTIME,MUSER ,MUSERName ,WorkPoint ) 
 											Values(NEWID(),'{0}','{1}','{2}','{3}',GETDATE(),'{4}','{5}','{6}')
 ";
             sql = string.Format(sql, queryParam["ContainerID"].ToString(), queryParam["ContainerCODE"].ToString(), queryParam["ContainerName"].ToString(), queryParam["Memo"].ToString(), MUSER, MUSERNAME, WorkPoint);
-            try
-            {
+           
                 if (SqlHelper.ExecuteNonQuery(sql) > 0)
                 {
 
-                }
+                } 
                 else
                 {
                     msg = "新增失败";
@@ -2579,6 +2584,171 @@ SELECT DISTINCT a.ID,a.ContainerName FROM dbo.ICSContainer a ";
             return Repository().ExecuteBySql(Str);
         }
 
+        //包装容器
+        public DataTable GetSendContainer(ref Pagination jqgridparam, string queryJson)
+        {
+            DataTable dt = new DataTable();
+            var queryParam = queryJson.ToJObject();
+            List<DbParameter> parameter = new List<DbParameter>();
+            string sql = @"select top 0 ID,ContainerID,ContainerCode,ContainerName,Memo,MUSER,MUSERName,MTIME,WorkPoint from ICSContainer";
+            sql += " WHERE 1=1";
+          
+            sql = string.Format(sql);
+           
+            return Repository().FindTablePageBySql(sql.ToString(), parameter.ToArray(), ref jqgridparam);
+        }
+
+        public DataTable GetContainerInfo(string Code)
+        {
+            DataTable dt = new DataTable();
+            //var queryParam = queryJson.ToJObject();
+            List<DbParameter> parameter = new List<DbParameter>();
+            string sql = @"	select ID,ContainerID,ContainerCode,ContainerName,Memo,MUSER,MUSERName,MTIME,WorkPoint from ICSContainer where ContainerCode='{0}'";
+            sql = string.Format(sql, Code);
+            return Repository().FindTableBySql(sql.ToString());
+        }
+        
+        public DataTable GetBindContainerID(string SireCode)
+        {
+            DataTable dt = new DataTable();
+            //var queryParam = queryJson.ToJObject();
+            List<DbParameter> parameter = new List<DbParameter>();
+            string sql = @"	select ID from ICSContainer where ContainerCode='{0}'";
+            sql = string.Format(sql, SireCode);
+            return Repository().FindTableBySql(sql.ToString());
+        }
+
+
+
+        public string BindingContainerID(string ICSMTDOC, string SireID)
+        {
+            string msg = "";
+            try
+            {
+                string MUSER = NFine.Code.OperatorProvider.Provider.GetCurrent().UserCode;
+            string MUSERNAME = NFine.Code.OperatorProvider.Provider.GetCurrent().UserName;
+            string WorkPoint = NFine.Code.OperatorProvider.Provider.GetCurrent().Location;
+            
+            string sql = string.Empty;
+            JArray res = (JArray)JsonConvert.DeserializeObject(ICSMTDOC);
+            foreach (var item in res)
+            {
+                JObject jo = (JObject)item;
+                sql += @"
+                            IF NOT EXISTS(SELECT ContainerCode FROM ICSContainer  WHERE ContainerCode='{1}'  )
+                            BEGIN
+                             RAISERROR('容器：{1} 不存在！',16,1);
+                                RETURN
+                            END
+                            IF  EXISTS(select ContainerID from ICSContainer where ContainerCode='{1}' and isnull(ContainerID,'')<>'')
+                            BEGIN
+                             RAISERROR('容器：{1}，已绑定父容器！',16,1);
+                                RETURN
+                            END
+                            update ICSContainer  set ContainerID='{0}' WHERE ContainerCode = '{1}' and WorkPoint ='{2}'";
+                sql = string.Format(sql, SireID, jo["ContainerCode"].ToString(), WorkPoint);
+            }
+            
+                if (SqlHelper.CmdExecuteNonQueryLi(sql) > 0)
+                {
+
+                }
+                else
+                {
+                    msg = "绑定失败";
+                }
+            }
+            catch (Exception ex)
+            {
+                msg = ex.Message;
+            }
+
+            return msg;
+        }
+
+        //包装容器关联条码
+        public DataTable GetSendContainerLot(ref Pagination jqgridparam, string queryJson)
+        {
+            DataTable dt = new DataTable();
+            var queryParam = queryJson.ToJObject();
+            List<DbParameter> parameter = new List<DbParameter>();
+            string sql = @"
+							select top 0 a.ID, a.LotNo,a.InvCode,b.InvName,b.InvStd,b.InvUnit, a.ProductDate,a.Quantity from ICSInventoryLot a 
+							left join ICSInventory b on a.InvCode=b.InvCode and a.WorkPoint=b.WorkPoint";
+
+            sql = string.Format(sql);
+
+            return Repository().FindTablePageBySql(sql.ToString(), parameter.ToArray(), ref jqgridparam);
+        }
+
+        
+
+        public DataTable GetContainerLotInfo(string LotNo)
+        {
+            DataTable dt = new DataTable();
+            //var queryParam = queryJson.ToJObject();
+            List<DbParameter> parameter = new List<DbParameter>();
+            string sql = @"	select a.ID, a.LotNo,a.InvCode,b.InvName,b.InvStd,b.InvUnit, a.ProductDate,a.Quantity from ICSInventoryLot a 
+							left join ICSInventory b on a.InvCode=b.InvCode and a.WorkPoint=b.WorkPoint where a.LotNo='{0}'";
+            sql = string.Format(sql, LotNo);
+            return Repository().FindTableBySql(sql.ToString());
+        }
+
+        
+        public string BindingContainerLotID(string ICSMTDOC, string SireID,string SireCode)
+        {
+            string msg = "";
+            try
+            {
+                string MUSER = NFine.Code.OperatorProvider.Provider.GetCurrent().UserCode;
+                string MUSERNAME = NFine.Code.OperatorProvider.Provider.GetCurrent().UserName;
+                string WorkPoint = NFine.Code.OperatorProvider.Provider.GetCurrent().Location;
+
+                string sql = string.Empty;
+                JArray res = (JArray)JsonConvert.DeserializeObject(ICSMTDOC);
+                foreach (var item in res)
+                {
+                    JObject jo = (JObject)item;
+                    sql += @"
+                            IF NOT EXISTS(SELECT ContainerCode FROM ICSContainer  WHERE ContainerCode='{5}')
+                            BEGIN
+                             RAISERROR('容器：{5} 不存在！',16,1);
+                                RETURN
+                            END
+                            IF NOT EXISTS(select LotNo from ICSInventoryLot where LotNo='{1}')
+                            BEGIN
+                             RAISERROR('条码：{1}，不存在！',16,1);                 
+                                RETURN
+                            END
+                            IF EXISTS(select LotNo from ICSContainerLot where LotNo ='{1}')
+                            BEGIN
+                             RAISERROR('条码：{1}，已绑定容器！',16,1);
+                                RETURN
+                           END 
+                          INSERT INTO ICSContainerLot
+                        (ID,ContainerID,LotNo,MUSER,MUSERName,WorkPoint,MTIME ) 
+                        Values(NEWID(),'{0}','{1}','{2}','{3}','{4}',getdate())";
+                    sql = string.Format(sql, SireID, jo["LotNo"].ToString(), MUSER, MUSERNAME, WorkPoint, SireCode);
+                }
+
+                if (SqlHelper.CmdExecuteNonQueryLi(sql) > 0)
+                {
+
+                }
+                else
+                {
+                    msg = "绑定失败";
+                }
+            }
+            catch (Exception ex)
+            {
+                msg=ex.Message;
+            }
+
+            return msg;
+        }
+
+
     }
 }
 
diff --git a/WMS-BS/NFine.Web/Areas/WMS/Controllers/BasicSettingsController.cs b/WMS-BS/NFine.Web/Areas/WMS/Controllers/BasicSettingsController.cs
index 7d2625f..efe9d87 100644
--- a/WMS-BS/NFine.Web/Areas/WMS/Controllers/BasicSettingsController.cs
+++ b/WMS-BS/NFine.Web/Areas/WMS/Controllers/BasicSettingsController.cs
@@ -185,6 +185,15 @@ namespace NFine.Web.Areas.WMS.Controllers
         {
             return View();
         }
+
+        
+        //包装容器绑定
+        [HttpGet]
+        public ActionResult ICSContainerBinding()
+        {
+            return View();
+        }
+
         [HttpGet]
 
         //不良代码
@@ -361,6 +370,12 @@ namespace NFine.Web.Areas.WMS.Controllers
         {
             return View();
         }
+        
+       [HttpGet]
+        public ActionResult ICSContainerLotBinding()
+        {
+            return View();
+        }
 
         //    public ActionResult DownloadExcl(int day)
         //    {
@@ -2075,6 +2090,110 @@ namespace NFine.Web.Areas.WMS.Controllers
                 return Error("上传失败");
             }
         }
+
+        //包装容器
+       public ActionResult GetSendContainer(Pagination pagination, string queryJson)
+        {
+            DataTable ListData = App.GetSendContainer(ref pagination, queryJson);
+            var JsonData = new
+            {
+                total = pagination.total,
+                page = pagination.page,
+                records = pagination.records,
+                rows = ListData,
+            };
+            return Content(JsonData.ToJson());
+        }
+
+        
+        [HttpGet]
+        [HandlerAjaxOnly]
+        public ActionResult GetContainerInfo(string Code)
+
+        {
+            DataTable ListData = App.GetContainerInfo(Code);
+            var JsonData = new
+            {
+                rows = ListData,
+            };
+            return Content(JsonData.ToJson());
+        }
+
+
+        
+        [HttpGet]
+        [HandlerAjaxOnly]
+        public ActionResult GetBindContainerID(string SireCode)
+        {
+            DataTable ListData = App.GetBindContainerID(SireCode);
+            var JsonData = new
+            {
+                rows = ListData,
+            };
+            return Content(JsonData.ToJson());
+        }
+
+
+
+        [HttpPost]
+        [HandlerAjaxOnly]
+        public ActionResult BindingContainerID(string ICSMTDOC, string SireID)
+        {
+            string msg = App.BindingContainerID(ICSMTDOC, SireID);
+            if (!string.IsNullOrEmpty(msg))
+            {
+                return Error(msg);
+            }
+            else
+            {
+                return Success("绑定成功！");
+            }
+        }
+
+        //包装容器关联条码
+     public ActionResult GetSendContainerLot(Pagination pagination, string queryJson)
+        {
+            DataTable ListData = App.GetSendContainerLot(ref pagination, queryJson);
+            var JsonData = new
+            {
+                total = pagination.total,
+                page = pagination.page,
+                records = pagination.records,
+                rows = ListData,
+            };
+            return Content(JsonData.ToJson());
+        }
+
+        
+        [HttpGet]
+        [HandlerAjaxOnly]
+        public ActionResult GetContainerLotInfo(string LotNo)
+
+        {
+            DataTable ListData = App.GetContainerLotInfo(LotNo);
+            var JsonData = new
+            {
+                rows = ListData,
+            };
+            return Content(JsonData.ToJson());
+        }
+
+
+        
+        [HttpPost]
+        [HandlerAjaxOnly]
+        public ActionResult BindingContainerLotID(string ICSMTDOC, string SireID,string SireCode)
+        {
+            string msg = App.BindingContainerLotID(ICSMTDOC, SireID, SireCode);
+            if (!string.IsNullOrEmpty(msg))
+            {
+                return Error(msg);
+            }
+            else
+            {
+                return Success("绑定成功！");
+            }
+        }
     }
 }
 
diff --git a/WMS-BS/NFine.Web/Areas/WMS/Views/BasicSettings/ICSContainer.cshtml b/WMS-BS/NFine.Web/Areas/WMS/Views/BasicSettings/ICSContainer.cshtml
index 201e249..945d2b6 100644
--- a/WMS-BS/NFine.Web/Areas/WMS/Views/BasicSettings/ICSContainer.cshtml
+++ b/WMS-BS/NFine.Web/Areas/WMS/Views/BasicSettings/ICSContainer.cshtml
@@ -639,6 +639,20 @@
             }
         });
 
+    }
+    function btn_Binding() {
+        debugger;
+        $.modalOpen({
+            id: "ICSConfigurationABinding",
+            title: "绑定容器",
+            url: "/WMS/BasicSettings/ICSContainerBinding" + "?" + Math.random(),
+            width: "1000px",
+            height: "800px",
+            callBack: function (iframeId) {
+                top.frames[iframeId].submitForm();
+            }
+        });
+
     }
     //删除库位
     function btn_Delete() {
@@ -810,6 +824,7 @@
             <a id="NF-Create" authorize="yes" class="btn btn-primary dropdown-text" onclick="btn_Create()"><i class="fa fa-pencil-square-o"></i>新增</a>
             <a id="NF-Delete" authorize="yes" class="btn btn-primary dropdown-text" onclick="btn_Delete()"><i class="fa fa-pencil-square-o"></i>删除</a>
             <a id="NF-Update" authorize="yes" class="btn btn-primary dropdown-text" onclick="btn_Update()"><i class="fa fa-pencil-square-o"></i>修改</a>
+            <a id="NF-Binding" authorize="yes" class="btn btn-primary dropdown-text" onclick="btn_Binding()"><i class="fa fa-pencil-square-o"></i>绑定</a>
             <a id="NF-ExportAll" authorize="yes" class="btn btn-primary dropdown-text" onclick="btn_ExportAll()"><i class="fa fa-download"></i>全部导出</a>
             <a id="NF-Print" authorize="yes" class="btn btn-primary dropdown-text" onclick="btn_Print()"><i class="fa fa-print"></i>打印</a>
             <a href="~/File/Stack/库位资料导入模板.xlsx" id="NF-IntroductionMould" authorize="yes" class="btn btn-primary dropdown-text" onclick="btn_IntroductionMould()"><i class="fa fa-file-excel-o"></i>导入模板下载</a>
diff --git a/WMS-BS/NFine.Web/Areas/WMS/Views/BasicSettings/ICSContainerBinding.cshtml b/WMS-BS/NFine.Web/Areas/WMS/Views/BasicSettings/ICSContainerBinding.cshtml
new file mode 100644
index 0000000..97436ea
--- /dev/null
+++ b/WMS-BS/NFine.Web/Areas/WMS/Views/BasicSettings/ICSContainerBinding.cshtml
@@ -0,0 +1,192 @@
+
+@{
+    ViewBag.Title = "Index";
+    Layout = "~/Views/Shared/_Index.cshtml";
+}
+
+
+<script>
+
+    
+    $(function () {
+
+        gridList();
+        SireCodeBinding();
+        CodeBinding();
+    });
+
+
+    function gridList() {
+
+        var $gridList = $("#gridList");
+        $gridList.dataGrid({
+            url: "/WMS/BasicSettings/GetSendContainer?" + Math.random(),
+            height: $(window).height() -50,
+            width: $(window).width() - 400,
+            cellEdit: true,
+            cellsubmit: "clientArray",
+            colModel: [
+                { label: "主键", name: "ID", hidden: true, key: true },
+                  {
+                      label: '删除', width: 100, align: 'left',
+                      formatter: btnLook
+                  },
+                { label: '父容器唯一标识', name: 'ContainerID', width: 120, align: 'left' },
+                { label: '容器代码', name: 'ContainerCode', width: 150, align: 'left' },
+                { label: '容器名称', name: 'ContainerName', width: 100, align: 'left' },
+                { label: '备注', name: 'Memo', width: 200, align: 'left' },
+                { label: '操作人', name: 'MUSER', width: 200, align: 'left' },
+                { label: '操作人姓名', name: 'MUSERName', width: 200, align: 'left' },
+                { label: '操作时间', name: 'MTIME', width: 200, align: 'left' },
+                { label: '站点', name: 'WorkPoint', width: 200, align: 'left' },
+            ],
+            afterSaveCell: function (rowid, cellname, value) {
+                if (cellname === 'ProjectCN') {
+                    $gridList.jqGrid("setCell", rowid, 'ProjectID', value);
+                }
+            },
+            width: "100%",
+
+            autowidth: true,
+            rownumbers: true,
+            viewrecords: true,
+        });
+    }
+  
+    function btnLook(cellvalue, options, rowObject) {
+        return cellvalue = "<a class=\"btn btn-primary dropdown-text\" onclick=\"UpLoadClick('" + rowObject.ID + "')\">删除</a>";
+    }
+
+    function UpLoadClick(ID) {
+        $("#gridList").delRowData(ID);
+    }
+
+    function SireCodeBinding() {
+        $("#SireCode").keydown(function (e) {
+            var curKey = e.which;
+            debugger;
+            if (curKey == 13) {
+                var SireCode = $("#SireCode").val();//需绑定容器
+                $.ajax({
+                    url: "/WMS/BasicSettings/GetBindContainerID?SireCode=" + SireCode,
+                    dataType: "json",
+                    async: false,
+                    success: function (data) {
+                        debugger;
+                        if (data == "" || data == null) {
+                            $.modalAlert("未查询到该容器信息！");
+                            return;
+                        }
+                        $("#SireID").val(data.rows[0].ID);
+                        $("#Code").focus();
+                    }
+                });
+            }
+        });
+    };
+
+
+    function CodeBinding() {
+        $("#Code").keydown(function (e) {
+            var curKey = e.which;
+            debugger;
+            if (curKey == 13) {
+                var Code = $("#Code").val();//需绑定容器
+                $.ajax({
+                    url: "/WMS/BasicSettings/GetContainerInfo?Code=" + Code,
+                    dataType: "json",
+                    async: false,
+                    success: function (data) {
+                        debugger;
+                        if (data == "" || data == null) {
+                            $.modalAlert("未查询到该容器信息！");
+                            return;
+                        }
+                        //最后一行新增数据
+                        var obj = {
+                            ID: data.rows[0].ID,
+                            ContainerID: data.rows[0].ContainerID,
+                            ContainerCode: data.rows[0].ContainerCode,
+                            ContainerName: data.rows[0].ContainerName,
+                            Memo: data.rows[0].Memo,
+                            MUSER: data.rows[0].MUSER,
+                            MUSERName: data.rows[0].MUSERName,
+                            MTIME: data.rows[0].MTIME,
+                            WorkPoint: data.rows[0].WorkPoint,
+                        };
+                        $("#gridList").jqGrid('addRowData', obj.ID, obj, 'first');
+                        $(".unwritten").hide();
+                    }
+                });
+            }
+        });
+    };
+
+
+
+    function submitForm() {
+        debugger;
+        var SireID = $("#SireID").val();
+        var ICSMTDOC = [];
+        var obj_Item1 = $("#gridList");
+        var rowIds_Item1 = obj_Item1.getDataIDs();
+        if (rowIds_Item1.length > 0) {
+            for (var i = 0; i < rowIds_Item1.length; i++) {
+                var RowData_Item1 = obj_Item1.getRowData(rowIds_Item1[i]);
+                var obj = {
+                    ID: RowData_Item1.ID,
+                    ContainerCode: RowData_Item1.ContainerCode,
+                };
+                ICSMTDOC.push(obj);
+            }
+          
+        }
+        debugger;
+        $.modalConfirm("确定绑定吗？", function (r) {
+            if (r) {
+                $.submitForm({
+                    url: "/WMS/BasicSettings/BindingContainerID?SireID=" + SireID + "&" + Math.random(),
+                    param: { ICSMTDOC: JSON.stringify(ICSMTDOC) },
+                    success: function () {
+                        $.currentWindow().$("#gridList").trigger("reloadGrid");
+                    }
+                })
+            }
+        });
+
+
+    }
+
+</script>
+
+<form id="form1">
+
+    <div style="padding-top: 20px; margin-right: 20px;">
+        <table class="form">
+            <tr>
+                <th class="formTitle">父容器:</th>
+                <td class="formValue">
+                    <input id="SireCode" type="text" class="form-control" style="width: 300px;" οnkeydοwn="SireCodeBinding()"/>
+                    <input id="SireID" type="text" class="form-control" style="display:none" οnkeydοwn="SireCodeBinding()" />
+                </td>
+                <th class="formTitle">需绑定容器:</th>
+                <td class="formValue">
+                    <input id="Code" type="text" class="form-control" style="width: 300px;" οnkeydοwn="CodeBinding()" />
+                </td>
+            </tr>
+        </table>
+    </div>
+</form>
+<!--色牢度-->
+<div class="gridPanel" style="width: 100% ">
+    <div class="ibox-title">
+        子表
+    </div>
+    <div class="gridPanel">
+        <table id="gridList"></table>
+    </div>
+</div>
+
+
+
+
diff --git a/WMS-BS/NFine.Web/Areas/WMS/Views/BasicSettings/ICSContainerLot.cshtml b/WMS-BS/NFine.Web/Areas/WMS/Views/BasicSettings/ICSContainerLot.cshtml
index 93154ad..f58e264 100644
--- a/WMS-BS/NFine.Web/Areas/WMS/Views/BasicSettings/ICSContainerLot.cshtml
+++ b/WMS-BS/NFine.Web/Areas/WMS/Views/BasicSettings/ICSContainerLot.cshtml
@@ -640,6 +640,24 @@
         });
 
     }
+
+    function btn_Binding() {
+        debugger;
+        $.modalOpen({
+            id: "ICSConfigurationLotBinding",
+            title: "绑定容器",
+            url: "/WMS/BasicSettings/ICSContainerLotBinding" + "?" + Math.random(),
+            width: "1000px",
+            height: "800px",
+            callBack: function (iframeId) {
+                top.frames[iframeId].submitForm();
+            }
+        });
+
+    }
+
+
+
     //删除库位
     function btn_Delete() {
         debugger;
@@ -809,6 +827,7 @@
             <a id="NF-Create" authorize="yes" class="btn btn-primary dropdown-text" onclick="btn_Create()"><i class="fa fa-pencil-square-o"></i>新增</a>
             <a id="NF-Delete" authorize="yes" class="btn btn-primary dropdown-text" onclick="btn_Delete()"><i class="fa fa-pencil-square-o"></i>删除</a>
             <a id="NF-Update" authorize="yes" class="btn btn-primary dropdown-text" onclick="btn_Update()"><i class="fa fa-pencil-square-o"></i>修改</a>
+            <a id="NF-Binding" authorize="yes" class="btn btn-primary dropdown-text" onclick="btn_Binding()"><i class="fa fa-pencil-square-o"></i>绑定</a>
             <a id="NF-ExportAll" authorize="yes" class="btn btn-primary dropdown-text" onclick="btn_ExportAll()"><i class="fa fa-download"></i>全部导出</a>
             <a id="NF-Print" authorize="yes" class="btn btn-primary dropdown-text" onclick="btn_Print()"><i class="fa fa-print"></i>打印</a>
             <a href="~/File/Stack/库位资料导入模板.xlsx" id="NF-IntroductionMould" authorize="yes" class="btn btn-primary dropdown-text" onclick="btn_IntroductionMould()"><i class="fa fa-file-excel-o"></i>导入模板下载</a>
diff --git a/WMS-BS/NFine.Web/Areas/WMS/Views/BasicSettings/ICSContainerLotBinding.cshtml b/WMS-BS/NFine.Web/Areas/WMS/Views/BasicSettings/ICSContainerLotBinding.cshtml
new file mode 100644
index 0000000..5822673
--- /dev/null
+++ b/WMS-BS/NFine.Web/Areas/WMS/Views/BasicSettings/ICSContainerLotBinding.cshtml
@@ -0,0 +1,191 @@
+
+@{
+    ViewBag.Title = "Index";
+    Layout = "~/Views/Shared/_Index.cshtml";
+}
+
+
+<script>
+
+
+    $(function () {
+
+        gridList();
+        SireCodeBinding();
+        LotNoBinding();
+    });
+
+
+    function gridList() {
+
+        var $gridList = $("#gridList");
+        $gridList.dataGrid({
+            url: "/WMS/BasicSettings/GetSendContainerLot?" + Math.random(),
+            height: $(window).height() -50,
+            width: $(window).width() - 400,
+            cellEdit: true,
+            cellsubmit: "clientArray",
+            colModel: [
+                { label: "主键", name: "ID", hidden: true, key: true },
+                  {
+                      label: '删除', width: 100, align: 'left',
+                      formatter: btnLook
+                  },
+                { label: '条码', name: 'LotNo', width: 120, align: 'left' },
+                { label: '料品编码', name: 'InvCode', width: 150, align: 'left' },
+                { label: '料品名称', name: 'InvName', width: 100, align: 'left' },
+                { label: '规格型号', name: 'InvStd', width: 200, align: 'left' },
+                { label: '单位', name: 'InvUnit', width: 200, align: 'left' },
+                { label: '生产日期', name: 'ProductDate', width: 200, align: 'left' },
+                { label: '数量', name: 'Quantity', width: 200, align: 'left' },
+            ],
+            afterSaveCell: function (rowid, cellname, value) {
+                if (cellname === 'ProjectCN') {
+                    $gridList.jqGrid("setCell", rowid, 'ProjectID', value);
+                }
+            },
+            width: "100%",
+
+            autowidth: true,
+            rownumbers: true,
+            viewrecords: true,
+        });
+    }
+
+    function btnLook(cellvalue, options, rowObject) {
+        return cellvalue = "<a class=\"btn btn-primary dropdown-text\" onclick=\"UpLoadClick('" + rowObject.ID + "')\">删除</a>";
+    }
+
+    function UpLoadClick(ID) {
+        $("#gridList").delRowData(ID);
+    }
+
+    function SireCodeBinding() {
+        $("#SireCode").keydown(function (e) {
+            var curKey = e.which;
+            debugger;
+            if (curKey == 13) {
+                var SireCode = $("#SireCode").val();//需绑定容器
+                $.ajax({
+                    url: "/WMS/BasicSettings/GetBindContainerID?SireCode=" + SireCode,
+                    dataType: "json",
+                    async: false,
+                    success: function (data) {
+                        debugger;
+                        if (data == "" || data == null) {
+                            $.modalAlert("未查询到该容器信息！");
+                            return;
+                        }
+                        $("#SireID").val(data.rows[0].ID);
+                        $("#LotNo").focus();
+                    }
+                });
+            }
+        });
+    };
+
+
+    function LotNoBinding() {
+        $("#LotNo").keydown(function (e) {
+            var curKey = e.which;
+            debugger;
+            if (curKey == 13) {
+                var LotNo = $("#LotNo").val();//需绑定容器
+                $.ajax({
+                    url: "/WMS/BasicSettings/GetContainerLotInfo?LotNo=" + LotNo,
+                    dataType: "json",
+                    async: false,
+                    success: function (data) {
+                        debugger;
+                        if (data == "" || data == null) {
+                            $.modalAlert("未查询到该容器信息！");
+                            return;
+                        }
+                        //最后一行新增数据
+                        var obj = {
+                            ID: data.rows[0].ID,
+                            LotNo: data.rows[0].LotNo,
+                            InvCode: data.rows[0].InvCode,
+                            InvName: data.rows[0].InvName,
+                            InvStd: data.rows[0].InvStd,
+                            InvUnit: data.rows[0].InvUnit,
+                            ProductDate: data.rows[0].ProductDate,
+                            Quantity: data.rows[0].Quantity,
+                        };
+                        $("#gridList").jqGrid('addRowData', obj.ID, obj, 'first');
+                        $(".unwritten").hide();
+                    }
+                });
+            }
+        });
+    };
+
+
+
+    function submitForm() {
+        debugger;
+        var SireID = $("#SireID").val();
+        var SireCode = $("#SireCode").val();
+        var ICSMTDOC = [];
+        var obj_Item1 = $("#gridList");
+        var rowIds_Item1 = obj_Item1.getDataIDs();
+        if (rowIds_Item1.length > 0) {
+            for (var i = 0; i < rowIds_Item1.length; i++) {
+                var RowData_Item1 = obj_Item1.getRowData(rowIds_Item1[i]);
+                var obj = {
+                    LotNo: RowData_Item1.LotNo,
+                };
+                ICSMTDOC.push(obj);
+            }
+
+        }
+        debugger;
+        $.modalConfirm("确定绑定吗？", function (r) {
+            if (r) {
+                $.submitForm({
+                    url: "/WMS/BasicSettings/BindingContainerLotID?SireID=" + SireID + "&SireCode=" + SireCode + "&" + Math.random(),
+                    param: { ICSMTDOC: JSON.stringify(ICSMTDOC) },
+                    success: function () {
+                        $.currentWindow().$("#gridList").trigger("reloadGrid");
+                    }
+                })
+            }
+        });
+
+
+    }
+
+</script>
+
+<form id="form1">
+
+    <div style="padding-top: 20px; margin-right: 20px;">
+        <table class="form">
+            <tr>
+                <th class="formTitle">容器:</th>
+                <td class="formValue">
+                    <input id="SireCode" type="text" class="form-control" style="width: 300px;" οnkeydοwn="SireCodeBinding()" />
+                    <input id="SireID" type="text" class="form-control"   />
+                </td>
+                <th class="formTitle">条码:</th>
+                <td class="formValue">
+                    <input id="LotNo" type="text" class="form-control" style="width: 300px;" οnkeydοwn="LotNoBinding()" />
+                </td>
+            </tr>
+        </table>
+    </div>
+</form>
+<!--色牢度-->
+<div class="gridPanel" style="width: 100% ">
+    <div class="ibox-title">
+        子表
+    </div>
+    <div class="gridPanel">
+        <table id="gridList"></table>
+    </div>
+</div>
+
+
+
+
+
diff --git a/WMS-BS/NFine.Web/NFine.Web.csproj b/WMS-BS/NFine.Web/NFine.Web.csproj
index 83ac41f..84cdbff 100644
--- a/WMS-BS/NFine.Web/NFine.Web.csproj
+++ b/WMS-BS/NFine.Web/NFine.Web.csproj
@@ -554,6 +554,8 @@
     <Content Include="Areas\WMS\Views\BasicSettings\ICSLabelTemplate.cshtml" />
     <Content Include="Areas\WMS\Views\BasicSettings\ICSLabelTemplateAdd.cshtml" />
     <Content Include="Areas\WMS\Views\Print\PrintView.cshtml" />
+    <Content Include="Areas\WMS\Views\BasicSettings\ICSContainerBinding.cshtml" />
+    <Content Include="Areas\WMS\Views\BasicSettings\ICSContainerLotBinding.cshtml" />
     <None Include="Scripts\jquery-1.10.2.intellisense.js" />
     <Content Include="Scripts\jquery-1.10.2.js" />
     <Content Include="Scripts\jquery-1.10.2.min.js" />