master
CaesarBao 6 months ago
parent bb7f8e4577
commit ffa8736820

@ -38,7 +38,6 @@ public class SelectParaAllController extends BaseController {
{
return prefix + "/ParaAllShow";
}
@RequiresPermissions("nanjing:ParaAllShow:list")
@PostMapping("/paraAllShow")
@ResponseBody
public TableDataInfo list(HttpServletRequest request)

@ -56,7 +56,7 @@ public class SelectProductChangeInfoController extends BaseController
/**
*
*/
@RequiresPermissions("nanjing:SelectProductChangeInfo:list")
@RequiresPermissions("nanjing:SelectProductChangeInfo:view")
@PostMapping("/list")
@ResponseBody
public TableDataInfo list(TRpProductchangeinfo tRpProductchangeinfo)

@ -41,7 +41,7 @@ public class StationParaInfoController extends BaseController {
return prefix + "/StationParaInfo";
}
@RequiresPermissions("nanjing:StationPara:list")
@RequiresPermissions("nanjing:StationPara:view")
@PostMapping("/list")
@ResponseBody
public TableDataInfo list(HttpServletRequest request) {
@ -60,7 +60,7 @@ public class StationParaInfoController extends BaseController {
s = tracestateService.selectSemi(productBarcode);
if (s==null && productBarcode.length()!=0){
System.out.println(productBarcode.length());
System.out.println("nulllllllllllllllllllllllllllllllllllllllllllllll");
// System.out.println("nulllllllllllllllllllllllllllllllllllllllllllllll");
map.put("SemiBarcode", "qqqqqqqqqqqqqqqqqqqqqqqqqqqq");
}
else {
@ -78,27 +78,31 @@ public class StationParaInfoController extends BaseController {
map.put("StateID", "");
// s200 210 230 240直接查产品码 5 6 8 9 11 12
// s300 320
if (stationCode.equals("5")||stationCode.equals("6")||stationCode.equals("8")
||stationCode.equals("9")||stationCode.equals("11")||stationCode.equals("12")
if (stationCode.equals("2") || stationCode.equals("3") ||stationCode.equals("4") || stationCode.equals("8") ||stationCode.equals("9")
||stationCode.equals("11")||stationCode.equals("12")||stationCode.equals("13")||stationCode.equals("14")||stationCode.equals("15")||stationCode.equals("16")||stationCode.equals("17")||stationCode.equals("18")||stationCode.equals("19")||stationCode.equals("20")
){
map.put("ScanBarcode",productBarcode);
List<Map<String, Object>> list = tracestateService.selectStationPara2(map);
return getDataTable(list);
}
else{
else {
if (stationCode.equals("5") || stationCode.equals("6") || stationCode.equals("7")) {
String semiBarcode = tracestateService.selectsemiBarcode(productBarcode);
map.put("SemiBarcode", semiBarcode);
}
List<Map<String, Object>> list = tracestateService.selectStationPara(map);
for (int i = 0; i < list.size(); i++) {
if (list.get(i).containsKey("系统主条码")) {
continue;
} else {
list.get(i).put("系统主条码", "-");
List<Map<String, Object>> list = tracestateService.selectStationPara(map);
for (int i = 0; i < list.size(); i++) {
if (list.get(i).containsKey("系统主条码")) {
continue;
} else {
list.get(i).put("系统主条码", "-");
}
}
return getDataTable(list);
}
return getDataTable(list);
}
}
// @RequiresPermissions("nanjing:StationPara:export")

@ -5,14 +5,14 @@ spring:
driverClassName: com.microsoft.sqlserver.jdbc.SQLServerDriver
druid:
# 主库数据源
# master:
# url: jdbc:sqlserver://127.0.0.1:1433;SelectMethod=cursor;DatabaseName=JYD_shengjie
# username: sa
# password: haiwei@123
master:
url: jdbc:sqlserver://127.0.0.1:1433;SelectMethod=cursor;DatabaseName=JYD_shengjie
url: jdbc:sqlserver://192.168.0.254:1433;SelectMethod=cursor;DatabaseName=ATJ_HS_DB
username: sa
password: 123456
# master:
# url: jdbc:sqlserver://127.0.0.1:1433;SelectMethod=cursor;DatabaseName=ATJ_HS_DB
# username: sa
# password: 123456
# 从库数据源
slave:
# 从数据源开关/默认关闭

@ -17,7 +17,7 @@ ruoyi:
# 开发环境配置
server:
# 服务器的HTTP端口默认为80
port: 9080
port: 9099
servlet:
# 应用的访问路径
context-path: /

@ -189,9 +189,9 @@
<!-- <a title="" href="javascript:void(0)" onclick="baoyangtixing()" id="baoyangxuqiu">-->
<!-- 保养详情-->
<!-- </a>-->
<a title="" th:href="@{/monitor/jobLog/baoyangtixing}" class="menuItem" id="baoyangxuqiu">
保养详情
</a>
<!-- <a title="" th:href="@{/monitor/jobLog/baoyangtixing}" class="menuItem" id="baoyangxuqiu">-->
<!-- 保养详情-->
<!-- </a>-->
</li>
<li></li>
<li class="dropdown user-menu">

@ -44,8 +44,8 @@
<form id="signupForm" autocomplete="off">
<h4 class="no-margins">用户登录:</h4>
<!-- <p class="m-t-md">你若不离不弃,我必生死相依</p>-->
<input type="text" name="username" class="form-control uname" placeholder="用户名" value="admin" />
<input type="password" name="password" class="form-control pword" placeholder="密码" value="admin123" />
<input type="text" name="username" class="form-control uname" placeholder="用户名" value="ATJ_U" />
<input type="password" name="password" class="form-control pword" placeholder="密码" value="123456" />
<div class="row m-t" th:if="${captchaEnabled==true}">
<div class="col-xs-6">
<input type="text" name="validateCode" class="form-control code" placeholder="验证码" maxlength="5" />

@ -23,7 +23,7 @@
</div>
</form>
</div>
<div class="col-sm-12 select-table table-striped">
<div class="col-sm-12 select-table " style="height: 185px" >
<table id="bootstrap-table1"></table>
</div>

@ -0,0 +1,144 @@
<!DOCTYPE html>
<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
<head>
<th:block th:include="include :: header('条码打印记录列表')" />
</head>
<body class="gray-bg">
<div class="container-div">
<div class="row">
<div class="col-sm-12 search-collapse">
<form id="formId">
<div class="select-list">
<ul>
<!-- <li>-->
<!-- <label>${comment}</label>-->
<!-- <input type="text" name="ID"/>-->
<!-- </li>-->
<li>
<label>产品条码:</label>
<input type="text" name="ProductBarcode"/>
</li>
<li>
<label>序列号:</label>
<input type="text" name="SerialNo"/>
</li>
<!-- <li>-->
<!-- <label>是否补码:</label>-->
<!-- <input type="text" name="IsRestart"/>-->
<!-- </li>-->
<li>
<label>产品型号:</label>
<!-- <input type="text" name="ProductID"/>-->
<select name="ProductID">
<option value="">所有</option>
<option th:each="ls:${list}" th:value="${ls.productID}" th:text="${ls.productName}"></option>
</select>
</li>
<li>
<label>班次:</label>
<input type="text" name="ShiftID"/>
</li>
<li class="select-time">
<label>记录时间:</label>
<input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginTime]"/>
<span>-</span>
<input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endTime]"/>
<!-- <li class="select-time" >-->
<!-- <label>时间区间: </label>-->
<!-- <input type="text" style="width:160px" class="form-control" id="InsertTime" placeholder="开始时间">-->
<!-- <span>-</span>-->
<!-- <input type="text" style="width:160px" class="form-control" id="InsertTime" placeholder="结束时间">-->
<!-- </li>-->
</li>
<li>
<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
<a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
</li>
</ul>
</div>
</form>
</div>
<div class="btn-group-sm" id="toolbar" role="group">
<!-- <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="system:PrintInfo:add">-->
<!-- <i class="fa fa-plus"></i> 添加-->
<!-- </a>-->
<!-- <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="system:PrintInfo:edit">-->
<!-- <i class="fa fa-edit"></i> 修改-->
<!-- </a>-->
<!-- <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="system:PrintInfo:remove">-->
<!-- <i class="fa fa-remove"></i> 删除-->
<!-- </a>-->
<a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="nanjing:PrintInfo:export">
<i class="fa fa-download"></i> 导出
</a>
</div>
<div class="col-sm-12 select-table table-striped">
<table id="bootstrap-table"></table>
</div>
</div>
</div>
<th:block th:include="include :: footer" />
<script th:inline="javascript">
var editFlag = [[${@permission.hasPermi('nanjing:PrintInfo:edit')}]];
var removeFlag = [[${@permission.hasPermi('nanjing:PrintInfo:remove')}]];
var prefix = ctx + "nanjing/PrintInfo";
$(function() {
var options = {
url: prefix + "/list",
createUrl: prefix + "/add",
updateUrl: prefix + "/edit/{id}",
removeUrl: prefix + "/remove",
exportUrl: prefix + "/export",
modalName: "条码打印记录",
columns: [
// {
// checkbox: true
// },
// {
// field: 'id',
// title: '编号'
// },
{
field: 'productBarcode',
title: '产品条码'
},
{
field: 'serialNo',
title: '序列号'
},
// {
// field: 'isRestart',
// title: '是否补码'
// },
{
field: 'tBdProductinfo.productName',
title: '产品型号'
},
{
field: 'shiftID',
title: '班次'
},
{
field: 'insertTime',
title: '记录时间'
},
// {
// title: '操作',
// align: 'center',
// formatter: function(value, row, index) {
// var actions = [];
// actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.ID + '\')"><i class="fa fa-edit"></i>编辑</a> ');
// actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.ID + '\')"><i class="fa fa-remove"></i>删除</a>');
// return actions.join('');
// }
// }
]
};
$.table.init(options);
});
</script>
</body>
</html>

@ -0,0 +1,78 @@
<!DOCTYPE html>
<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
<head>
<th:block th:include="include :: header('新增条码打印记录')" />
<th:block th:include="include :: datetimepicker-css" />
</head>
<body class="white-bg">
<div class="wrapper wrapper-content animated fadeInRight ibox-content">
<form class="form-horizontal m" id="form-PrintInfo-add">
<div class="form-group">
<label class="col-sm-3 control-label">${comment}</label>
<div class="col-sm-8">
<input name="ID" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">${comment}</label>
<div class="col-sm-8">
<input name="ProductBarcode" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">${comment}</label>
<div class="col-sm-8">
<input name="SerialNo" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">${comment}</label>
<div class="col-sm-8">
<input name="IsRestart" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">${comment}</label>
<div class="col-sm-8">
<input name="ProductID" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">${comment}</label>
<div class="col-sm-8">
<input name="ShiftID" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">${comment}</label>
<div class="col-sm-8">
<div class="input-group date">
<input name="InsertTime" class="form-control" placeholder="yyyy-MM-dd" type="text">
<span class="input-group-addon"><i class="fa fa-calendar"></i></span>
</div>
</div>
</div>
</form>
</div>
<th:block th:include="include :: footer" />
<th:block th:include="include :: datetimepicker-js" />
<script th:inline="javascript">
var prefix = ctx + "nanjing/PrintInfo"
$("#form-PrintInfo-add").validate({
focusCleanup: true
});
function submitHandler() {
if ($.validate.form()) {
$.operate.save(prefix + "/add", $('#form-PrintInfo-add').serialize());
}
}
$("input[name='InsertTime']").datetimepicker({
format: "yyyy-mm-dd",
minView: "month",
autoclose: true
});
</script>
</body>
</html>

@ -0,0 +1,79 @@
<!DOCTYPE html>
<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
<head>
<th:block th:include="include :: header('修改条码打印记录')" />
<th:block th:include="include :: datetimepicker-css" />
</head>
<body class="white-bg">
<div class="wrapper wrapper-content animated fadeInRight ibox-content">
<form class="form-horizontal m" id="form-PrintInfo-edit" th:object="${baseBarcodePrintinfo}">
<input name="ID" th:field="*{ID}" type="hidden">
<div class="form-group">
<label class="col-sm-3 control-label">${comment}</label>
<div class="col-sm-8">
<input name="ID" th:field="*{ID}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">${comment}</label>
<div class="col-sm-8">
<input name="ProductBarcode" th:field="*{ProductBarcode}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">${comment}</label>
<div class="col-sm-8">
<input name="SerialNo" th:field="*{SerialNo}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">${comment}</label>
<div class="col-sm-8">
<input name="IsRestart" th:field="*{IsRestart}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">${comment}</label>
<div class="col-sm-8">
<input name="ProductID" th:field="*{ProductID}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">${comment}</label>
<div class="col-sm-8">
<input name="ShiftID" th:field="*{ShiftID}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">${comment}</label>
<div class="col-sm-8">
<div class="input-group date">
<input name="InsertTime" th:value="${#dates.format(baseBarcodePrintinfo.InsertTime, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text">
<span class="input-group-addon"><i class="fa fa-calendar"></i></span>
</div>
</div>
</div>
</form>
</div>
<th:block th:include="include :: footer" />
<th:block th:include="include :: datetimepicker-js" />
<script th:inline="javascript">
var prefix = ctx + "nanjing/PrintInfo";
$("#form-PrintInfo-edit").validate({
focusCleanup: true
});
function submitHandler() {
if ($.validate.form()) {
$.operate.save(prefix + "/edit", $('#form-PrintInfo-edit').serialize());
}
}
$("input[name='InsertTime']").datetimepicker({
format: "yyyy-mm-dd",
minView: "month",
autoclose: true
});
</script>
</body>
</html>

@ -0,0 +1,131 @@
package com.ruoyi.nanjing.domain;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import java.util.Date;
/**
* base_Barcode_PrintInfo
*
* @author ruoyi
* @date 2024-05-24
*/
public class BaseBarcodePrintinfo extends BaseEntity
{
private static final long serialVersionUID = 1L;
/** $column.columnComment */
@Excel(name = "编号")
private String ID;
/** $column.columnComment */
@Excel(name = "产品条码")
private String ProductBarcode;
/** $column.columnComment */
@Excel(name = "序列号")
private String SerialNo;
/** $column.columnComment */
@Excel(name = "是否补码")
private Long IsRestart;
/** $column.columnComment */
@Excel(name = "产品型号")
private Long ProductID;
/** $column.columnComment */
@Excel(name = "班次")
private String ShiftID;
/** $column.columnComment */
@Excel(name = "记录时间")
private Date InsertTime;
public TBdProductinfo gettBdProductinfo() {
return tBdProductinfo;
}
public void settBdProductinfo(TBdProductinfo tBdProductinfo) {
this.tBdProductinfo = tBdProductinfo;
}
private TBdProductinfo tBdProductinfo;
public void setID(String ID)
{
this.ID = ID;
}
public String getID()
{
return ID;
}
public void setProductBarcode(String ProductBarcode)
{
this.ProductBarcode = ProductBarcode;
}
public String getProductBarcode()
{
return ProductBarcode;
}
public void setSerialNo(String SerialNo)
{
this.SerialNo = SerialNo;
}
public String getSerialNo()
{
return SerialNo;
}
public void setIsRestart(Long IsRestart)
{
this.IsRestart = IsRestart;
}
public Long getIsRestart()
{
return IsRestart;
}
public void setProductID(Long ProductID)
{
this.ProductID = ProductID;
}
public Long getProductID()
{
return ProductID;
}
public void setShiftID(String ShiftID)
{
this.ShiftID = ShiftID;
}
public String getShiftID()
{
return ShiftID;
}
public void setInsertTime(Date InsertTime)
{
this.InsertTime = InsertTime;
}
public Date getInsertTime()
{
return InsertTime;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("ID", getID())
.append("ProductBarcode", getProductBarcode())
.append("SerialNo", getSerialNo())
.append("IsRestart", getIsRestart())
.append("ProductID", getProductID())
.append("ShiftID", getShiftID())
.append("InsertTime", getInsertTime())
.toString();
}
}

@ -0,0 +1,62 @@
package com.ruoyi.nanjing.mapper;
import com.ruoyi.nanjing.domain.BaseBarcodePrintinfo;
import java.util.List;
/**
* Mapper
*
* @author ruoyi
* @date 2024-05-24
*/
public interface BaseBarcodePrintinfoMapper
{
/**
*
*
* @param ID ID
* @return
*/
public BaseBarcodePrintinfo selectBaseBarcodePrintinfoById(String ID);
/**
*
*
* @param baseBarcodePrintinfo
* @return
*/
public List<BaseBarcodePrintinfo> selectBaseBarcodePrintinfoList(BaseBarcodePrintinfo baseBarcodePrintinfo);
/**
*
*
* @param baseBarcodePrintinfo
* @return
*/
public int insertBaseBarcodePrintinfo(BaseBarcodePrintinfo baseBarcodePrintinfo);
/**
*
*
* @param baseBarcodePrintinfo
* @return
*/
public int updateBaseBarcodePrintinfo(BaseBarcodePrintinfo baseBarcodePrintinfo);
/**
*
*
* @param ID ID
* @return
*/
public int deleteBaseBarcodePrintinfoById(String ID);
/**
*
*
* @param IDs ID
* @return
*/
public int deleteBaseBarcodePrintinfoByIds(String[] IDs);
}

@ -80,4 +80,6 @@ public interface TSyTracestateMapper
String selectSemi(String productBarcode);
String selectProductBarcode(String semiBarcode_A);
String selectsemiBarcode(String productBarcode);
}

@ -0,0 +1,62 @@
package com.ruoyi.nanjing.service;
import com.ruoyi.nanjing.domain.BaseBarcodePrintinfo;
import java.util.List;
/**
* Service
*
* @author ruoyi
* @date 2024-05-24
*/
public interface IBaseBarcodePrintinfoService
{
/**
*
*
* @param ID ID
* @return
*/
public BaseBarcodePrintinfo selectBaseBarcodePrintinfoById(String ID);
/**
*
*
* @param baseBarcodePrintinfo
* @return
*/
public List<BaseBarcodePrintinfo> selectBaseBarcodePrintinfoList(BaseBarcodePrintinfo baseBarcodePrintinfo);
/**
*
*
* @param baseBarcodePrintinfo
* @return
*/
public int insertBaseBarcodePrintinfo(BaseBarcodePrintinfo baseBarcodePrintinfo);
/**
*
*
* @param baseBarcodePrintinfo
* @return
*/
public int updateBaseBarcodePrintinfo(BaseBarcodePrintinfo baseBarcodePrintinfo);
/**
*
*
* @param ids ID
* @return
*/
public int deleteBaseBarcodePrintinfoByIds(String ids);
/**
*
*
* @param ID ID
* @return
*/
public int deleteBaseBarcodePrintinfoById(String ID);
}

@ -72,4 +72,6 @@ public interface ITSyTracestateService
String selectSemi(String productBarcode);
String selectProductBarcode(String semiBarcode_A);
String selectsemiBarcode(String productBarcode);
}

@ -0,0 +1,95 @@
package com.ruoyi.nanjing.service.impl;
import com.ruoyi.common.core.text.Convert;
import com.ruoyi.nanjing.domain.BaseBarcodePrintinfo;
import com.ruoyi.nanjing.mapper.BaseBarcodePrintinfoMapper;
import com.ruoyi.nanjing.service.IBaseBarcodePrintinfoService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
/**
* Service
*
* @author ruoyi
* @date 2024-05-24
*/
@Service
public class BaseBarcodePrintinfoServiceImpl implements IBaseBarcodePrintinfoService
{
@Autowired
private BaseBarcodePrintinfoMapper baseBarcodePrintinfoMapper;
/**
*
*
* @param ID ID
* @return
*/
@Override
public BaseBarcodePrintinfo selectBaseBarcodePrintinfoById(String ID)
{
return baseBarcodePrintinfoMapper.selectBaseBarcodePrintinfoById(ID);
}
/**
*
*
* @param baseBarcodePrintinfo
* @return
*/
@Override
public List<BaseBarcodePrintinfo> selectBaseBarcodePrintinfoList(BaseBarcodePrintinfo baseBarcodePrintinfo)
{
return baseBarcodePrintinfoMapper.selectBaseBarcodePrintinfoList(baseBarcodePrintinfo);
}
/**
*
*
* @param baseBarcodePrintinfo
* @return
*/
@Override
public int insertBaseBarcodePrintinfo(BaseBarcodePrintinfo baseBarcodePrintinfo)
{
return baseBarcodePrintinfoMapper.insertBaseBarcodePrintinfo(baseBarcodePrintinfo);
}
/**
*
*
* @param baseBarcodePrintinfo
* @return
*/
@Override
public int updateBaseBarcodePrintinfo(BaseBarcodePrintinfo baseBarcodePrintinfo)
{
return baseBarcodePrintinfoMapper.updateBaseBarcodePrintinfo(baseBarcodePrintinfo);
}
/**
*
*
* @param ids ID
* @return
*/
@Override
public int deleteBaseBarcodePrintinfoByIds(String ids)
{
return baseBarcodePrintinfoMapper.deleteBaseBarcodePrintinfoByIds(Convert.toStrArray(ids));
}
/**
*
*
* @param ID ID
* @return
*/
@Override
public int deleteBaseBarcodePrintinfoById(String ID)
{
return baseBarcodePrintinfoMapper.deleteBaseBarcodePrintinfoById(ID);
}
}

@ -130,6 +130,9 @@ public class TSyTracestateServiceImpl implements ITSyTracestateService
public String selectProductBarcode(String semiBarcode_A) {
return tSyTracestateMapper.selectProductBarcode(semiBarcode_A);
}
@Override
public String selectsemiBarcode(String productBarcode) {
return tSyTracestateMapper.selectsemiBarcode(productBarcode);
}
}

@ -0,0 +1,95 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.nanjing.mapper.BaseBarcodePrintinfoMapper">
<resultMap type="BaseBarcodePrintinfo" id="BaseBarcodePrintinfoResult">
<result property="ID" column="ID" />
<result property="ProductBarcode" column="ProductBarcode" />
<result property="SerialNo" column="SerialNo" />
<result property="IsRestart" column="IsRestart" />
<result property="ProductID" column="ProductID" />
<result property="ShiftID" column="ShiftID" />
<result property="InsertTime" column="InsertTime" />
<association property="tBdProductinfo" column="productName" javaType="com.ruoyi.nanjing.domain.TBdProductinfo" resultMap="prodName"/>
</resultMap>
<resultMap id="prodName" type="com.ruoyi.nanjing.domain.TBdProductinfo">
<result property="productName" column="ProductName"></result>
</resultMap>
<sql id="selectBaseBarcodePrintinfoVo">
select t1.ID, t1.ProductBarcode, t1.SerialNo, t1.IsRestart, t1.ProductID, t2.ProductName,t1.ShiftID, t1.InsertTime from base_Barcode_PrintInfo t1
left join T_BD_ProductInfo t2 on t1.ProductId = t2.ProductID
</sql>
<select id="selectBaseBarcodePrintinfoList" parameterType="BaseBarcodePrintinfo" resultMap="BaseBarcodePrintinfoResult">
<include refid="selectBaseBarcodePrintinfoVo"/>
<where>
<if test="ID != null and ID != ''"> and t1.ID = #{ID}</if>
<if test="ProductBarcode != null and ProductBarcode != ''"> and t1.ProductBarcode = #{ProductBarcode}</if>
<if test="SerialNo != null and SerialNo != ''"> and t1.SerialNo = #{SerialNo}</if>
<if test="IsRestart != null "> and t1.IsRestart = #{IsRestart}</if>
<if test="ProductID != null "> and t1.ProductID = #{ProductID}</if>
<if test="ShiftID != null and ShiftID != ''"> and t1.ShiftID = #{ShiftID}</if>
<!-- <if test="InsertTime != null "> and t1.InsertTime = #{InsertTime}</if>-->
<if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
AND datediff(dd,#{params.beginTime},t1.InsertTime)>=0
</if>
<if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
AND datediff(dd,t1.InsertTime,#{params.endTime})>=0
</if>
</where>
</select>
<select id="selectBaseBarcodePrintinfoById" parameterType="String" resultMap="BaseBarcodePrintinfoResult">
<include refid="selectBaseBarcodePrintinfoVo"/>
where ID = #{ID}
</select>
<insert id="insertBaseBarcodePrintinfo" parameterType="BaseBarcodePrintinfo">
insert into base_Barcode_PrintInfo
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="ID != null">ID,</if>
<if test="ProductBarcode != null">ProductBarcode,</if>
<if test="SerialNo != null">SerialNo,</if>
<if test="IsRestart != null">IsRestart,</if>
<if test="ProductID != null">ProductID,</if>
<if test="ShiftID != null">ShiftID,</if>
<if test="InsertTime != null">InsertTime,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="ID != null">#{ID},</if>
<if test="ProductBarcode != null">#{ProductBarcode},</if>
<if test="SerialNo != null">#{SerialNo},</if>
<if test="IsRestart != null">#{IsRestart},</if>
<if test="ProductID != null">#{ProductID},</if>
<if test="ShiftID != null">#{ShiftID},</if>
<if test="InsertTime != null">#{InsertTime},</if>
</trim>
</insert>
<update id="updateBaseBarcodePrintinfo" parameterType="BaseBarcodePrintinfo">
update base_Barcode_PrintInfo
<trim prefix="SET" suffixOverrides=",">
<if test="ProductBarcode != null">ProductBarcode = #{ProductBarcode},</if>
<if test="SerialNo != null">SerialNo = #{SerialNo},</if>
<if test="IsRestart != null">IsRestart = #{IsRestart},</if>
<if test="ProductID != null">ProductID = #{ProductID},</if>
<if test="ShiftID != null">ShiftID = #{ShiftID},</if>
<if test="InsertTime != null">InsertTime = #{InsertTime},</if>
</trim>
where ID = #{ID}
</update>
<delete id="deleteBaseBarcodePrintinfoById" parameterType="String">
delete from base_Barcode_PrintInfo where ID = #{ID}
</delete>
<delete id="deleteBaseBarcodePrintinfoByIds" parameterType="String">
delete from base_Barcode_PrintInfo where ID in
<foreach item="ID" collection="array" open="(" separator="," close=")">
#{ID}
</foreach>
</delete>
</mapper>

@ -156,6 +156,10 @@
select ProductBarcode from T_SY_TraceState where SemiBarcode_A = #{semiBarcode_A}
</select>
<select id="selectsemiBarcode" parameterType="String" resultType="String">
select SemiBarcode from T_RP_BarcodeRelationShip where ProductBarcode = #{productBarcode} order by InsertTime desc
</select>
<insert id="insertTSyTracestate" parameterType="TSyTracestate">
insert into T_SY_TraceState
<trim prefix="(" suffix=")" suffixOverrides=",">

Loading…
Cancel
Save