包装工单下单

wwwroot/mes/list.ashx

@@ -1211,6 +1211,7 @@ public class list : IHttpHandler, IReadOnlySessionState
                         {
                             DataTable dt = conn.ExecuteDatatable(@"
                                 SELECT DICTIONARYTYPE,
+                                       DICTIONARYID,
                                        DICTIONARYVALUE
                                   FROM tp_mst_datadictionary
                                  WHERE VALUEFLAG = '1'

wwwroot/mes/mst/packingform/packingform.ashx

@@ -169,7 +169,8 @@ public class packingform : IHttpHandler, IReadOnlySessionState
                         //批量插入
                         if (b.btnInsert)
                             context.Response.Write(batchinsert(context.Request["data"], context.Request["PACKINGFORMCODE"],context.Request["PACKINGBOMID"],context.Request["GOODSID"],context.Request["MATERIALCODE"],
-                                context.Request["PACKINGFORMNAME"],context.Request["PACKINGLINE"],context.Request["GOODSTYPE"],context.Request["LOGOID"],context.Request["STATUS"],context.Request["REMARKS"]));
+                                context.Request["PACKINGFORMNAME"],context.Request["PACKINGLINE"],context.Request["GOODSTYPE"],context.Request["LOGOID"],context.Request["STATUS"],context.Request["REMARKS"],
+                                context.Request["PLATETYPE"],context.Request["STACKNUM"]));
                         else
                             context.Response.Write(new JsonResult(JsonStatus.rightError).ToJson());
                         break;
@@ -230,6 +231,8 @@ public class packingform : IHttpHandler, IReadOnlySessionState
                     m.BEGINTIME,
                     m.ENDTIME,
                     m.REMARKS,
+                    D.DICTIONARYVALUE PLATETYPE,
+                    D1.DICTIONARYVALUE STACKNUM,
                     m.VALUEFLAG,
                     m.ACCOUNTID,
                     m.CREATEUSERID,
@@ -238,7 +241,8 @@ public class packingform : IHttpHandler, IReadOnlySessionState
                     m.UPDATETIME
                 FROM
                     TP_MST_PACKINGFORM m
-
+                    left join tp_mst_datadictionary d on m.platetype = d.dictionaryid and d.dictionarytype = 'TPC031' 
+                      left join tp_mst_datadictionary d1 on m.stacknum = d1.dictionaryid and d1.dictionarytype = 'TPC032' 
                     --xuwei modify 2021-05-25 
                     --LEFT JOIN TP_MST_GOODS g ON g.GOODSID = m.GOODSID
                     LEFT JOIN V_GOODS_MATERIALCODE g ON g.GOODSID = m.GOODSID AND g.MATERIALCODE = m.MATERIALCODE
@@ -392,6 +396,8 @@ public class packingform : IHttpHandler, IReadOnlySessionState
                     m.BEGINTIME,
                     m.ENDTIME,
                     m.REMARKS,
+                    D.DICTIONARYVALUE PLATETYPE,
+                    D1.DICTIONARYVALUE STACKNUM,
                     m.VALUEFLAG,
                     m.ACCOUNTID,
                     m.CREATEUSERID,
@@ -400,6 +406,9 @@ public class packingform : IHttpHandler, IReadOnlySessionState
                     m.UPDATETIME
                 FROM
                     TP_MST_PACKINGFORM m
+                    left join tp_mst_datadictionary d on m.platetype = d.dictionaryid and d.dictionarytype = 'TPC031' 
+                      left join tp_mst_datadictionary d1 on m.stacknum = d1.dictionaryid and d1.dictionarytype = 'TPC032' 
+
                     --LEFT JOIN TP_MST_PACKINGBOM p ON p.PACKINGBOMID = m.PACKINGBOMID
                     LEFT JOIN TP_MST_GOODS g ON g.GOODSID = m.GOODSID
                     LEFT JOIN TP_MST_LOGO l ON l.LOGOID = g.LOGOID
@@ -726,6 +735,8 @@ public class packingform : IHttpHandler, IReadOnlySessionState
                     ORDERNO,
                     STATUS,
                     PLATENUM,
+                    PLATETYPE,
+                    STACKNUM,
                     --OUTNUM,
                     --BEGINTIME,
                     --ENDTIME,
@@ -743,6 +754,8 @@ public class packingform : IHttpHandler, IReadOnlySessionState
                     @ORDERNO@,
                     @STATUS@,
                     @PLATENUM@,
+                    @PLATETYPE@,
+                    @STACKNUM@, 
                     --@OUTNUM@,
                     --@BEGINTIME@,
                     --@ENDTIME@,
@@ -761,6 +774,8 @@ public class packingform : IHttpHandler, IReadOnlySessionState
                 new CDAParameter("ORDERNO", form["ORDERNO"]),
                 new CDAParameter("STATUS", form["STATUS"]),
                 new CDAParameter("PLATENUM", form["PLATENUM"]),
+                new CDAParameter("PLATETYPE", form["PLATETYPE"]),
+                new CDAParameter("STACKNUM", form["STACKNUM"]),
                 //new CDAParameter("OUTNUM",form["OUTNUM"]),
                 //new CDAParameter("BEGINTIME",form["BEGINTIME"]),
                 //new CDAParameter("ENDTIME",form["ENDTIME"]),
@@ -1201,7 +1216,7 @@ public class packingform : IHttpHandler, IReadOnlySessionState
     /// </summary>
     /// <returns>json</returns>
     private string batchinsert(string jsondata, string packingformcode, string packingbomid, string goodsid, string materialcode, string packingformname,
-        string packingline, string goodstype, string logoid,string status,string remarks)
+        string packingline, string goodstype, string logoid,string status,string remarks,string platetype,string stacknum)
     {
         using (IDataAccess conn = DataAccess.Create())
         {
@@ -1497,6 +1512,8 @@ public class packingform : IHttpHandler, IReadOnlySessionState
                             ORDERNO,
                             STATUS,
                             PLATENUM,
+                            PLATETYPE,
+                            STACKNUM,
                             --OUTNUM,
                             --BEGINTIME,
                             --ENDTIME,
@@ -1514,6 +1531,8 @@ public class packingform : IHttpHandler, IReadOnlySessionState
                             @ORDERNO@,
                             @STATUS@,
                             @PLATENUM@,
+                            @PLATETYPE@,
+                            @STACKNUM@,
                             --@OUTNUM@,
                             --@BEGINTIME@,
                             --@ENDTIME@,
@@ -1534,6 +1553,8 @@ public class packingform : IHttpHandler, IReadOnlySessionState
                         new CDAParameter("LOGOID", logoid),
                         new CDAParameter("GOODSID", goodsid),
                         new CDAParameter("MATERIALCODE", materialcode),
+                        new CDAParameter("PLATETYPE", platetype),
+                        new CDAParameter("STACKNUM", stacknum),
                         new CDAParameter("REMARKS", remarks +"【列:"+detailTable.Rows[i]["COLUMNID"].ToString()+"层:"+detailTable.Rows[i]["LAYERID"].ToString()+"栈板号"+detailTable.Rows[i]["GROUPID"].ToString()+"】"),
                         new CDAParameter("ACCOUNTID", HttpContext.Current.Session["accountId"]),
                         new CDAParameter("CREATEUSERID", HttpContext.Current.Session["userId"]),

wwwroot/mes/mst/packingform/packingform_add.html

@@ -78,12 +78,24 @@
                     <div class="w-field"><input class="easyui-textbox" id="PLATENUM" name="PLATENUM" data-options="required:false,prompt:'',tipPosition:'top'" style="width:100%;height:32px;"></div>
                 </div>
                 <div class="w-div">
+                    <div class="w-fieldname">托盘类型：</div>
+                    <div class="w-field">
+                        <input class="easyui-combobox" id="PLATETYPE" name="PLATETYPE" data-options="required:true,prompt:'',tipPosition:'top',url:'../../list.ashx?m=getMSTDictionary&dictionarytype=TPC031',method:'get',valueField:'DICTIONARYID',textField:'DICTIONARYVALUE',panelHeight:'300px',editable:'true',multiple:false,limitToList:true" style="width:100%;height:32px;">
+                    </div>
+                </div>
+                <div class="w-div">
+                    <div class="w-fieldname">码垛数量：</div>
+                    <div class="w-field">
+                        <input class="easyui-combobox" id="STACKNUM" name="STACKNUM" data-options="required:true,prompt:'',tipPosition:'top',url:'../../list.ashx?m=getMSTDictionary&dictionarytype=TPC032',method:'get',valueField:'DICTIONARYID',textField:'DICTIONARYVALUE',panelHeight:'300px',editable:'true',multiple:false,limitToList:true" style="width:100%;height:32px;">
+                    </div>
+                </div>
+                <div class="w-div">
                     <div class="w-fieldname">发送到乾润（此项选中否，需人工确认，才能得到执行）：</div>
                     <div class="w-field"><input class="easyui-combobox" id="STATUS" name="STATUS" value="0" data-options="required:false,prompt:'',tipPosition:'top',valueField: 'value',textField: 'text',data: [{text: '是',value: '0'},{text: '否',value: '-1'}],editable:false" style="width:100%;height:auto"></div>
                 </div>
 
             </div>
-        </form>
+</form>
     </div>
     <div data-options="region:'south',border:false" class="w-bar">
         <a href="javascript:void(0)" id="tbSave" class="easyui-linkbutton" data-options="iconCls:'icon-save'" onclick="submitForm()">保存</a>

wwwroot/mes/mst/packingform/packingform_adds.html

@@ -76,9 +76,21 @@
                     <div class="w-field"><input class="easyui-combobox" id="LOGOID" name="LOGOID" data-options="required:false,prompt:'',tipPosition:'top',url:'getLogo.ashx',method:'get',valueField:'ID',textField:'TEXT',panelHeight:'200px',editable:false" style="width:100%;height:32px;"></div>
                 </div>
                 <!--<div class="w-div">
-                <div class="w-fieldname">装板数量：</div>
-                <div class="w-field"><input class="easyui-textbox" id="PLATENUM" name="PLATENUM" data-options="required:false,prompt:'',tipPosition:'top'" style="width:100%;height:32px;"></div>
-            </div>-->
+        <div class="w-fieldname">装板数量：</div>
+        <div class="w-field"><input class="easyui-textbox" id="PLATENUM" name="PLATENUM" data-options="required:false,prompt:'',tipPosition:'top'" style="width:100%;height:32px;"></div>
+    </div>-->
+                <div class="w-div">
+                    <div class="w-fieldname">托盘类型：</div>
+                    <div class="w-field">
+                        <input class="easyui-combobox" id="PLATETYPE" name="PLATETYPE" data-options="required:true,prompt:'',tipPosition:'top',url:'../../list.ashx?m=getMSTDictionary&dictionarytype=TPC031',method:'get',valueField:'DICTIONARYID',textField:'DICTIONARYVALUE',panelHeight:'300px',editable:'true',multiple:false,limitToList:true" style="width:100%;height:32px;">
+                    </div>
+                </div>
+                <div class="w-div">
+                    <div class="w-fieldname">码垛数量：</div>
+                    <div class="w-field">
+                        <input class="easyui-combobox" id="STACKNUM" name="STACKNUM" data-options="required:true,prompt:'',tipPosition:'top',url:'../../list.ashx?m=getMSTDictionary&dictionarytype=TPC032',method:'get',valueField:'DICTIONARYID',textField:'DICTIONARYVALUE',panelHeight:'300px',editable:'true',multiple:false,limitToList:true" style="width:100%;height:32px;">
+                    </div>
+                </div>
                 <div class="w-div">
                     <div class="w-fieldname">发送到乾润（此项选中否，需人工确认，才能得到执行）：</div>
                     <div class="w-field"><input class="easyui-combobox" id="STATUS" name="STATUS" value="0" data-options="required:false,prompt:'',tipPosition:'top',valueField: 'value',textField: 'text',data: [{text: '是',value: '0'},{text: '否',value: '-1'}],editable:false" style="width:100%;height:auto"></div>
@@ -182,6 +194,8 @@
                 'GOODSTYPE': $('#GOODSTYPE').val(),
                 'LOGOID': $('#LOGOID').val(),
                 'STATUS': $('#STATUS').val(),
+                'PLATETYPE': $('#PLATETYPE').val(),
+                'STACKNUM': $('#STACKNUM').val(),
                 'REMARKS': $('#REMARKS').val()
             }, function (data) {
                 var json = JSON.parse(data);

wwwroot/mes/mst/packingform/packingform_index.html

@@ -77,6 +77,8 @@
                 <th data-options="field:'PLATENUM',title:'数量',align:'left',sortable:true,styler:rowStyle"></th>
                 <th data-options="field:'OUTNUM',title:'已出库数量',align:'left',sortable:true,styler:rowStyle"></th>
                 <th data-options="field:'STATUSNAME',title:'执行状态',align:'left',sortable:true,styler:rowStyle"></th>
+                <th data-options="field:'PLATETYPE',title:'装盘类型',align:'left',sortable:true,styler:rowStyle"></th>
+                <th data-options="field:'STACKNUM',title:'码垛数量',align:'left',sortable:true,styler:rowStyle"></th>
                 <th data-options="field:'BEGINTIME',title:'开始出库时间',align:'left',sortable:true,styler:rowStyle"></th>
                 <th data-options="field:'ENDTIME',title:'出库完成时间',align:'left',sortable:true,styler:rowStyle"></th>
                 <th data-options="field:'REMARKS',title:'备注',align:'left',sortable:true,styler:rowStyle"></th>