界面修改，搜索提示

pengcheng
1 parent 74d3e2c9
Showing 9 changed files with 156 additions and 12 deletions
src/main/java/com/huaheng/HuaHengApplication.java
src/main/java/com/huaheng/pc/config/customer/controller/CustomerController.java
src/main/java/com/huaheng/pc/config/location/controller/LocationController.java
src/main/java/com/huaheng/pc/shipment/shipmentHeaderHistory/controller/ShipmentHeaderHistoryController.java
src/main/resources/static/huaheng/js/huahengUI.js
src/main/resources/templates/config/location/location.html
src/main/resources/templates/config/zone/zone.html
src/main/resources/templates/shipment/shipmentHeader/add.html
src/main/resources/templates/shipment/shipmentHeaderHistory/report.html
@@ -13,7 +13,7 @@ import org.springframework.context.annotation.Bean;
  * 
  * @author huaheng
  */
-@MapperScan({"com.huaheng.pc.**.**.mapper","com.huaheng.api.**.**.mapper"})
+@MapperScan({"com.huaheng.pc.**.**.mapper"})
 //添加SecurityAutoConfiguration.class，防止报java.lang.ArrayStoreException错
 @SpringBootApplication(exclude = { DataSourceAutoConfiguration.class })
 public class HuaHengApplication
@@ -27,6 +27,8 @@ import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.*;
  
 import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
  
@@ -160,4 +162,29 @@ public class CustomerController extends BaseController {
         }
         return AjaxResult.success("删除成功！");
     }
+
+
+    @PostMapping("/getData")
+    @ResponseBody
+    public Map<String, Object> getData(String customerName, String customerCode) {
+        LambdaQueryWrapper<Customer> queryWrapper = Wrappers.lambdaQuery();
+        queryWrapper.like(StringUtils.isNotEmpty(customerName), Customer::getCode, customerName)
+                .or()
+                .like(StringUtils.isNotEmpty(customerName), Customer::getName, customerName);
+        List<Customer> customerList = customerService.list(queryWrapper);
+
+        List<Map<String, Object>> list = new ArrayList<>();
+        for (Customer customer : customerList) {
+            Map<String, Object> resultMap = new HashMap<>();
+            if (StringUtils.isNotEmpty(customerCode) && customer.getCode().equals(customerCode)) {
+                resultMap.put("selected", true);
+            }
+            resultMap.put("id", customer.getCode());
+            resultMap.put("text", customer.getName());
+            list.add(resultMap);
+        }
+        Map<String, Object> map = new HashMap<>();
+        map.put("results", list);
+        return map;
+    }
 }
@@ -311,7 +311,7 @@ public class LocationController extends BaseController {
     }
  
  
-    @RequiresPermissions("iconfig:location:print")
+    @RequiresPermissions("config:location:print")
     @Log(title = "配置-库存资料-库位条码", operating = "库位条码打印", action = BusinessType.OTHER)
     @GetMapping("/print/{ids}")
     public String print(@PathVariable("ids") Integer[] ids, ModelMap mmap)
@@ -112,9 +112,6 @@ public class ShipmentHeaderHistoryController extends BaseController
 					.eq(ShipmentDetailHistory::getWarehouseCode,ShiroUtils.getWarehouseCode());
 			Boolean flag=true;
 			flag=shipmentDetailHistoryService.remove(lambdaQueryWrapper);
-			if(flag==false){
-				return AjaxResult.error("删除失败");
-			}
 			if(result==false){
 				return AjaxResult.error("删除失败");
 			}
@@ -1056,7 +1056,7 @@ var table = {
             // 添加信息 全屏
             addFull: function(id) {
                 table.set();
-            	let url = $.common.isEmpty(id) ? table.options.createUrl : $.table.options.createUrl.replace("{id}", id);
+            	var url = $.common.isEmpty(id) ? table.options.createUrl : $.table.options.createUrl.replace("{id}", id);
                 $.modal.openFull("添加" + table.options.modalName, url);
             },
             // 修改信息 全屏
@@ -236,7 +236,7 @@
 		            align: 'center',
 		            formatter: function(value, row, index) {
 		            	var actions = [];
-		            	//actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="#" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
+		            	actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="#" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
                         actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="#" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-trash-o"></i>删除</a>');
 						return actions.join('');
 		            }
@@ -141,7 +141,7 @@
 					title : '自定义字段5',
                     visible:false
 				},
-		        /*{
+		        {
 		            title: '操作',
 		            align: 'center',
 		            formatter: function(value, row, index) {
@@ -150,7 +150,7 @@
                         actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="#" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-trash-o"></i>删除</a>');
 						return actions.join('');
 		            }
-		        }*/
+		        }
 		        ]
             };
             $.table.init(options);
 <!DOCTYPE HTML>
 <html  lang="zh" xmlns:th="http://www.thymeleaf.org">
 <meta charset="utf-8">
-<head th:include="include :: header"></head>
+<head>
+	<th:block th:include="include :: header" />
+	<th:block th:include="include :: select2-css" />
+</head>
 <body class="white-bg">
     <div class="wrapper wrapper-content animated fadeInRight ibox-content">
         <form class="form-horizontal m" id="form-shipmentHeader-add">
@@ -36,7 +39,7 @@
 			<div class="form-group">
 				<label class="col-sm-3 control-label">客户编码：</label>
 				<div class="col-sm-8">
-					<input id="customerCode" name="customerCode" class="form-control" type="text">
+					<select id="customerCode" name="customerCode" class="form-control"></select>
                     <!--<select id="shipTo" class="form-control m-b" th:with="shipmentType=${@dict.getType('shipmentType')}">-->
                         <!--<option th:each="dict : ${shipmentType}" th:text="${dict['dictLabel']}" th:value="${dict['dictValue']}"></option>-->
                     <!--</select>-->
@@ -92,7 +95,8 @@
 			</div>
 		</form>
 	</div>
-    <div th:include="include::footer"></div>
+	<th:block th:include="include :: footer" />
+	<th:block th:include="include :: select2-js" />
     <script type="text/javascript">
 		var prefix = ctx + "shipment/shipmentHeader"
 		$("#form-shipmentHeader-add").validate({
@@ -140,6 +144,19 @@
                 var laydate = layui.laydate;
                 laydate.render({ elem: '#requestedDeliveryDate', theme: 'molv', format: 'yyyy-MM-dd HH:mm:ss' });
             });
+			$('#customerCode').select2({
+				ajax: {
+					url: ctx+'config/customer/getData',
+					dataType: 'json',
+					type: 'post',
+					data: function (params) {
+						let query = {
+							customerName: params.term,
+						}
+						return query;
+					}
+				}
+			});
         })
 	</script>
 </body>
+<!DOCTYPE HTML>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
+<meta charset="utf-8">
+<head th:include="include :: header"></head>
+<body class="white-bg" style="padding:5px 0;" id="ddd">
+<div class="container" style="color: #333;">
+    <div class="row">
+        <h3 align="center">发货单</h3>
+        <span>发货单号:</span><span th:text="${shipmentHeader['code']}"></span>
+        <table id="reportTable" width="100%" border="1" cellspacing="0" cellpadding="0" class="dy-report">
+            <thead style="display:table-header-group;">
+            <tr>
+                <td colspan="7">
+                    <span style="padding-top:40px;width: 40%; float:left;" th:text="${#dates.format(shipmentHeader.created,'yyyy-MM-dd HH:mm:ss')}"></span>
+                    <h2 style="width:20%;text-align:center;float:left;padding-top:10px;">出库单</h2>
+                    <span style="padding-top:20px;width:38%;float:right; text-align: right"><img id="shipmentCode" th:src="@{'/image/'+${shipmentHeader.code}}"></span>
+                </td>
+            </tr>
+            <tr style="padding:15px 0 5px 0;border-bottom:1px solid #606060">
+                <td colspan="7">
+                    <div style="width:40%; float:left;">客户名称：<span th:text="${shipmentHeader['customerName']}"></span></div>
+                    <div style="width:50%; float:right; text-align:right">
+                        <span>明细条数：<span th:text="${shipmentHeader['totalLines']}"></span></span>
+                        <span style="padding-left:20px;">明细总数：<span th:text="${shipmentHeader['totalQty']}"></span></span>
+                        <span class="noprint" style="padding-left:20px;"><button type="button" onClick="a()"><i class="fa fa-print"></i> 打印</button></span>
+                    </div>
+                </td>
+            </tr>
+            <tr>
+                <th width="18%">物料编码</th>
+                <th width="22%">物料名称</th>
+                <!--                <th width="10%">物料规格</th>-->
+                <th width="9%">批次</th>
+                <th width="11%">批号</th>
+                <th width="9%">项目号</th>
+                <th width="8%">数量</th>
+                <th width="21%">条码</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr th:each="row,rowStat : ${details}">
+                <td th:text="${row.materialCode}"></td>
+                <td th:text="${row.materialName}"></td>
+                <!--                <td th:text="${row.materialSpec}"></td>-->
+                <td th:text="${row.batch}"></td>
+                <td th:text="${row.lot}"></td>
+                <td th:text="${row.projectNo}"></td>
+                <td th:text="${row.shipQty}"></td>
+                <td><img th:src="@{'/image/'+${row.materialCode}}"></td>
+            </tr>
+            </tbody>
+        </table>
+    </div>
+</div>
+<div th:include="include :: footer"></div>
+<script type="text/javascript" src="../../../js/barcode/JsBarcode.all.js"></script>
+<script th:inline="javascript">
+
+    // var  barcodeStyle = {
+    //     format: "CODE128",//选择要使用的条形码类型
+    //     width:1,//设置条之间的宽度
+    //     height:40,//高度
+    //     displayValue:true,//是否在条形码下方显示文字
+    //     // text:"456",//覆盖显示的文本
+    //     // fontOptions:"bold italic",//使文字加粗体或变斜体
+    //     font:"monospace",//设置文本的字体fantasy
+    //     textAlign:"center",//设置文本的水平对齐方式
+    //     textPosition:"bottom",//设置文本的垂直位置
+    //     textMargin:1,//设置条形码和文本之间的间距
+    //     fontSize:12,//设置文本的大小
+    //     background:"#ffffff",//设置条形码的背景
+    //     lineColor:"#000000",//设置条和文本的颜色。
+    //     margin:1//设置条形码周围的空白边距
+    // };
+
+    // $("#shipmentCode").JsBarcode($("#shipmentCode").attr("data"), barcodeStyle);
+
+    // for (var i=0; i<$('#reportTable tbody tr').length; i++){
+    //     var barcodeText = $("#reportTable tbody tr:eq("+ i +") td:eq(0)").innerText;
+    //     $("#reportTable tbody tr:eq("+ i +") td:eq(6) canvas").JsBarcode("6666", barcodeStyle);
+    // }
+
+    // $('#reportTable tbody tr').each(function(i) {
+    //     var barcodeText = $(this).children()[0].innerText;
+    //     JsBarcode($(this).children()[6].querySelector("img"), barcodeText, barcodeStyle);
+    // });
+
+
+</script>
+<style type="text/css">
+    @media print {
+        .noprint{display:none;}
+    }
+</style>
+<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+<script type="text/javascript" src="../../../js/jquery.jqprint-0.3.js"></script>
+<script type="text/javascript">
+    function a(){
+        $("#ddd").jqprint();
+    }
+</script>
+</body>
+</html>
 \ No newline at end of file