zy-asrs.git - Gitblit

parent: 3d8242c7 | 补丁 | 提交 | ignore whitespace

skyouc

15 小时以前 b2629d65e6af766b4d285068e954ca65aed513e5

logo不显示中扬信息

4个文件已修改

1 文件已复制

3 文件已重命名

1个文件已删除

	src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java	25 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/webapp/static/image/favicon1.ico	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/webapp/static/image/logo1.png	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/webapp/static/image/logo_light_colour.png	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/webapp/static/image/logo_light_colour1.png	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/webapp/static/image/zy_logo_dark_color1.png	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/webapp/static/js/wrkMast/wrkMast.js	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/webapp/views/index.html	24 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/webapp/views/login.html	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java

@@ -539,16 +539,16 @@
            wrkDetl.setStandby1(locDto.getStandby1());
            wrkDetl.setBatch(locDto.getBatch());
            wrkDetl.setOrderNo(locDto.getOrderNo());
//            wrkDetl.setAnfme(locDto.getAnfme()); // 数量
            LocDetl locDel = locDetlService.selectOne(new EntityWrapper<LocDetl>()
                    .eq("loc_no", locDto.getLocNo())
                    .eq("batch", locDto.getBatch())
                    .eq(!Objects.isNull(locDto.getBarcode()), "barcode", locDto.getBarcode())
                    .eq("matnr", locDto.getMatnr()));
            if (Objects.isNull(locDel)) {
                throw new CoolException("数据错误，库存明细不存在！！");
            }
            wrkDetl.setAnfme(locDel.getAnfme());
            wrkDetl.setAnfme(locDto.getAnfme()); // 数量
//            LocDetl locDel = locDetlService.selectOne(new EntityWrapper<LocDetl>()
//                    .eq("loc_no", locDto.getLocNo())
//                    .eq("batch", locDto.getBatch())
//                    .eq(!Objects.isNull(locDto.getBarcode()), "barcode", locDto.getBarcode())
//                    .eq("matnr", locDto.getMatnr()));
//            if (Objects.isNull(locDel)) {
//                throw new CoolException("数据错误，库存明细不存在！！");
//            }
//            wrkDetl.setAnfme(locDel.getAnfme());
            wrkDetl.setAppeTime(now);
            wrkDetl.setAppeUser(userId);
            wrkDetl.setModiTime(now);
@@ -1392,6 +1392,10 @@
        if (Cools.isEmpty(wrkMast)) {
            throw new CoolException(workNo + "工作档不存在");
        }
        if (wrkMast.getWrkSts() != 15) {
            throw new CoolException("当前任务状态不能执行此操作！");
        }

        Integer ioType = wrkMast.getIoType() - 50;
        Integer wokNo;
        // 入出库类型判断
@@ -1453,7 +1457,6 @@
        if (!locMastService.updateById(locMast)) {
            throw new CoolException("修改库位状态失败");
        }

        wrkMast.setWrkCode(null);

        if (!wrkMastService.updateById(wrkMast)) {

 src/main/webapp/static/image/favicon1.ico



 src/main/webapp/static/image/logo1.png



 src/main/webapp/static/image/logo_light_colour.png

Binary files differ

 src/main/webapp/static/image/logo_light_colour1.png



 src/main/webapp/static/image/zy_logo_dark_color1.png



 src/main/webapp/static/js/wrkMast/wrkMast.js

@@ -304,7 +304,7 @@
            //  拣料入库
            case 'pick':
                layer.confirm('拣料入库该笔工作档？', {title: '工作号：'+data.wrkNo, shadeClose: true}, function(){
                    http.post(baseUrl+"/hand/control/wrkMast", {workNo: data.wrkNo, type:3}, function (res) {
                    http.post(baseUrl+"/hand/control/wrkMast", {workNo: data.wrkNo, type:4}, function (res) {
                        $(".layui-laypage-btn")[0].click();
                        layer.msg(data.wrkNo + res.msg);
                    })

 src/main/webapp/views/index.html

@@ -2,7 +2,7 @@
<html lang="en">
<head>
  <meta charset="utf-8">
  <title>中扬 - 自动化立体仓库 - AS / RS</title>
<!--  <title>中扬 - 自动化立体仓库 - AS / RS</title>-->
  <meta name="renderer" content="webkit">
  <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
  <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
@@ -25,12 +25,12 @@
<div class="layui-layout layui-layout-admin">
  <!-- 头部 -->
  <div class="layui-header">
    <div class="layui-logo">
      <img src="../static/image/zy_logo_dark_color.png" style="display: inline-block; width: 40%;height: auto">
      <!--          <span style="margin-top: 0; letter-spacing: 10px">中扬立库</span>-->
      <!--          <img src="../static/image/logo.svg"/>-->
      <!--          <cite>中扬 - Zoneyung</cite>-->
    </div>
<!--    <div class="layui-logo">-->
<!--      <img src="../static/image/zy_logo_dark_color.png" style="display: inline-block; width: 40%;height: auto">-->
<!--      &lt;!&ndash;          <span style="margin-top: 0; letter-spacing: 10px">中扬立库</span>&ndash;&gt;-->
<!--      &lt;!&ndash;          <img src="../static/image/logo.svg"/>&ndash;&gt;-->
<!--      &lt;!&ndash;          <cite>中扬 - Zoneyung</cite>&ndash;&gt;-->
<!--    </div>-->

    <ul class="layui-nav layui-layout-left">
      <li class="layui-nav-item" lay-unselect>
@@ -74,10 +74,10 @@
  <!-- 主体部分 -->
  <div class="layui-body"></div>
  <!-- 底部 -->
  <div class="layui-footer layui-text">
    copyright © 2022 <a href="https://www.superton.cn/" target="_blank">浙江中扬立库有限公司</a> all rights reserved.
    <span class="pull-right">Version 1.0.0</span>
  </div>
<!--  <div class="layui-footer layui-text">-->
<!--    copyright © 2022 <a href="https://www.superton.cn/" target="_blank">浙江中扬立库有限公司</a> all rights reserved.-->
<!--    <span class="pull-right">Version 1.0.0</span>-->
<!--  </div>-->

</div>

@@ -91,7 +91,7 @@
<script type="text/javascript" src="../static/js/handlebars/handlebars-v4.5.3.js"></script>
<script type="text/javascript" src="../static/js/common.js"></script>
<script>
  console.log('%c 中扬立库平台 %c 1.0.0','background-color:rgb(53,73,94);color: #fff;border-radius:2px 0 0 2px;padding:2px 4px;','background-color:rgb(25,190,107);color: #fff;border-radius:0 2px 2px 0;padding:2px 4px;font: 9pt "Apercu Regular", Georgia, "Times New Roman", Times, serif;');
  // console.log('%c 中扬立库平台 %c 1.0.0','background-color:rgb(53,73,94);color: #fff;border-radius:2px 0 0 2px;padding:2px 4px;','background-color:rgb(25,190,107);color: #fff;border-radius:0 2px 2px 0;padding:2px 4px;font: 9pt "Apercu Regular", Georgia, "Times New Roman", Times, serif;');
  $(function () {
    if ("" === localStorage.getItem('token')) {
      top.location.href = baseUrl + "/login";

 src/main/webapp/views/login.html

@@ -3,7 +3,7 @@
<head>
    <meta charset="utf-8">
    <meta http-equiv="X-UA-Compatible" content="IE=edge">
    <title>中扬 │ login of zoneyung wms</title>
    <title>WMS</title>
    <meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1,minimum-scale=1">
    <meta name="description" content="study of Instancing with three.js">
    <meta name="keywords" content="undefined, Yoichi Kobayashi, WebGL, three.js">

			@@ -539,16 +539,16 @@
			wrkDetl.setStandby1(locDto.getStandby1());
			wrkDetl.setBatch(locDto.getBatch());
			wrkDetl.setOrderNo(locDto.getOrderNo());
			// wrkDetl.setAnfme(locDto.getAnfme()); // 数量
			LocDetl locDel = locDetlService.selectOne(new EntityWrapper<LocDetl>()
			.eq("loc_no", locDto.getLocNo())
			.eq("batch", locDto.getBatch())
			.eq(!Objects.isNull(locDto.getBarcode()), "barcode", locDto.getBarcode())
			.eq("matnr", locDto.getMatnr()));
			if (Objects.isNull(locDel)) {
			throw new CoolException("数据错误，库存明细不存在！！");
			}
			wrkDetl.setAnfme(locDel.getAnfme());
			wrkDetl.setAnfme(locDto.getAnfme()); // 数量
			// LocDetl locDel = locDetlService.selectOne(new EntityWrapper<LocDetl>()
			// .eq("loc_no", locDto.getLocNo())
			// .eq("batch", locDto.getBatch())
			// .eq(!Objects.isNull(locDto.getBarcode()), "barcode", locDto.getBarcode())
			// .eq("matnr", locDto.getMatnr()));
			// if (Objects.isNull(locDel)) {
			// throw new CoolException("数据错误，库存明细不存在！！");
			// }
			// wrkDetl.setAnfme(locDel.getAnfme());
			wrkDetl.setAppeTime(now);
			wrkDetl.setAppeUser(userId);
			wrkDetl.setModiTime(now);
			@@ -1392,6 +1392,10 @@
			if (Cools.isEmpty(wrkMast)) {
			throw new CoolException(workNo + "工作档不存在");
			}
			if (wrkMast.getWrkSts() != 15) {
			throw new CoolException("当前任务状态不能执行此操作！");
			}

			Integer ioType = wrkMast.getIoType() - 50;
			Integer wokNo;
			// 入出库类型判断
			@@ -1453,7 +1457,6 @@
			if (!locMastService.updateById(locMast)) {
			throw new CoolException("修改库位状态失败");
			}

			wrkMast.setWrkCode(null);

			if (!wrkMastService.updateById(wrkMast)) {

			@@ -304,7 +304,7 @@
			// 拣料入库
			case 'pick':
			layer.confirm('拣料入库该笔工作档？', {title: '工作号：'+data.wrkNo, shadeClose: true}, function(){
			http.post(baseUrl+"/hand/control/wrkMast", {workNo: data.wrkNo, type:3}, function (res) {
			http.post(baseUrl+"/hand/control/wrkMast", {workNo: data.wrkNo, type:4}, function (res) {
			$(".layui-laypage-btn")[0].click();
			layer.msg(data.wrkNo + res.msg);
			})

			@@ -2,7 +2,7 @@
			<html lang="en">
			<head>
			<meta charset="utf-8">
			<title>中扬 - 自动化立体仓库 - AS / RS</title>
			<!-- <title>中扬 - 自动化立体仓库 - AS / RS</title>-->
			<meta name="renderer" content="webkit">
			<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
			<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
			@@ -25,12 +25,12 @@
			<div class="layui-layout layui-layout-admin">
			<!-- 头部 -->
			<div class="layui-header">
			<div class="layui-logo">
			<img src="../static/image/zy_logo_dark_color.png" style="display: inline-block; width: 40%;height: auto">
			<!-- <span style="margin-top: 0; letter-spacing: 10px">中扬立库</span>-->
			<!-- <img src="../static/image/logo.svg"/>-->
			<!-- <cite>中扬 - Zoneyung</cite>-->
			</div>
			<!-- <div class="layui-logo">-->
			<!-- <img src="../static/image/zy_logo_dark_color.png" style="display: inline-block; width: 40%;height: auto">-->
			<!-- <!– <span style="margin-top: 0; letter-spacing: 10px">中扬立库</span>–>-->
			<!-- <!– <img src="../static/image/logo.svg"/>–>-->
			<!-- <!– <cite>中扬 - Zoneyung</cite>–>-->
			<!-- </div>-->

			<ul class="layui-nav layui-layout-left">
			<li class="layui-nav-item" lay-unselect>
			@@ -74,10 +74,10 @@
			<!-- 主体部分 -->
			<div class="layui-body"></div>
			<!-- 底部 -->
			<div class="layui-footer layui-text">
			copyright © 2022 <a href="https://www.superton.cn/" target="_blank">浙江中扬立库有限公司</a> all rights reserved.
			<span class="pull-right">Version 1.0.0</span>
			</div>
			<!-- <div class="layui-footer layui-text">-->
			<!-- copyright © 2022 <a href="https://www.superton.cn/" target="_blank">浙江中扬立库有限公司</a> all rights reserved.-->
			<!-- <span class="pull-right">Version 1.0.0</span>-->
			<!-- </div>-->

			</div>

			@@ -91,7 +91,7 @@
			<script type="text/javascript" src="../static/js/handlebars/handlebars-v4.5.3.js"></script>
			<script type="text/javascript" src="../static/js/common.js"></script>
			<script>
			console.log('%c 中扬立库平台 %c 1.0.0','background-color:rgb(53,73,94);color: #fff;border-radius:2px 0 0 2px;padding:2px 4px;','background-color:rgb(25,190,107);color: #fff;border-radius:0 2px 2px 0;padding:2px 4px;font: 9pt "Apercu Regular", Georgia, "Times New Roman", Times, serif;');
			// console.log('%c 中扬立库平台 %c 1.0.0','background-color:rgb(53,73,94);color: #fff;border-radius:2px 0 0 2px;padding:2px 4px;','background-color:rgb(25,190,107);color: #fff;border-radius:0 2px 2px 0;padding:2px 4px;font: 9pt "Apercu Regular", Georgia, "Times New Roman", Times, serif;');
			$(function () {
			if ("" === localStorage.getItem('token')) {
			top.location.href = baseUrl + "/login";

			@@ -3,7 +3,7 @@
			<head>
			<meta charset="utf-8">
			<meta http-equiv="X-UA-Compatible" content="IE=edge">
			<title>中扬 │ login of zoneyung wms</title>
			<title>WMS</title>
			<meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1,minimum-scale=1">
			<meta name="description" content="study of Instancing with three.js">
			<meta name="keywords" content="undefined, Yoichi Kobayashi, WebGL, three.js">