分卷入库明细 2022年12月15日 sxm

3 years ago · 045ca12b40
3 changed files with 152 additions and 3 deletions
--- a/src/main/java/com/gaotao/common/utils/DateUtil.java
+++ b/src/main/java/com/gaotao/common/utils/DateUtil.java
@ -148,6 +148,15 @@ public class DateUtil {

    }

+    public static Date getStringToDate(String time)  {
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        try {
+            return sdf.parse(time);
+        } catch (ParseException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
    /**
     * @param @param  date
     * @param @return 设定文件
--- a/src/main/java/com/gaotao/modules/sys/service/impl/SysConfigServiceImpl.java
+++ b/src/main/java/com/gaotao/modules/sys/service/impl/SysConfigServiceImpl.java
@ -51,14 +51,14 @@ public class SysConfigServiceImpl extends ServiceImpl<SysConfigDao, SysConfigEnt
    @Transactional(rollbackFor = Exception.class)
    public void update(SysConfigEntity config) {
        this.updateById(config);
-        sysConfigRedis.saveOrUpdate(config);
+        //sysConfigRedis.saveOrUpdate(config);
    }

    @Override
    @Transactional(rollbackFor = Exception.class)
    public void updateValueByKey(String key, String value) {
        baseMapper.updateValueByKey(key, value);
-        sysConfigRedis.delete(key);
+       // sysConfigRedis.delete(key);
    }

    @Override
@ -66,7 +66,7 @@ public class SysConfigServiceImpl extends ServiceImpl<SysConfigDao, SysConfigEnt
    public void deleteBatch(Long[] ids) {
        for (Long id : ids) {
            SysConfigEntity config = this.getById(id);
-            sysConfigRedis.delete(config.getParamKey());
+            //sysConfigRedis.delete(config.getParamKey());
        }

        this.removeByIds(Arrays.asList(ids));
--- a/src/main/resources/templates/produce/split_roll_nos.ftl
+++ b/src/main/resources/templates/produce/split_roll_nos.ftl
@ -0,0 +1,140 @@
+<!DOCTYPE html>
+<html lang="zh-CN">
+<head>
+<meta charset="utf-8">
+<meta http-equiv="X-UA-Compatible" content="IE=edge">
+<meta name="viewport" content="width=device-width, initial-scale=1">
+<!-- The above 3 meta tags *must* come first in the head; any other head content must come *after* these tags -->
+<meta name="description" content="">
+<meta name="author" content="">
+<link rel="icon" href="/favicon.ico">
+<title>${projectTitle!"MESPda"}</title>
+<!-- Bootstrap core CSS -->
+<link href="/pda/bootstrap/3.3.7/bootstrap.min.css" rel="stylesheet">
+<link href="/pda/bootstrap/3.3.7/bootstrap-theme.min.css" rel="stylesheet">
+
+<link rel="stylesheet" type="text/css"
+	href="/pda/jeasyui/themes/default/easyui.css">
+<link rel="stylesheet" type="text/css" href="/pda/jeasyui/themes/icon.css">
+
+<!-- Custom styles for this template -->
+	<link href="/pda/css/base.css" rel="stylesheet">
+	<link rel="stylesheet" type="text/css" href="/css/button.css">
+</head>
+<body>
+	<div id="app">
+		<div class="mint-tab-container screenHeight">
+			<header class="mint-header is-fixed">
+				<div class="mint-header-button is-left">
+					<div class="header-title">
+						<a href="/pda/produceAccept?titleName=''&menuId=0"  class="go-back"><i class="mintui mintui-back"></i></a>
+						<span>融欣MES - 生产收货</span>
+					</div>
+				</div>
+				<h1 class="mint-header-title"></h1>
+				<div class="mint-header-button is-right"></div>
+			</header>
+			<div class="r-left ivu-row">
+				<div class="ivu-col ivu-col-span-6">生产订单号：</div>
+				<div class="ivu-col ivu-col-span-14">${rollNos.orderNo!'' }</div>
+				<input id="orderNo" type="hidden" value="${rollNos.orderNo!'' }" >
+			</div>
+			<div class="r-left ivu-row">
+				<div class="ivu-col ivu-col-span-6">物料编码：</div>
+				<div class="ivu-col ivu-col-span-14">${rollNos.partNo!'' }</div>
+				<input id="partNo" type="hidden" value="${rollNos.partNo!'' }" >
+			</div>
+			<div class="r-left ivu-row">
+				<div class="ivu-col ivu-col-span-6">物料描述：</div>
+				<div class="ivu-col ivu-col-span-14">${rollNos.partDes!'' }</div>
+			</div>
+			<div class="r-left ivu-row">
+				<div class="ivu-col ivu-col-span-6">单卷数量：</div>
+				<div class="ivu-col ivu-col-span-14">${rollNos.nums!'' }</div>
+				<input id="sigelNums" type="hidden" value="${rollNos.nums!'' }" >
+			</div>
+			<div class="r-left ivu-row">
+				<div class="ivu-col ivu-col-span-6">卷数：</div>
+				<div class="ivu-col ivu-col-span-14" id="show_roll_nums">${rollNos.rollNums!'' }</div>
+				<input id="roll_nums" type="hidden" value="${rollNos.rollNums!'' }" >
+			</div>
+			<div class="ivu-table-wrapper">
+				<div class="ivu-table">
+					<div class="ivu-table-header">
+						<table cellspacing="0" cellpadding="0" border="0" style="width: 100%;">
+							<colgroup>
+								<col width="70%">
+								<col width="30%">
+							</colgroup>
+							<thead>
+								<tr>
+								<th class="">
+									<div class="ivu-table-cell">
+										<span>卷号</span>
+									</div>
+								</th>
+								<th class="">
+									<div class="ivu-table-cell">
+									<span>操作</span>
+									</div>
+								</th>
+								</tr>
+							</thead>
+						</table>
+					</div>
+					<div class="ivu-table-body">
+						<table cellspacing="0" cellpadding="0" border="0"
+							style="width: 100%;">
+							<colgroup>
+								<col width="70%">
+								<col width="30%">
+							</colgroup>
+							<tbody class="ivu-table-tbody">
+							<#assign  temp = rollNos.rollNoList! >
+							<#list temp ? keys as key >
+								<tr class="ivu-table-row">
+									<td class="">
+										<div class="ivu-table-cell">
+											<span>${temp[key]}</span>
+										</div>
+									</td>
+									<td class="">
+										<div class="ivu-table-cell">
+										<div>
+											<button type="button"  onclick="delRoll('${temp[key]}','${rollNos.orderNo }',this)" class="ivu-btn ivu-btn-error ivu-btn-small">
+													<span>删除</span>
+											</button>
+										</div>
+										</div>
+									</td>
+								</tr>
+							</#list>
+							</tbody>
+						</table>
+					</div>
+					<div class="ivu-table-tip" style="display: none;">
+						<table cellspacing="0" cellpadding="0" border="0">
+							<tbody>
+								<tr>
+									<td><span>暂无筛选结果</span></td>
+								</tr>
+							</tbody>
+						</table>
+					</div>
+				</div>
+			</div>
+			<div class="ivu-row" style="margin-top: 10px;">
+				<div class="ivu-col ivu-col-span-6 ivu-col-offset-18">
+					<a href="/pda/produceAccept?titleName=''&menuId=0"  class="ivu-btn ivu-btn-primary">
+						<span>返回</span>
+					</a>
+				</div>
+			</div>
+		</div>
+	</div>
+</body>
+<script type="text/javascript" src="/js/jquery/jquery-2.1.4.js"></script>
+<script type="text/javascript" src="/pda/layer/layer.js"></script>
+<script type="text/javascript" src="/pda/js/produce/split_roll_nos.js"></script>
+<script type="text/javascript" src="/js/jquery/jquery.cookie.js"></script>
+</html>