代码更新

wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/dp/rest/BigScreenController.java

@@ -28,20 +28,17 @@ public class BigScreenController {
     private final BigScreenService bigScreenService;
 
     @PostMapping("/screenlogin")
-    @Log("大屏登陆验证")
     @ApiOperation("大屏登陆验证")
     public ResponseEntity<Object> handlogin(@RequestBody Map<String, String> whereJson) {
         return new ResponseEntity<>(bigScreenService.handleLogin(whereJson), HttpStatus.OK);
     }
 
     @PostMapping("/shLargeScreen")
-    @Log("大屏熟化存储区查询")
     @ApiOperation("大屏熟化存储区查询")
     public ResponseEntity<Object> queryShLargeScreen(@RequestBody Map<String, String> whereJson) {
         return new ResponseEntity<>(bigScreenService.queryShLargeScreen(whereJson), HttpStatus.OK);
     }
     @PostMapping("/hwLargeScreen")
-    @Log("大屏恒温存储区查询")
     @ApiOperation("大屏恒温存储区查询")
     public ResponseEntity<Object> queryHwLargeScreen(@RequestBody Map<String, String> whereJson) {
         return new ResponseEntity<>(bigScreenService.queryHwLargeScreen(whereJson), HttpStatus.OK);

wms/hd/nladmin-system/src/main/java/org/nl/wms/st/core/service/impl/DumpinvServiceImpl.java

@@ -39,6 +39,7 @@ public class DumpinvServiceImpl implements DumpinvService {
         HashMap<String, String> param = new HashMap<>();
         param.put("flag", "1");
         param.put("bill_status", (String) whereJson.get("bill_status"));
+        param.put("bill_code", (String) whereJson.get("name"));
         JSONObject result = WQL.getWO("QST_DUMP00").addParamMap(param).pageQuery(WqlUtil.getHttpContext(page), "dump.update_time desc");
         return result;
     }
@@ -83,15 +84,15 @@ public class DumpinvServiceImpl implements DumpinvService {
         map.put("flag", "1");
         map.put("label_uuid", label_uuid);
         JSONObject materialObj = WQLObject.getWQLObject("md_base_materiallabelmst").query("label_uuid='" + label_uuid + "'").uniqueResult(0);
-        if (ObjectUtil.isEmpty(materialObj)){
+        if (ObjectUtil.isEmpty(materialObj)) {
             throw new BadRequestException("未找到该物料批次的信息!");
         }
         String material_code = materialObj.getString("material_code");
-        JSONArray turnInArr  = new JSONArray();
+        JSONArray turnInArr = new JSONArray();
-        if (StrUtil.equals(material_code,"1")){
+        if (StrUtil.equals(material_code, "1")) {
-            turnInArr  = pointTab.query("area_type = '03' and point_status ='00' and lock_type='00' and is_active='1' and is_delete='0' and point_name like'%01层%'").getResultJSONArray(0);
+            turnInArr = pointTab.query("area_type = '03' and point_status ='00' and lock_type='00' and is_active='1' and is_delete='0' and point_name like'%01层%'").getResultJSONArray(0);
-        }else {
+        } else {
-            turnInArr  = pointTab.query("area_type = '03' and point_status ='00' and lock_type='00' and is_active='1' and is_delete='0' and point_name  not like'%01层%'").getResultJSONArray(0);
+            turnInArr = pointTab.query("area_type = '03' and point_status ='00' and lock_type='00' and is_active='1' and is_delete='0' and point_name  not like'%01层%'").getResultJSONArray(0);
 
         }
 
@@ -150,10 +151,11 @@ public class DumpinvServiceImpl implements DumpinvService {
             String point_codeflag = turnOutObj.getString("point_code");
             point_codeflag = point_codeflag.substring(point_codeflag.length() - 2);
             JSONArray turnInArr = new JSONArray();
-            if (StrUtil.equals("01", point_codeflag)){
+            if (StrUtil.equals("01", point_codeflag)) {
                 turnInArr = pointTab.query("area_type = '03' and point_status ='00' and lock_type='00' and is_active='1' and is_delete='0' and point_name like '%1层%'").getResultJSONArray(0);
+            } else {
+                turnInArr = pointTab.query("area_type = '03' and point_status ='00' and lock_type='00' and is_active='1' and is_delete='0' and   point_name not like '%1层%'").getResultJSONArray(0);
             }
-            turnInArr = pointTab.query("area_type = '03' and point_status ='00' and lock_type='00' and is_active='1' and is_delete='0' and   point_name not like '%1层%'").getResultJSONArray(0);
 
             json.put("turnin_struct_uuid", turnInArr.getJSONObject(0).optString("point_uuid"));
             json.put("vehicle_code", turnOutObj.optString("vehicle_code"));

wms/hd/nladmin-system/src/main/java/org/nl/wms/st/wql/QST_DUMP00.wql

@@ -16,6 +16,7 @@
 	输入.flag					            TYPEAS s_string
 	输入.bill_status					        TYPEAS s_string
 	输入.task_uuid					        TYPEAS s_string
+	输入.bill_code					        TYPEAS s_string
 
 [临时表]
 	--这边列出来的临时表就会在运行期动态创建
@@ -62,6 +63,9 @@
             	 OPTION 输入.bill_status <> ""
                     dump.bill_status = 输入.bill_status
                 ENDOPTION
+            	 OPTION 输入.bill_code <> ""
+                    dump.bill_code = 输入.bill_code
+                ENDOPTION
 
    			ENDSELECT
    		ENDPAGEQUERY

wms/hd/nladmin-system/src/main/resources/logback-spring.xml

@@ -56,10 +56,51 @@ https://juejin.cn/post/6844903775631572999
 
     <!--生产环境:打印控制台和输出到文件-->
     <springProfile name="prod">
-        <root level="info">
+        <root level="debug">
             <appender-ref ref="asyncFileAppender"/>
         </root>
 
+        <logger name="springfox.documentation" level="ERROR" additivity="false">
+            <appender-ref ref="asyncFileAppender"/>
+        </logger>
+        <logger name="jdbc.audit" level="ERROR" additivity="false">
+            <appender-ref ref="asyncFileAppender"/>
+        </logger>
+        <logger name="org.hibernate" level="ERROR" additivity="false">
+            <appender-ref ref="asyncFileAppender"/>
+        </logger>
+        <logger name="jdbc.sqltiming" level="ERROR" additivity="false">
+            <appender-ref ref="asyncFileAppender"/>
+        </logger>
+        <logger name="jdbc.resultset" level="ERROR" additivity="false">
+            <appender-ref ref="asyncFileAppender"/>
+        </logger>
+        <logger name="org.springframework" level="info" additivity="false">
+            <appender-ref ref="asyncFileAppender"/>
+        </logger>
+        <logger name="jdbc.resultsettable" level="error" additivity="false">
+            <appender-ref ref="asyncFileAppender"/>
+        </logger>
+        <logger name="jdbc.sqlonly" level="error" additivity="false">
+            <appender-ref ref="asyncFileAppender"/>
+        </logger>
+        <logger name="io.netty" level="error" additivity="false">
+            <appender-ref ref="asyncFileAppender"/>
+        </logger>
+        <logger name="jdbc.connection" level="error" additivity="false">
+            <appender-ref ref="asyncFileAppender"/>
+        </logger>
+        <logger name="io.lettuce" level="error" additivity="false">
+            <appender-ref ref="asyncFileAppender"/>
+        </logger>
+        <logger name="nl.basjes" level="error" additivity="false">
+            <appender-ref ref="asyncFileAppender"/>
+        </logger>
+        <logger name="org.quartz" level="error" additivity="false">
+            <appender-ref ref="asyncFileAppender"/>
+        </logger>
+
+
     </springProfile>
 
     <!--开发环境:打印控制台-->

wms/qd/src/views/wms/st/core/dumpinv/index.vue

@@ -134,8 +134,8 @@
         <el-table-column type="selection" width="55"/>
         <el-table-column v-if="false" prop="dumpinv_uuid" label="转储单明细标识"/>
         <el-table-column prop="bill_code" label="单据编码" width="130px"/>
-        <el-table-column v-if="false" prop="bill_status" label="单据状态"/>
+        <el-table-column v-if="false" prop="bill_status" label="单据状态" />
-        <el-table-column prop="bill_status_name" label="单据状态" :formatter="formatStatusName"/>
+        <el-table-column prop="bill_status_name" label="单据状态" :formatter="formatStatusName" min-width="100" show-overflow-tooltip/>
         <!--
          <el-table-column prop="weight" label="重量"/>
  -->

wms/qd/src/views/wms/st/core/inbill/index.vue

@@ -112,7 +112,7 @@
         <el-table-column prop="dtl_count" label="明细数" />
         <el-table-column prop="export_num" label="导出次数" />
         <el-table-column prop="print_num" label="打印次数" />
-        <el-table-column prop="remark" label="备注" />
+        <el-table-column prop="remark" label="备注" min-width="120" show-overflow-tooltip/>
         <el-table-column prop="update_by" label="修改者" />
         <af-table-column label="修改时间">
           <template slot-scope="scope">