优化电子秤获取和作业票批次号显示

application/admin/controller/Formula.php

@@ -437,8 +437,18 @@ class Formula extends Backend
             $this->assign('scsh',$scsh);
 
             //批次号顺序新增
-            $tastbach = Db::name('task')->order('bach desc')->find();
-            $bach = $tastbach['bach'] +1;
+//            $tastbach = Db::name('task')->order('bach desc')->find();
+//            $bach = $tastbach['bach'] +1;
+
+            //2024年12月31日 18点00后 使用下面代码
+//            $year = date('Y'); // 获取当前年份
+//            $tastbach = Db::name('task')->where('create', 'like', $year.'%')->order('bach desc')->find();
+
+            $year = date('Y'); // 获取当前年份
+            $startDate = $year.'-02-01'; // 设置开始日期为2月1日
+            $tastbach = Db::name('task')->where('create', '>=', $startDate)->order('bach desc')->find();
+
+            $bach = str_pad($tastbach['bach'] + 1, 5, "0", STR_PAD_LEFT);
             $this->view->assign('bach',$bach);
             $list = Db::name('formula')->where('id',$ids)->find();
 
@@ -648,7 +658,6 @@ class Formula extends Backend
     //获取生产单应加量
     public function getNumber(){
         $params = input('');
-
         if ($params['kuodan']) {
             $task_kd = Db::name('task')->where('bach',$params['bach'])->find();
             if ($task_kd) {

application/admin/view/feeding/add.html

@@ -23,84 +23,71 @@
 
 </style>
 <form id="add-form" class="form-horizontal" role="form" data-toggle="validator" method="POST" action="">
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-3">{:__('Bach')}:</label>
-        <div class="col-xs-12 col-sm-6" id="c_bach" >
-            <input id="c-bach" data-rule="required" class="form-control"  name="row[bach]" type="text">
-        </div>
 
-        <!--        <label class="control-label col-xs-12 col-sm-2">{:__('Bach')}:</label>-->
-        <!--        <div class="col-xs-12 col-sm-3" id="c_bach" >-->
-        <!--            <input id="c-bach" data-rule="required" class="form-control"  name="row[bach]" type="text">-->
-        <!--        </div>-->
-        <!--        <label class="control-label col-xs-12 col-sm-2">选择电子秤</label>-->
-        <!--        <div class="col-xs-12 col-sm-3">-->
-        <!--            <select id="dzc"  class="control-label col-xs-12 col-sm-8 form-control" style="width: 100%;">-->
-        <!--                <option value= "" selected disabled>请选择电子秤</option>-->
-        <!--                <option value="COM1">电子秤一号</option>-->
-        <!--                <option value="COM2">电子秤二号</option>-->
-        <!--                <option value="COM3">电子秤三号</option>-->
-        <!--                <option value="COM4">电子秤四号</option>-->
-        <!--                <option value="COM5">电子秤五号</option>-->
-        <!--                <option value="COM6">电子秤六号</option>-->
-        <!--                <option value="COM7">电子秤七号</option>-->
-        <!--                <option value="COM8">电子秤八号</option>-->
-        <!--                <option value="COM9">电子秤九号</option>-->
-        <!--                <option value="COM10">电子秤十号</option>-->
-        <!--                <option value="COM11">电子秤十一号</option>-->
-        <!--            </select>-->
-        <!--        </div>-->
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">日期:</label>
-        <div class="col-xs-12 col-sm-3">
-            <input id="c-date" readonly value="{:date('Y-m-d')}" class="form-control" name="row[date]" type="text">
-        </div>
-        <label class="control-label col-xs-12 col-sm-2">开票人:</label>
-        <div class="col-xs-12 col-sm-3">
-            <input id="c-specifications" readonly class="form-control" name="row[specifications]" type="text">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">名称:</label>
-        <div class="col-xs-12 col-sm-3">
-            <input id="c-name" data-rule="required" readonly class="form-control"  type="text">
-        </div>
-        <label class="control-label col-xs-12 col-sm-2">审核:</label>
-        <div class="col-xs-12 col-sm-3">
-            <input id="c-unit" class="form-control" readonly name="row[unit]" type="text">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">操作人员:</label>
-        <div class="col-xs-12 col-sm-3">
-            <select style="text-align: left;" id="c-operator" class="control-label col-xs-12 col-sm-8 form-control"   name="row[operator]">
-                <option></option>
-                {foreach $cjcz as $key=>$vv}
-                <option value="{$vv.name}">{$vv.name}</option>
-                {/foreach}
-            </select>
-            <!--<input id="c-operator" data-rule="required" class="form-control" name="row[operator]" type="text">-->
-        </div>
-        <label class="control-label col-xs-12 col-sm-2">检验人员:</label>
-        <div class="col-xs-12 col-sm-3">
-            <select style="text-align: left"  id="c-inspector"  class="control-label col-xs-12 col-sm-8 form-control"   name="row[inspector]">
-                <option></option>
-                {foreach $cjjy as $key=>$vvv}
-                <option value="{$vvv.name}">{$vvv.name}</option>
-                {/foreach}
-            </select>
-            <!--<input id="c-inspector" class="form-control" data-rule="required" name="row[inspector]" type="text">-->
-        </div>
-    </div>
-    <div class="form-group">
-        <div class="col-xs-12 col-sm-2">
-            扫描物料<input class="form-control"  id="wuliao" name="123" type="text">
+    <div style="width: 100%; display: flex; justify-content: space-between;">
+        <div style="width: 59%; height: auto; border: 1px solid black; margin: 0 auto; padding: 10px;">
+            <!-- 第一行：批次号 -->
+            <div style="display: flex; align-items: center; margin-bottom: 10px;">
+                <label style="width: 100px;font-size: 24px">批次号:</label>
+                <input id="c-bach" data-rule="required" class="form-control" name="row[bach]" type="number" style="font-size: larger; font-weight: bold; height: 44px; flex-grow: 1;">
+            </div>
+            <!-- 第二行：名称、日期 -->
+            <div style="display: flex; align-items: center; margin-bottom: 10px;">
+                <label style="width: 100px;">名称:</label>
+                <input id="c-name" data-rule="required" class="form-control" readonly name="row[name]" type="text" style="font-size: larger;font-weight: bold; height: 44px; flex-grow: 2;">
+            </div>
+            <!-- 第三行：开票人、审核人 -->
+            <div style="display: flex; align-items: center; margin-bottom: 10px;">
+                <label style="width: 160px;">日期:</label>
+                <input id="c-date" readonly value="{:date('Y-m-d')}" class="form-control" name="row[date]" type="text" style="flex-grow: 1;width: 40%;">
+                <label style="width: 100px; margin-left: 10px;">开票人:</label>
+                <input id="c-specifications" readonly class="form-control" name="row[specifications]" type="text" style="flex-grow: 1;width: 30%;">
+                <label style="width: 100px; margin-left: 10px;">审核人:</label>
+                <input id="c-unit" class="form-control" readonly name="row[unit]" type="text" style="flex-grow: 1;width: 30%;">
+            </div>
+            <!-- 第四行：操作人员、检验人员 -->
+            <div style="display: flex; align-items: center;">
+                <label style="width: 100px;">操作人员:</label>
+                <select style="text-align: left; flex-grow: 1;width: 40%;" id="c-operator" class="control-label col-xs-12 col-sm-8 form-control" name="row[operator]">
+                    <option value="车间二号机">车间二号机</option>
+                    {foreach $cjcz as $key=>$vv}
+                    <option value="{$vv.name}">{$vv.name}</option>
+                    {/foreach}
+                </select>
+                <label style="width: 100px; margin-left: 10px;">检验人员:</label>
+                <select style="text-align: left; flex-grow: 1;width: 40%;" id="c-inspector" class="control-label col-xs-12 col-sm-8 form-control" name="row[inspector]">
+                    <option value="车间二号机">车间二号机</option>
+                    {foreach $cjjy as $key=>$vvv}
+                    <option value="{$vvv.name}">{$vvv.name}</option>
+                    {/foreach}
+                </select>
+            </div>
+            <br>
+            <div style="display: flex; align-items: center; margin-bottom: 10px;margin-top: 70px">
+                <label style="margin-right: 20px; font-size: 24px;width: 130px;">扫描物料:</label>
+                <input class="form-control" id="wuliao" name="123" type="text" style="font-size: 18px; height: 44px; width: 60%;">
+            </div>
         </div>
-        <div class="col-xs-12 col-sm-6" style="margin-top: 25px;font-size: 18px">
-            <span>您本次扫描的物料是：</span><span id="input" style="color: red"></span>
+
+        <div style="width: 40%; height: auto; border: 1px solid black; margin: 0 auto; padding: 10px; text-align: left;">
+            <!-- 右侧内容：扫描物料、获取电子秤数据 -->
+            <div style="display: flex; flex-direction: column; justify-content: center; align-items: flex-start;">
+                <label style="width: 150px; font-size: larger; font-weight: bold; text-align: left;">当前扫描物料是：</label>
+                <div id="input" style="display: flex; height: 150px; justify-content: flex-start; align-items: center; margin-bottom: 10px; color: red;">
+
+                </div>
+                <div style="display: flex; align-items: center; margin-bottom: 10px;">
+                    <label style="width: 150px; font-size: larger; font-weight: bold; text-align: left;">应投重量：</label>
+                    <div id="ytzl" style="display: flex; height: 80px; justify-content: flex-start; align-items: center; font-size: 60px; margin-bottom: 10px; color: red;"></div>
+                </div>
+                <div style="display: flex; align-items: center; margin-bottom: 10px;">
+                    <label style="width: 100px; font-size: larger; font-weight: bold; text-align: left;">投入重量：</label>
+                    <input id="dzcshuju" class="form-control" name="" placeholder="扫描二维码可保存" type="text" style="font-size: 24px; height: 44px; width: 230px;">
+                </div>
+            </div>
         </div>
     </div>
+
     <style>
         th,tr{
             text-align: center;
@@ -112,12 +99,12 @@
     <div class="form-group">
         <table class="table table-striped table-bordered table-hover table-nowrap" id="table">
             <tr>
-                <th class="col-xs-12 col-sm-3">{:__('Material')}</th>
-                <th class="col-xs-12 col-sm-1">{:__('Nweight')}</th>
-                <th class="col-xs-12 col-sm-1">{:__('Weight')}</th>
-                <th class="col-xs-12 col-sm-1">操作</th>
-                <th class="col-xs-12 col-sm-1">原材料批次号</th>
-                <th class="col-xs-12 col-sm-4">操作记录</th>
+                <th class="col-xs-12 col-sm-3"  style="font-size: larger; font-weight: bold;">{:__('Material')}</th>
+                <th class="col-xs-12 col-sm-2"  style="font-size: larger; font-weight: bold;">{:__('Nweight')}</th>
+                <th class="col-xs-12 col-sm-2"  style="font-size: larger; font-weight: bold;">{:__('Weight')}</th>
+<!--                <th class="col-xs-12 col-sm-1"  style="font-size: larger; font-weight: bold;display:none;">操作</th>-->
+                <th class="col-xs-12 col-sm-1"  style="font-size: larger; font-weight: bold;">原材料批次号</th>
+                <th class="col-xs-12 col-sm-2"  style="font-size: larger; font-weight: bold;">操作记录</th>
             </tr>
         </table>
     </div>
@@ -125,7 +112,7 @@
         <label class="control-label col-xs-12 col-sm-2"></label>
         <div class="col-xs-12 col-sm-8">
             <!--            <button type="submit" class="btn btn-primary btn-embossed disabled option">{:__('OK')}</button>-->
-            <button type="button" class="btn btn-default btn-embossed print-link">打印预览</button>
+            <!--            <button type="button" class="btn btn-default btn-embossed print-link">打印预览</button>-->
         </div>
     </div>
     <!--==============================================================================-->

application/admin/view/feeding/index.html

@@ -1,16 +1,15 @@
 <div class="panel panel-default panel-intro">
     {:build_heading()}
 
-    <div class="panel-body">
+    <div class="panel-body" id="myDiv">
         <div id="myTabContent" class="tab-content">
             <div class="tab-pane fade active in" id="one">
                 <div class="widget-body no-padding">
                     <div id="toolbar" class="toolbar">
                         <a href="javascript:;" class="btn btn-primary btn-refresh" title="{:__('Refresh')}" ><i class="fa fa-refresh"></i> </a>
-                        <a href="javascript:;" style="width: 200px;height: 35px" class="btn btn-success btn-add {:$auth->check('feeding/add')?'':'hide'}" title="{:__('Add')}"><i class="fa fa-plus"></i> {:__('Add')}</a>
+                        <a href="javascript:;" id="myButton" style="width: 200px;height: 35px" class="btn btn-success btn-add {:$auth->check('feeding/add')?'':'hide'}" title="{:__('Add')}"><i class="fa fa-plus"></i> {:__('Add')}</a>
                         <a href="javascript:;" class="btn btn-success btn-edit btn-disabled disabled {:$auth->check('feeding/edit')?'':'hide'}" title="{:__('Edit')}" ><i class="fa fa-pencil"></i> 修改投料重量</a>
                         <a href="javascript:;" class="btn btn-danger btn-del btn-disabled disabled {:$auth->check('feeding/del')?'':'hide'}" title="{:__('Delete')}" ><i class="fa fa-trash"></i> {:__('Delete')}</a>
-                        
 
                         <!--<div class="dropdown btn-group {:$auth->check('feeding/multi')?'':'hide'}">-->
                             <!--<a class="btn btn-primary btn-more dropdown-toggle btn-disabled disabled" data-toggle="dropdown"><i class="fa fa-cog"></i> {:__('More')}</a>-->
@@ -20,7 +19,7 @@
                             <!--</ul>-->
                         <!--</div>-->
 
-                        
+
                     </div>
                     <table id="table" class="table table-striped table-bordered table-hover table-nowrap"
                            data-operate-edit=""

application/admin/view/printt/index.html

@@ -294,10 +294,10 @@
             LODOP.ADD_PRINT_BARCODE(235,328,"108.9mm","49mm","QRCode",barcode_Engish+time);
             LODOP.SET_PRINT_STYLEA(0,"QRCodeVersion",7);
         }
-        // LODOP.PRINT();//打印
+        LODOP.PRINT();//打印
         // LODOP.PREVIEW();//打印预览
         // LODOP.PRINTA();//选择打印机进行打印
-        LODOP.PRINT_SETUP();//打印维护设置大小
+        // LODOP.PRINT_SETUP();//打印维护设置大小
     };
 
     //将中文括号转换成英文括号
@@ -399,4 +399,4 @@
 
     };
 </script>
-</html>
+</html>

application/admin/view/task/show.html

@@ -162,7 +162,15 @@
                     {/foreach}
                     <tr>
                         <td style="width: 100px;text-align: center">总计</td>
-                        <td class="total" style="width: 100px;text-align: center">{isset($task.kuodan) ? $task.number + $task.kuodan : $task.number}</td>
+<!--                        <td class="total" style="width: 100px;text-align: center">{isset($task.kuodan) ? $task.number + $task.kuodan : $task.number}</td>-->
+<!--                        <td class="total" style="width: 100px; text-align: center">{$task['number']}</td>-->
+                        <td class="total" style="width: 100px; text-align: center">
+                            {if isset($task['kuodan']) && is_numeric($task['kuodan'])}
+                            {$task['number'] + $task['kuodan']}
+                            {else}
+                            {$task['number']}
+                            {/if}
+                        </td>
                         <td></td>
                         <td></td>
                     </tr>

application/api/controller/Index.php

@@ -106,5 +106,5 @@ class Index extends Api{
         $res['data'] = $list;
         return json($res);
     }
-    
+
 }