From 7df6ab7f0cede6c1a9aa51e496f910026a4bfce6 Mon Sep 17 00:00:00 2001
From: mrzhssss <pro6@qq.com>
Date: 星期二, 07 十二月 2021 09:43:09 +0800
Subject: [PATCH] 2021.12.7
---
newest.bak | 0
src/main/java/zy/cloud/wms/manager/controller/DiffValController.java | 47 +++++++++++++++
htasrs.bak | 0
src/main/java/zy/cloud/wms/manager/controller/NodeController.java | 1
src/main/java/zy/cloud/wms/manager/dto/DiffValDto.java | 65 +++++++++++++++++++++
framework-2.0.0.jar | 0
src/main/webapp/views/diffVal/diffVal.html | 32 ++++++++++
src/main/resources/application.yml | 20 +++---
src/main/webapp/static/js/diffVal/diffVal.js | 12 ++++
9 files changed, 164 insertions(+), 13 deletions(-)
diff --git a/framework-2.0.0.jar b/framework-2.0.0.jar
new file mode 100644
index 0000000..f17c34c
--- /dev/null
+++ b/framework-2.0.0.jar
Binary files differ
diff --git a/htasrs.bak b/htasrs.bak
index b926bc2..ba996f9 100644
--- a/htasrs.bak
+++ b/htasrs.bak
Binary files differ
diff --git a/newest.bak b/newest.bak
new file mode 100644
index 0000000..a6ed9db
--- /dev/null
+++ b/newest.bak
Binary files differ
diff --git a/src/main/java/zy/cloud/wms/manager/controller/DiffValController.java b/src/main/java/zy/cloud/wms/manager/controller/DiffValController.java
index f2b6e68..7069686 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/DiffValController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/DiffValController.java
@@ -6,7 +6,12 @@
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
import com.core.common.DateUtils;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
+import zy.cloud.wms.manager.dto.DiffValDto;
import zy.cloud.wms.manager.entity.DiffVal;
+import zy.cloud.wms.manager.entity.Mat;
+import zy.cloud.wms.manager.mapper.MatMapper;
import zy.cloud.wms.manager.service.DiffValService;
import com.core.annotations.ManagerAuth;
import com.core.common.BaseRes;
@@ -18,11 +23,14 @@
import java.util.*;
+@Slf4j
@RestController
public class DiffValController extends BaseController {
@Autowired
private DiffValService diffValService;
+ @Autowired
+ private MatMapper matMapper;
@RequestMapping(value = "/diffVal/{id}/auth")
@ManagerAuth
@@ -36,12 +44,34 @@
@RequestParam(defaultValue = "10")Integer limit,
@RequestParam(required = false)String orderByField,
@RequestParam(required = false)String orderByType,
- @RequestParam Map<String, Object> param){
+ @RequestParam Map<String, Object> param,
+ @RequestParam(defaultValue = "0")Integer includeZero){
EntityWrapper<DiffVal> wrapper = new EntityWrapper<>();
+ param.remove("includeZero");
excludeTrash(param);
convert(param, wrapper);
if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
- return R.ok(diffValService.selectPage(new Page<>(curr, limit), wrapper));
+ //鏈辫埅甯�
+ log.info("includeZero鐨勫�兼槸"+includeZero);
+ if (includeZero != 0){
+ wrapper.ne("val",0.0);
+ }
+ List<DiffValDto> dvd = new ArrayList<>();
+ Page<DiffVal> diffValPage = diffValService.selectPage(new Page<>(curr, limit), wrapper);
+ for (DiffVal record : diffValPage.getRecords()) {
+
+ Mat mat = matMapper.selectByMatnr(record.getMatnr());
+ DiffValDto diffValDto = new DiffValDto();
+ BeanUtils.copyProperties(record,diffValDto,DiffValDto.class);
+ diffValDto.setMaktx(mat.getMaktx());
+ log.info("闆嗗悎涓殑姣忔潯鏁版嵁"+diffValDto);
+ dvd.add(diffValDto);
+
+ }
+ Page<DiffValDto> diffValDtoPage = new Page<>();
+ diffValDtoPage.setRecords(dvd);
+
+ return R.ok(diffValDtoPage);
}
private void convert(Map<String, Object> map, EntityWrapper wrapper){
@@ -120,4 +150,17 @@
return R.ok();
}
+ @RequestMapping("/diffVal/getList")
+ @ManagerAuth
+ public R getList(@RequestParam(required = false) String condition,
+ @RequestParam Integer type) {
+ List<Map<String, Object>> result = new ArrayList<>();
+ HashMap<String, Object> trueResult = new HashMap<>();
+ trueResult.put("val","0");
+ HashMap<String, Object> falseResult = new HashMap<>();
+ falseResult.put("val","1");
+ result.add(trueResult);
+ result.add(falseResult);
+ return R.ok().add(result);
+ }
}
diff --git a/src/main/java/zy/cloud/wms/manager/controller/NodeController.java b/src/main/java/zy/cloud/wms/manager/controller/NodeController.java
index 7c4f356..b5ad448 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/NodeController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/NodeController.java
@@ -191,6 +191,7 @@
map.put("val", node.getName());
result.add(map);
}
+
return R.ok().add(result);
}
diff --git a/src/main/java/zy/cloud/wms/manager/dto/DiffValDto.java b/src/main/java/zy/cloud/wms/manager/dto/DiffValDto.java
new file mode 100644
index 0000000..4702039
--- /dev/null
+++ b/src/main/java/zy/cloud/wms/manager/dto/DiffValDto.java
@@ -0,0 +1,65 @@
+package zy.cloud.wms.manager.dto;
+
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.enums.IdType;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.springframework.format.annotation.DateTimeFormat;
+import zy.cloud.wms.manager.entity.DiffVal;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class DiffValDto implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 鐗╂枡缂栧彿
+ */
+ @ApiModelProperty(value= "鐗╂枡缂栧彿")
+ @TableId(value = "matnr", type = IdType.INPUT)
+ private String matnr;
+
+
+ private String maktx;
+ /**
+ * WMS搴撳瓨
+ */
+ @ApiModelProperty(value= "WMS搴撳瓨")
+ @TableField("stock_qty")
+ private Double stockQty;
+
+ /**
+ * ERP搴撳瓨
+ */
+ @ApiModelProperty(value= "ERP搴撳瓨")
+ @TableField("erp_qty")
+ private Double erpQty;
+
+ /**
+ * 宸紓鍊�
+ */
+ @ApiModelProperty(value= "宸紓鍊�")
+ private Double val;
+
+ /**
+ * 鏇存柊鏃堕棿
+ */
+ @ApiModelProperty(value= "鏇存柊鏃堕棿")
+ @TableField("update_time")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date updateTime;
+
+ /**
+ * 澶囨敞
+ */
+ @ApiModelProperty(value= "澶囨敞")
+ private String memo;
+}
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 9f455f0..f476d2d 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,29 +1,29 @@
server:
port: 8080
servlet:
- context-path: /@pom.build.finalName@
+ context-path: /wms
spring:
application:
- name: @pom.build.finalName@
+ name: wms
datasource:
# mysql
-# driver-class-name: com.mysql.jdbc.Driver
-# url: jdbc:mysql://127.0.0.1:3306/cool?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
-# username: root
-# password: xltys1995
+ # driver-class-name: com.mysql.jdbc.Driver
+ # url: jdbc:mysql://127.0.0.1:3306/cool?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
+ # username: root
+ # password: xltys1995
# sql-server
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
- url: jdbc:sqlserver://192.168.1.56:1433;databasename=htasrs
+ url: jdbc:sqlserver://127.0.0.1:1433;databasename=htasrs
username: sa
- password: sa@123
+ password: qq0901593322
mvc:
static-path-pattern: /**
redis:
host: localhost
port: 6379
database: 0
-# password: xltys1995
+ # password: xltys1995
servlet:
multipart:
maxFileSize: 10MB
@@ -50,7 +50,7 @@
id: LTAI4GDzr6ioSHuRw2mk22ug
secret: 84CHL7tF21LbU1qpaP0jn9mIAZP9bv
bucket: tjdt
- endpoint: http://oss-cn-hangzhou.aliyuncs.com
+ endpoint: http://oss-cn-hangzhou1.aliyuncs.com
asrs:
baseUrl: http://192.168.1.56:8080/htwms
diff --git a/src/main/webapp/static/js/diffVal/diffVal.js b/src/main/webapp/static/js/diffVal/diffVal.js
index 263d248..1203e8c 100644
--- a/src/main/webapp/static/js/diffVal/diffVal.js
+++ b/src/main/webapp/static/js/diffVal/diffVal.js
@@ -22,6 +22,7 @@
cols: [[
{type: 'checkbox'}
,{field: 'matnr', align: 'center',title: '鐗╂枡缂栧彿'}
+ ,{field: 'maktx', align: 'center',title: '鐗╂枡鍚嶇О'}
,{field: 'stockQty', align: 'center',title: 'WMS搴撳瓨'}
,{field: 'erpQty', align: 'center',title: 'ERP搴撳瓨'}
,{field: 'val', align: 'center',title: '宸紓鍊�', style: 'font-weight: bold;color: blue'}
@@ -46,6 +47,9 @@
statusCode: 200
},
done: function(res, curr, count) {
+ // console.log(res.data);
+ // console.log(res.data.total);
+ console.log(res.data.records);
if (res.code === 403) {
top.location.href = baseUrl+"/";
}
@@ -228,6 +232,14 @@
}
layDateRender();
+
+ form.on("select(chooseItem)", function (data) {
+ console.log(data);
+ tableIns.reload({
+ where: { includeZero: data.value}
+ });
+
+ })
});
diff --git a/src/main/webapp/views/diffVal/diffVal.html b/src/main/webapp/views/diffVal/diffVal.html
index 146d35a..3213b30 100644
--- a/src/main/webapp/views/diffVal/diffVal.html
+++ b/src/main/webapp/views/diffVal/diffVal.html
@@ -25,6 +25,14 @@
<button id="search" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="search">鎼滅储</button>
<button id="reset" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="reset">閲嶇疆</button>
</div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <select lay-filter="chooseItem" id="chooseItem" name="parent_id">
+ <option value="0" >鏄惧紡鍏ㄩ儴</option>
+ <option value="1">鏄惧紡宸紓</option>
+ </select>
+ </div>
+ </div>
</div>
<!-- 琛ㄦ牸 -->
@@ -33,7 +41,7 @@
</div>
<script type="text/html" id="toolbar">
<div class="layui-btn-container">
-<!-- <button class="layui-btn layui-btn-sm" id="btn-add" lay-event="addData">鏂板</button>-->
+
<!-- <button class="layui-btn layui-btn-sm" id="btn-delete" lay-event="deleteData">鍒犻櫎</button>-->
<button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData" style="margin-top: 10px">瀵煎嚭</button>
</div>
@@ -50,6 +58,25 @@
<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/diffVal/diffVal.js" charset="utf-8"></script>
</body>
+<!--<script type="text/template" id="parentNodeGroup">-->
+<!-- <option value="">閫夋嫨搴撳尯</option>-->
+<!-- {{#each data}}-->
+<!-- <option value="{{this.key}}">{{this.val}}</option>-->
+<!-- {{/each}}-->
+<!--</script>-->
+<!--<script type="text/javascript">-->
+<!-- getParentNode();-->
+<!-- function getParentNode(el) {-->
+<!-- http.post(baseUrl + "/parent/node/group", {type: 2}, function (res) {-->
+<!-- if (res.data != null) {-->
+<!-- var tpl = $("#parentNodeGroup").html();-->
+<!-- var template = Handlebars.compile(tpl);-->
+<!-- var html = template(res);-->
+<!-- $('#parentId').append(html);-->
+<!-- }-->
+<!-- });-->
+<!-- }-->
+<!--</script>-->
<!-- 琛ㄥ崟寮圭獥 -->
<script type="text/html" id="editDialog">
<form id="detail" lay-filter="detail" class="layui-form admin-form">
@@ -102,5 +129,8 @@
</div>
</form>
</script>
+<script type="text/javascript">
+
+</script>
</html>
--
Gitblit v1.9.1