2021.12.7

mrzhssss

2021-12-07 7df6ab7f0cede6c1a9aa51e496f910026a4bfce6

2021.12.7

 framework-2.0.0.jar

Binary files differ

 htasrs.bak

Binary files differ

 newest.bak

Binary files differ

 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);
    }
}

 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);
    }


 src/main/java/zy/cloud/wms/manager/dto/DiffValDto.java

New file
@@ -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;
}

 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

 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}
        });
        
    })

});


 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>