zyr/FT546MWS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2026.4.27

Browse Source 
大更新
This commit is contained in:
1009473166@qq.com
2026-04-27 16:02:27 +08:00
parent 52ce9135da
commit 6ce9f469e0
184 changed files with 16502 additions and 2016 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
ruoyi-admin/src/main/java/com/ruoyi/api/controller/BatchNoGenerator.java Normal file
View File

@@ -0,0 +1,78 @@
package com.ruoyi.api.controller;
import java.time.LocalDate;
import java.time.format.DateTimeFormatter;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicReference;
public class BatchNoGenerator{
// 日期格式化模板：固定生成 yyyyMMdd 格式
private static final DateTimeFormatter DATE_FORMATTER = DateTimeFormatter.ofPattern("yyyyMMdd");
// 原子引用：存储当前日期，CAS保证【日期判断+重置】的原子性
private static final AtomicReference<String> CURRENT_DATE =
new AtomicReference<>(LocalDate.now().format(DATE_FORMATTER));
// 原子整数：流水号计数器，CPU级指令保证自增原子性
private static final AtomicInteger SERIAL_NUMBER = new AtomicInteger(1);
// 流水号最大长度（4位，最大值9999）
private static final int MAX_SERIAL = 9999;
private static final String SERIAL_FORMAT = "%04d";
/**
* 生成唯一批号（多线程安全，原子操作）
* @return yyyyMMdd+4位流水号
*/
public static String generateBatchNo() {
// 获取当前系统日期
String today = LocalDate.now().format(DATE_FORMATTER);
// CAS自旋：保证日期判断、重置、计数的原子性
while (true) {
// 读取缓存的日期
String cacheDate = CURRENT_DATE.get();
// 场景1：当天未跨天，直接生成流水号
if (today.equals(cacheDate)) {
// 原子自增获取当前序号
int currentNum = SERIAL_NUMBER.getAndIncrement();
// 防止4位流水号溢出（超过9999）
if (currentNum > MAX_SERIAL) {
// 重置序号，抛出异常提示
SERIAL_NUMBER.set(1);
throw new RuntimeException("当日批号已达上限：" + MAX_SERIAL);
}
// 拼接日期+4位流水号，返回结果
return today + String.format(SERIAL_FORMAT, currentNum);
}
// 场景2：跨天了，CAS原子更新日期并重置流水号
if (CURRENT_DATE.compareAndSet(cacheDate, today)) {
// 只有一个线程能执行到这里，重置为1
SERIAL_NUMBER.set(1);
return today + String.format(SERIAL_FORMAT, 1);
}
// CAS更新失败：说明其他线程已完成跨天重置，重新循环
}
}
public static void main(String[] args) throws InterruptedException {
// 模拟20个线程同时生成批号
for (int i = 0; i < 20; i++) {
new Thread(() -> {
String batchNo = generateBatchNo();
System.out.println("线程：" + Thread.currentThread().getName() + "，生成批号：" + batchNo);
}).start();
}
Thread.sleep(1000);
System.out.println("=== 所有批号生成完成，无重复、无乱序 ===");
}
}

46
ruoyi-admin/src/main/java/com/ruoyi/api/controller/ToErpApiController.java
View File

@@ -31,24 +31,13 @@ public class ToErpApiController {
public AjaxResult receiveDeliveryNotice(@RequestBody DeliveryNoticeVo deliveryNoticeVo) {
AjaxResult ajaxResult = toErpService.receiveDeliveryNotice(deliveryNoticeVo);
requestLogService.insertRequestLog(requestLogService.getRequestLog(JSONUtil.toJsonStr(deliveryNoticeVo), "接收入出库通知单", ajaxResult));
requestLogService.insertRequestLog(requestLogService.getRequestLogERP(JSONUtil.toJsonStr(deliveryNoticeVo), "接收入出库通知单", ajaxResult));
return ajaxResult;
}
/**
* 回传入库单（废弃）
*/
//@Scheduled(fixedDelay = 1500)
@RequestMapping("/callbackInDeliveryNotice")
@ResponseBody
public void callbackInDeliveryNotice() {
toErpService.callbackInDeliveryNotice();
}
/**
* 回传入库单
*/
@@ -63,26 +52,37 @@ public class ToErpApiController {
/**
* 回传出库单(新)
*/
// @Scheduled(fixedDelay = 1500)
@Scheduled(fixedDelay = 1500)
@RequestMapping("/callbackOutDeliveryNotice")
@ResponseBody
public void callbackDeliveryOutNoticeNew() {
toErpService.callbackDeliveryOutNoticeNew();
}
/**
* 回传其他出库单(废弃)
*/
// @Scheduled(fixedDelay = 1500)
@RequestMapping("/callbackOutDeliveryNotice")
@ResponseBody
public void callbackDeliveryOutNotice() {
toErpService.callbackoutDeliveryNotice();
}
// /**
// * 回传其他入库单
// */
// @Scheduled(fixedDelay = 1500)
// @RequestMapping("/callbackInDeliveryNotice")
// @ResponseBody
// public void callbackInDeliveryNotice() {
// toErpService.callbackInDeliveryNotice();
// }
//
// /**
// * 回传其他出库单
// */
// @Scheduled(fixedDelay = 1500)
// @RequestMapping("/callbackOutDeliveryNotice")
// @ResponseBody
// public void callbackDeliveryOutNotice() {
// toErpService.callbackoutDeliveryNotice();
// }
/**
* 移库回调接口
*/
// @Scheduled(fixedDelay = 1500)
@Scheduled(fixedDelay = 1500)
@RequestMapping("/moveCargoSpace")
@ResponseBody
public void moveCargoSpace(){

1
ruoyi-admin/src/main/java/com/ruoyi/api/domain/AgvMoveParam.java
View File

@@ -12,5 +12,4 @@ public class AgvMoveParam {
private String endPoint;
private String containerCode;
private String taskNo;
private String type;
}

9
ruoyi-admin/src/main/java/com/ruoyi/api/domain/CallBackErp.java
View File

@@ -2,13 +2,17 @@ package com.ruoyi.api.domain;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import java.io.Serializable;
import java.util.List;
@NoArgsConstructor
@Data
@Getter
@Setter
public class CallBackErp implements Serializable {
/**
@@ -55,9 +59,12 @@ public class CallBackErp implements Serializable {
private String cmemo;
// 账套号
@JsonProperty("cacc_id")
private String caccId;
private String cacc_id;
// 子明细
@JsonProperty("details")
private List<CallBackErpItems> details;
}

4
ruoyi-admin/src/main/java/com/ruoyi/api/domain/CallBackErpItems.java
View File

@@ -33,7 +33,7 @@ public class CallBackErpItems implements Serializable {
@JsonProperty("cinvstd")
private String cinvstd;
@JsonProperty("cinvm_unit")
private String cinvmUnit;
private String cinvm_unit;
@JsonProperty("cposcode")
private String cposcode;
@JsonProperty("cposname")
@@ -56,5 +56,7 @@ public class CallBackErpItems implements Serializable {
private String srcrowno;
@JsonProperty("binvbatch")
private Integer binvbatch;
@JsonProperty("jobid")
private String jobid;
}

64
ruoyi-admin/src/main/java/com/ruoyi/api/domain/DeliveryNoticeItemVo.java
View File

@@ -18,72 +18,44 @@ import java.util.List;
public class DeliveryNoticeItemVo {
/**
* 行号
*/
/** 行号 */
private String lineNo;
/**
* 对应通知行号
*/
/** 对应通知行号 */
private String notelineNo;
/**
* 单据号
*/
/** 单据号 */
private String billNo;
/**
* 存货编码
*/
/** 存货编码 */
private String inventoryCode;
/**
* 存货名称
*/
/** 存货名称 */
private String inventoryName;
/**
* 规格型号
*/
/** 规格型号 */
private String specModel;
/**
* 层级关系
*/
/** 层级关系 */
private String levelRelation;
/**
* 上层物料
*/
/** 上层物料 */
private String upperMaterial;
/**
* 顶层物料
*/
/** 顶层物料 */
private String topMaterial;
/**
* 批次
*/
/** 批次 */
private String lotNo;
/**
* 计量单位
*/
/** 计量单位 */
private String unit;
/**
* 数量
*/
/** 数量 */
private String quantity;
/**
* 备注
*/
/** 备注 */
private String remark;
private List<LocationDetail> locations;
/**
* 货位
*/
/**货位*/
private String area;
/**
* 托盘
*/
/**托盘*/
private String location;
private String areaBefore;
private String locationBefore;
/** 项目号 */
private String projectNo;
/**
* erp子表主键
***/
@@ -100,4 +72,6 @@ public class DeliveryNoticeItemVo {
/**旧项目号**/
private String oldProjectNo;
}

6
ruoyi-admin/src/main/java/com/ruoyi/api/domain/DeliveryNoticeVo.java
View File

@@ -53,11 +53,13 @@ public class DeliveryNoticeVo {
private String destination;
/** 领料车间 */
private String workshop;
/** 公司简称**/
private String companyShortName;
/** 账套号**/
private String accountSetNo;
/** 子表明细列表 */
private List<DeliveryNoticeItemVo> detailList;
}

2
ruoyi-admin/src/main/java/com/ruoyi/api/service/IToWcsService.java
View File

@@ -45,6 +45,4 @@ public interface IToWcsService {
AjaxResult updateWcsPort(WcsPort wcsPort);
AjaxResult insertAgvMoveJob(AgvMoveParam agvMoveParam);
}

97
ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToErpServiceImpl.java
View File

@@ -1,7 +1,9 @@
package com.ruoyi.api.service.impl;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.json.JSONUtil;
import com.ruoyi.api.controller.BatchNoGenerator;
import com.ruoyi.api.domain.*;
import com.ruoyi.api.moveMsg.domain.MoveMsg;
import com.ruoyi.api.moveMsg.service.IMoveMsgService;
@@ -67,7 +69,8 @@ public class ToErpServiceImpl implements IToErpService {
private IMydoJobService mydoJobService;
@Autowired
private IMydoJobDetailService mydoJobDetailService;
@Autowired
private IBasJobIdService iBasJobIdService;
@Autowired
private IBasJobIdService basJobIdService;
@@ -135,7 +138,7 @@ public class ToErpServiceImpl implements IToErpService {
// 处理入库单相关操作（单据类型1-4）
if (type >= 1 && type <= 4) {
InStockin param = new InStockin();
param.setStockinId(deliveryNoticeVo.getBillNo());
param.setErpBill(deliveryNoticeVo.getBillNo());
List<InStockin> existList = inStockinService.selectInStockinListApi(param);
InStockin exist = (existList != null && !existList.isEmpty()) ? existList.get(0) : null;
@@ -170,7 +173,9 @@ public class ToErpServiceImpl implements IToErpService {
if (exist == null) {
inStockin.setStockinGuid(UUID.randomUUID().toString());
}
inStockin.setStockinId(deliveryNoticeVo.getBillNo());
String rkdId = iBasJobIdService.getJobId("RKD");
inStockin.setStockinId(rkdId);
inStockin.setInType(deliveryNoticeVo.getBillType());
inStockin.setCreateDate(deliveryNoticeVo.getBillDate());
inStockin.setCreateManId(deliveryNoticeVo.getCreateMan());
@@ -196,21 +201,28 @@ public class ToErpServiceImpl implements IToErpService {
}
List<DeliveryNoticeItemVo> items = deliveryNoticeVo.getDetailList();
int a = 0;
for (DeliveryNoticeItemVo item : items) {
a += 1;
InStockinDetail detail = new InStockinDetail();
detail.setStockinGuid(inStockin.getStockinGuid());
detail.setStockinDetailId(item.getLineNo());
detail.setStockinDetailId(item.getBarCode());
detail.setStockinId(inStockin.getStockinId());
detail.setProductId(item.getInventoryCode());
detail.setProductName(item.getInventoryName());
detail.setSpec(item.getSpecModel());
detail.setUnit(item.getUnit());
detail.setQuantity(item.getQuantity());
detail.setLotNo(item.getLotNo());
if (item.getIsBatchManage().equals("1") && (item.getLotNo().equals("") || item.getLotNo() == null)) {
// 获取流水号
detail.setLotNo(BatchNoGenerator.generateBatchNo());
}else {
detail.setLotNo(item.getLotNo());
}
detail.setSpare1(item.getLevelRelation());
detail.setSpare2(item.getUpperMaterial());
detail.setSpare3(item.getTopMaterial());
detail.setSpare4(item.getProjectNo());
detail.setSpare6(item.getLineNo());
detail.setRemark(item.getRemark());
detail.setAssignNum("0");
@@ -229,7 +241,7 @@ public class ToErpServiceImpl implements IToErpService {
// 处理出库单相关操作（单据类型5-7）
else if (type >= 5 && type <= 7) {
OutStockout param = new OutStockout();
param.setStockoutId(deliveryNoticeVo.getBillNo());
param.setErpStockoutId(deliveryNoticeVo.getBillNo());
List<OutStockout> outList = outStockoutService.selectOutStockoutList(param);
OutStockout exist = (outList != null && !outList.isEmpty()) ? outList.get(0) : null;
@@ -268,7 +280,8 @@ public class ToErpServiceImpl implements IToErpService {
if (exist == null) {
out.setStockoutGuid(UUID.randomUUID().toString());
}
out.setStockoutId(deliveryNoticeVo.getBillNo());
String ckdId = iBasJobIdService.getJobId("CKD");
out.setStockoutId(ckdId);
out.setOutType(deliveryNoticeVo.getBillType());
out.setCreateDate(deliveryNoticeVo.getBillDate());
out.setErpStockoutId(deliveryNoticeVo.getBillNo());
@@ -276,7 +289,8 @@ public class ToErpServiceImpl implements IToErpService {
out.setStatus("2");
out.setWarehouseId(deliveryNoticeVo.getWarehouseId());
out.setStockoutSource("1");
out.setSpare6(deliveryNoticeVo.getOutType());
// out.setSpare6(deliveryNoticeVo.getOutType());
out.setSpare6("1");
out.setCarNumber(deliveryNoticeVo.getIsProjectOut());
out.setDepartmentNo(deliveryNoticeVo.getProjectNo());
out.setCustomerNo(deliveryNoticeVo.getCustomerId());
@@ -287,6 +301,8 @@ public class ToErpServiceImpl implements IToErpService {
out.setSpare4(deliveryNoticeVo.getApproveMan());//审核人
out.setSpare5(deliveryNoticeVo.getRemark());
out.setSpare7(deliveryNoticeVo.getDestination());
//手动设置出库类型为2 这样会赋值 in_or_out 21
out.setSpare8("2");
out.setCompanyShortName(deliveryNoticeVo.getCompanyShortName());
out.setAccountSetNo(deliveryNoticeVo.getAccountSetNo());
@@ -302,11 +318,11 @@ public class ToErpServiceImpl implements IToErpService {
outStockoutDetailService.deleteOutStockoutDetailByStockoutDetailIds(ids);
}
}
int i = 0;
for (DeliveryNoticeItemVo item : deliveryNoticeVo.getDetailList()) {
OutStockoutDetail d = new OutStockoutDetail();
d.setStockoutDetailId(item.getLineNo());
i += 1;
d.setStockoutDetailId(out.getStockoutId() + "-" + i);
d.setStockoutGuid(out.getStockoutGuid());
d.setStockoutId(out.getStockoutId());
d.setProductId(item.getInventoryCode());
@@ -317,7 +333,7 @@ public class ToErpServiceImpl implements IToErpService {
d.setSpare1(item.getLevelRelation());
d.setSpare2(item.getUpperMaterial());
d.setSpare3(item.getTopMaterial());
d.setSpare4(deliveryNoticeVo.getProjectNo());
d.setSpare4(item.getProjectNo());
d.setSpare6(item.getLineNo());
d.setRemark(item.getRemark());
d.setSourceLineId(item.getSourceLineId());
@@ -344,9 +360,9 @@ public class ToErpServiceImpl implements IToErpService {
}
@Override
public void callbackInDeliveryNotice() {
InStockinBack inStockin = inStockinBackService.selectTopInStockin();
if (inStockin == null) {
return;
@@ -357,12 +373,16 @@ public class ToErpServiceImpl implements IToErpService {
deliveryNoticeVo.setBillType(inStockin.getInType());
deliveryNoticeVo.setOpType("1");
deliveryNoticeVo.setBillDate(inStockin.getCreateDate());
// deliveryNoticeVo.setCreateMan(inStockin.getCreateManId());
deliveryNoticeVo.setWarehouseId(inStockin.getWarehouseId());
deliveryNoticeVo.setProjectNo(inStockin.getDepartmentNo());
deliveryNoticeVo.setCustomerId(inStockin.getSupplierNo());
deliveryNoticeVo.setCustomerName(inStockin.getClassNo()); // 对应receiveDeliveryNotice中的映射
deliveryNoticeVo.setContractNo(inStockin.getSpare1());
// deliveryNoticeVo.setSalesOrderNo(inStockin.getSpare2());
// deliveryNoticeVo.setApproveDate(inStockin.getSpare3());
// deliveryNoticeVo.setApproveMan(inStockin.getSpare4());
// deliveryNoticeVo.setRemark(inStockin.getSpare5());
InStockinDetailBack inStockinDetailParam = new InStockinDetailBack();
inStockinDetailParam.setStockinId(inStockin.getStockinId());
@@ -485,7 +505,10 @@ public class ToErpServiceImpl implements IToErpService {
String[] splitArea = detail.getSpare9().split(",");
String[] splitLocation = detail.getSpare8().split(",");
String[] splitQuantity = detail.getQuantityX().split(",");
String[] lotNo = detail.getLotNo().split(",");
String[] lotNo = new String[]{};
if (StrUtil.isNotEmpty(detail.getLotNo())) {
lotNo = detail.getLotNo().split(",");
}
ArrayList<LocationDetail> locationDetails = new ArrayList<>();
for (int i = 0; i < splitArea.length; i++) {
LocationDetail locationDetail = new LocationDetail();
@@ -657,14 +680,14 @@ public class ToErpServiceImpl implements IToErpService {
}
CallBackErp callBackErp = new CallBackErp();
callBackErp.setCcompany(inStockin.getCompanyShortName()); // 公司简称
callBackErp.setCcode(inStockin.getStockinId()); // wms 单据号
callBackErp.setDdate(inStockin.getFinishDate()); // 操作日期
callBackErp.setCcode(inStockin.getStockinId()); // wms 单据号 需要改成作业号
callBackErp.setDdate(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date())); // 操作日期
callBackErp.setCintype(inStockin.getInType()); // 业务类型
callBackErp.setCvencode(inStockin.getSupplierNo()); // 供应商编码
callBackErp.setCvenname(inStockin.getSupplierNo()); // 供应商名称
callBackErp.setCvenname(inStockin.getClassNo()); // 供应商名称
callBackErp.setCoptname(inStockin.getCreateManId()); // 操作人
callBackErp.setCmemo(inStockin.getRemark()); // 备注
callBackErp.setCaccId(inStockin.getAccountSetNo()); // 账套号
callBackErp.setCacc_id(inStockin.getAccountSetNo()); // 账套号
callBackErp.setCwhcode("01"); // 仓库编码
callBackErp.setCwhname("立体库"); // 仓库名称
@@ -679,23 +702,24 @@ public class ToErpServiceImpl implements IToErpService {
if (inStockinDetails != null && !inStockinDetails.isEmpty()) {
for (InStockinDetailBack detail : inStockinDetails) {
CallBackErpItems item = new CallBackErpItems();
// 存货编码
// 存货编码11
item.setCinvcode(detail.getProductId());
// 存货名称
item.setCinvname(detail.getProductName());
// 规格型号
item.setCinvstd(detail.getSpec());
// 单位
item.setCinvmUnit(detail.getUnit());
item.setCinvm_unit(detail.getUnit());
// 货位编码
item.setCposcode(detail.getSpare9());
// 货位名称
item.setCposname("");
// 托盘号
item.setCtrayname(detail.getSpare8());
//jobid
item.setJobid(detail.getSpare7());
// 批号
item.setCbatch(detail.getLotNo());
// item.setLotNo(detail.getLotNo());
// 数量
item.setIquantity(Integer.valueOf(detail.getAssignNum()));
// 老项目号
@@ -718,9 +742,11 @@ public class ToErpServiceImpl implements IToErpService {
callBackErp.setDetails(detailList);
String sendMsg = JSONUtil.toJsonStr(callBackErp);
System.err.println(sendMsg);
try {
//todo 发送给erp 成功失败改状态
RequestLog requestLog = requestLogService.getRequestLog("http://192.168.188.235/app1/api?type=1&key=1", JSONUtil.toJsonStr(callBackErp), "入库回传", "wms", "erp", inStockin.getInType(), inStockin.getAccountSetNo());
// http://192.168.188.235/app1/api?type=1&key=1
RequestLog requestLog = requestLogService.getRequestLog("http://192.168.188.239:1093/hzgmid/ServerCommand/SaveDataFromWms", JSONUtil.toJsonStr(callBackErp), "入库回传", "wms", "erp", inStockin.getInType(), inStockin.getAccountSetNo());
if ("1".equals(requestLog.getIsSuccessful())) {
inStockin.setSendStatus("1");
inStockin.setSendTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
@@ -737,11 +763,12 @@ public class ToErpServiceImpl implements IToErpService {
inStockinDetailParam.setSendStatus("2");
inStockinDetailParam.setSendTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
inStockinDetailParam.setMsg(requestLog.getErrorDetails());
// inStockinDetailBackService.insertInStockInDetailBackFinish(inStockinDetails);
// inStockinDetailBackService.deleteInStockInDetailList(inStockinDetails);
}
inStockinBackService.updateInStockinBack(inStockin);
inStockinDetailBackService.updateInStockinDetailBack(inStockinDetailParam);
} catch (Exception e) {
inStockin.setSendStatus("2");
inStockin.setSendTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
@@ -755,11 +782,6 @@ public class ToErpServiceImpl implements IToErpService {
}
public static void main(String[] args) {
System.out.println(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
}
@Override
public void callbackDeliveryOutNoticeNew() {
OutStockoutBack outStockoutBack = outStockoutBackService.selelctTopOutStockout();
@@ -769,13 +791,13 @@ public class ToErpServiceImpl implements IToErpService {
CallBackErp callBackErp = new CallBackErp();
callBackErp.setCcompany(outStockoutBack.getCompanyShortName()); // 公司简称
callBackErp.setCcode(outStockoutBack.getStockoutId()); // wms 单据号
callBackErp.setDdate(outStockoutBack.getFinishDate()); // 操作日期
callBackErp.setCintype("1"); // 业务类型
callBackErp.setDdate(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date())); // 操作日期
callBackErp.setCintype(outStockoutBack.getOutType()); // 业务类型
callBackErp.setCvencode(outStockoutBack.getCustomerNo()); // 供应商编码
callBackErp.setCvenname(outStockoutBack.getCustomerNo()); // 供应商名称
callBackErp.setCoptname(outStockoutBack.getCreateManId()); // 操作人
callBackErp.setCmemo(outStockoutBack.getRemark()); // 备注
callBackErp.setCaccId(outStockoutBack.getAccountSetNo()); // 账套号
callBackErp.setCacc_id(outStockoutBack.getAccountSetNo()); // 账套号
callBackErp.setCwhcode("01"); // 仓库编码
callBackErp.setCwhname("立体库"); // 仓库名称
@@ -796,7 +818,7 @@ public class ToErpServiceImpl implements IToErpService {
// 规格型号
item.setCinvstd(detail.getSpec());
// 单位
item.setCinvmUnit(detail.getUnit());
item.setCinvm_unit(detail.getUnit());
// 货位编码
item.setCposcode(detail.getSpare9());
// 货位名称
@@ -805,6 +827,8 @@ public class ToErpServiceImpl implements IToErpService {
item.setCtrayname(detail.getSpare8());
// 批号
item.setCbatch(detail.getLotNo());
item.setJobid(detail.getSpare7());
// item.setLotNo(detail.getLotNo());
// 数量
item.setIquantity(Integer.parseInt(String.valueOf(detail.getAssignNum())));
@@ -824,12 +848,13 @@ public class ToErpServiceImpl implements IToErpService {
detailList.add(item);
}
callBackErp.setDetails(detailList);
}
try {
//todo 发送给erp 成功失败改状态
RequestLog requestLog = requestLogService.getRequestLog("http://192.168.188.235/app1/api?type=1&key=1", JSONUtil.toJsonStr(callBackErp), "出库回传", "wms", "erp");
RequestLog requestLog = requestLogService.getRequestLog("http://192.168.188.239:1093/hzgmid/ServerCommand/SaveDataFromWms", JSONUtil.toJsonStr(callBackErp), "出库回传", "wms", "erp", outStockoutBack.getOutType(), outStockoutBack.getAccountSetNo());
if ("1".equals(requestLog.getIsSuccessful())) {
outStockoutBack.setSendStatus("1");
outStockoutBack.setSendTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
@@ -837,6 +862,8 @@ public class ToErpServiceImpl implements IToErpService {
outStockoutDetailBack.setSendStatus("1");
outStockoutDetailBack.setSendTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
outStockoutDetailBack.setMsg("成功");
outStockoutDetailBackService.insertOutStockDetailBackFinish(outStockoutDetailBacks);
outStockoutDetailBackService.deleteOutStockDetailList(outStockoutDetailBacks);
} else {
outStockoutBack.setSendStatus("2");

15
ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToWcsServiceImpl.java
View File

@@ -42,7 +42,6 @@ public class ToWcsServiceImpl implements IToWcsService {
public static final String UPDATE_WCS_PORT = "http://localhost:8081/wcs2Wms/api/updateWcsPort";
@Override
@Scheduled(fixedDelay=1500)
public void pushOutMydoJob() {
@@ -153,18 +152,4 @@ public class ToWcsServiceImpl implements IToWcsService {
return AjaxResult.error();
}
@Override
public AjaxResult insertAgvMoveJob(AgvMoveParam agvMoveParam) {
Map<String,String> map = new HashMap<>();
map.put("startPoint", agvMoveParam.getStartPoint());
map.put("endPoint", agvMoveParam.getEndPoint());
map.put("type", agvMoveParam.getType());
map.put("jobId", UUID.randomUUID().toString());
RequestLog requestLog = requestLogService.getRequestLog(PUSH_AGV_MOVE_JOB, JSONUtil.toJsonStr(map), "修改缓存点状态","wms","wcs");
if ("1".equals(requestLog.getIsSuccessful())){
return AjaxResult.success();
}
return AjaxResult.error();
}
}

2
ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/TwinServiceImpl.java
View File

@@ -262,7 +262,7 @@ public class TwinServiceImpl implements ITwinService {
@Override
public Map<String, Object> getCargo(String cargoSpaceName) {
BasStock basStock = new BasStock();
basStock.setCargoSpaceName(cargoSpaceName);
basStock.setCargoSpaceId(cargoSpaceName);
List<BasStock> list = basStockService.selectBasStockList(basStock);
List<Map<String, String>> dataList = new ArrayList<>();
for (BasStock stock : list) {

38
ruoyi-admin/src/main/java/com/ruoyi/check/stockcheck/controller/CheckStockinController.java
View File

@@ -27,23 +27,25 @@ import java.util.List;
*/
@RestController
@RequestMapping("/check/stockCheck")
public class CheckStockinController extends BaseController {
public class CheckStockinController extends BaseController
{
@Autowired
private ICheckStockinService checkStockinService;
@Autowired
private ICheckStockinFinishService checkStockinFinishService;
private ICheckStockinFinishService checkStockinFinishService;
/**
* 查询盘库单据主信息列表
*/
@PreAuthorize("@ss.hasPermi('check:stockCheck:list')")
@GetMapping("/list")
public TableDataInfo list(CheckStockin checkStockin) {
public TableDataInfo list(CheckStockin checkStockin)
{
startPage();
List<CheckStockin> list = new ArrayList<>();
if (checkStockin.getStatus() == null || Convert.toInt(checkStockin.getStatus()) < 4) {
list = checkStockinService.selectCheckStockinList(checkStockin);
} else {
if (checkStockin.getStatus() == null || Convert.toInt(checkStockin.getStatus())<4){
list = checkStockinService.selectCheckStockinList(checkStockin);
}else {
list = checkStockinFinishService.selectCheckStockinList(checkStockin);
}
@@ -56,7 +58,8 @@ public class CheckStockinController extends BaseController {
@PreAuthorize("@ss.hasPermi('check:stockCheck:export')")
@Log(title = "盘库单据主信息", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, CheckStockin checkStockin) {
public void export(HttpServletResponse response, CheckStockin checkStockin)
{
List<CheckStockin> list = checkStockinService.selectCheckStockinList(checkStockin);
ExcelUtil<CheckStockin> util = new ExcelUtil<CheckStockin>(CheckStockin.class);
util.exportExcel(response, list, "盘库单据主信息数据");
@@ -67,7 +70,8 @@ public class CheckStockinController extends BaseController {
*/
@PreAuthorize("@ss.hasPermi('check:stockCheck:query')")
@GetMapping(value = "/{stockGuid}")
public AjaxResult getInfo(@PathVariable("stockGuid") String stockGuid) {
public AjaxResult getInfo(@PathVariable("stockGuid") String stockGuid)
{
return success(checkStockinService.selectCheckStockinByStockGuid(stockGuid));
}
@@ -77,7 +81,8 @@ public class CheckStockinController extends BaseController {
@PreAuthorize("@ss.hasPermi('check:stockCheck:add')")
@Log(title = "盘库单据主信息", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody CheckStockin checkStockin) {
public AjaxResult add(@RequestBody CheckStockin checkStockin)
{
return toAjax(checkStockinService.insertCheckStockin(checkStockin));
}
@@ -87,7 +92,8 @@ public class CheckStockinController extends BaseController {
@PreAuthorize("@ss.hasPermi('check:stockCheck:edit')")
@Log(title = "盘库单据主信息", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody CheckStockin checkStockin) {
public AjaxResult edit(@RequestBody CheckStockin checkStockin)
{
return checkStockinService.updateCheckStockin(checkStockin);
}
@@ -96,8 +102,9 @@ public class CheckStockinController extends BaseController {
*/
@PreAuthorize("@ss.hasPermi('check:stockCheck:remove')")
@Log(title = "盘库单据主信息", businessType = BusinessType.DELETE)
@DeleteMapping("/{stockGuids}")
public AjaxResult remove(@PathVariable String[] stockGuids) {
@DeleteMapping("/{stockGuids}")
public AjaxResult remove(@PathVariable String[] stockGuids)
{
return toAjax(checkStockinService.deleteCheckStockinByStockGuids(stockGuids));
}
@@ -112,15 +119,12 @@ public class CheckStockinController extends BaseController {
@PreAuthorize("@ss.hasPermi('check:stockCheck:saveBill')")
@ResponseBody
public AjaxResult saveBill(@RequestBody CheckStockVo checkStockVo) {
return checkStockinService.saveBill(checkStockVo);
String stockOutId = checkStockinService.saveBill(checkStockVo);
return AjaxResult.success(stockOutId);
}
/**
* 盘点自动分配
*
* @param checkStockin
* @return
*/

2
ruoyi-admin/src/main/java/com/ruoyi/check/stockcheck/service/ICheckStockinService.java
View File

@@ -62,7 +62,7 @@ public interface ICheckStockinService
*/
public int deleteCheckStockinByStockGuid(String stockGuid);
AjaxResult saveBill(CheckStockVo outStockoutVo);
String saveBill(CheckStockVo outStockoutVo);
/**
* 盘点自动分配

15
ruoyi-admin/src/main/java/com/ruoyi/check/stockcheck/service/impl/CheckStockinServiceImpl.java
View File

@@ -162,8 +162,9 @@ public class CheckStockinServiceImpl implements ICheckStockinService {
@Override
@Transactional(rollbackFor = Exception.class)
public AjaxResult saveBill(CheckStockVo checkStockVo) {
public String saveBill(CheckStockVo checkStockVo) {
CheckStockin checkStockin = checkStockVo.getCheckStockin();
List<CheckStockinDetail> detailList = checkStockVo.getDetailList();
String stockCheckId = basJobIdService.getJobId("PDD");
checkStockin.setStockCheckId(stockCheckId);
@@ -182,9 +183,6 @@ public class CheckStockinServiceImpl implements ICheckStockinService {
checkStockinDetail.setStockCheckDetailId(stockCheckId + "-" + (i + 1));
checkStockinDetail.setStockCheckId(stockCheckId);
BasProduct basProduct = productService.selectBasProductByProductId(checkStockinDetail.getProductId());
if (basProduct==null){
throw new RuntimeException(checkStockinDetail.getProductId()+",系统内无该物料，请检查！");
}
checkStockinDetail.setProductGuid(basProduct.getProductGuid());
checkStockinDetail.setStockCheckGuid(checkStockin.getStockGuid());
checkStockinDetail.setScanNum("0");
@@ -195,6 +193,13 @@ public class CheckStockinServiceImpl implements ICheckStockinService {
} else if ("2".equals(checkStockin.getCheckType())) {
//货位盘点
for (int i = 0; i < detailList.size(); i++) {
// BasStock param = new BasStock();
// param.setCargoSpaceId(detailList.get(i).getSpare1());
// List<BasStock> basStocks = basStockService.selectBasStockList(param);
// Integer quantity = 0;
// for (BasStock basStock : basStocks) {
// quantity += Convert.toInt(basStock.getQuantity());
// }
CheckStockinDetail checkStockinDetail = detailList.get(i);
checkStockinDetail.setStockCheckDetailId(stockCheckId + "-" + (i + 1));
checkStockinDetail.setStockCheckId(stockCheckId);
@@ -206,7 +211,7 @@ public class CheckStockinServiceImpl implements ICheckStockinService {
}
checkStockinMapper.insertCheckStockin(checkStockin);
return AjaxResult.success("单据创建成功",stockCheckId);
return stockCheckId;
}
@Override

208
ruoyi-admin/src/main/java/com/ruoyi/in/stockin/domain/InStockin.java
View File

@@ -13,127 +13,90 @@ import java.util.List;
* @author ruoyi
* @date 2025-05-20
*/
public class InStockin extends BaseEntity {
public class InStockin extends BaseEntity
{
private static final long serialVersionUID = 1L;
/**
* GUID
*/
/** GUID */
private String stockinGuid;
/**
* 入库订单ID
*/
/** 入库订单ID */
@Excel(name = "入库订单ID")
private String stockinId;
/**
* 入库类型
*/
/** 入库类型 */
@Excel(name = "入库类型")
private String inType;
/**
* 建立时间
*/
/** 建立时间 */
@Excel(name = "建立时间")
private String createDate;
/**
* 创建人
*/
/** 创建人 */
private String createManId;
@Excel(name = "创建人")
private String createManName;
/**
* 单据状态
*/
/** 单据状态 */
@Excel(name = "单据状态")
private String status;
/**
* 仓库ID
*/
/** 仓库ID */
@Excel(name = "仓库ID")
private String warehouseId;
@Excel(name = "仓库")
private String warehouseName;
/**
* 完成日期
*/
/** 完成日期 */
@Excel(name = " 完成日期")
private String finishDate;
/**
* erp单号
*/
/** erp单号 */
@Excel(name = "erp单号")
private String erpBill;
/**
* 单据来源
*/
/** 单据来源 */
@Excel(name = "单据来源")
private String stockSource;
/**
* 部门编码
*/
/** 部门编码 */
@Excel(name = "部门编码")
private String departmentNo;
@Excel(name = "部门")
private String departmentName;
/**
* 客户编码
*/
/** 客户编码 */
@Excel(name = "客户编码")
private String customerNo;
/**
* 班组编码
*/
/** 班组编码 */
@Excel(name = "班组编码")
private String classNo;
/**
* 供应商编码
*/
/** 供应商编码 */
@Excel(name = "供应商编码")
private String supplierNo;
@Excel(name = "供应商")
private String supplierName;
/**
* 备用字段1
*/
/** 备用字段1 */
@Excel(name = "备用字段1")
private String spare1;
/**
* 备用字段2
*/
/** 备用字段2 */
@Excel(name = "备用字段2")
private String spare2;
/**
* 备用字段4
*/
/** 备用字段4 */
@Excel(name = "备用字段4")
private String spare4;
/**
* 备用字段3
*/
/** 备用字段3 */
@Excel(name = "备用字段3")
private String spare3;
/**
* 备用字段5
*/
/** 备用字段5 */
@Excel(name = "备用字段5")
private String spare5;
@@ -144,6 +107,13 @@ public class InStockin extends BaseEntity {
private String companyShortName;
private String accountSetNo;
public String getCompanyShortName() {
return companyShortName;
}
public void setCompanyShortName(String companyShortName) {
this.companyShortName = companyShortName;
}
public String getAccountSetNo() {
return accountSetNo;
@@ -153,14 +123,6 @@ public class InStockin extends BaseEntity {
this.accountSetNo = accountSetNo;
}
public String getCompanyShortName() {
return companyShortName;
}
public void setCompanyShortName(String companyShortName) {
this.companyShortName = companyShortName;
}
private List<String> typeData;
public String getStartDate() {
@@ -227,155 +189,193 @@ public class InStockin extends BaseEntity {
this.supplierName = supplierName;
}
public void setStockinGuid(String stockinGuid) {
public void setStockinGuid(String stockinGuid)
{
this.stockinGuid = stockinGuid;
}
public String getStockinGuid() {
public String getStockinGuid()
{
return stockinGuid;
}
public void setStockinId(String stockinId) {
public void setStockinId(String stockinId)
{
this.stockinId = stockinId;
}
public String getStockinId() {
public String getStockinId()
{
return stockinId;
}
public void setInType(String inType) {
public void setInType(String inType)
{
this.inType = inType;
}
public String getInType() {
public String getInType()
{
return inType;
}
public void setCreateDate(String createDate) {
public void setCreateDate(String createDate)
{
this.createDate = createDate;
}
public String getCreateDate() {
public String getCreateDate()
{
return createDate;
}
public void setCreateManId(String createManId) {
public void setCreateManId(String createManId)
{
this.createManId = createManId;
}
public String getCreateManId() {
public String getCreateManId()
{
return createManId;
}
public void setStatus(String status) {
public void setStatus(String status)
{
this.status = status;
}
public String getStatus() {
public String getStatus()
{
return status;
}
public void setWarehouseId(String warehouseId) {
public void setWarehouseId(String warehouseId)
{
this.warehouseId = warehouseId;
}
public String getWarehouseId() {
public String getWarehouseId()
{
return warehouseId;
}
public void setFinishDate(String finishDate) {
public void setFinishDate(String finishDate)
{
this.finishDate = finishDate;
}
public String getFinishDate() {
public String getFinishDate()
{
return finishDate;
}
public void setErpBill(String erpBill) {
public void setErpBill(String erpBill)
{
this.erpBill = erpBill;
}
public String getErpBill() {
public String getErpBill()
{
return erpBill;
}
public void setStockSource(String stockSource) {
public void setStockSource(String stockSource)
{
this.stockSource = stockSource;
}
public String getStockSource() {
public String getStockSource()
{
return stockSource;
}
public void setDepartmentNo(String departmentNo) {
public void setDepartmentNo(String departmentNo)
{
this.departmentNo = departmentNo;
}
public String getDepartmentNo() {
public String getDepartmentNo()
{
return departmentNo;
}
public void setCustomerNo(String customerNo) {
public void setCustomerNo(String customerNo)
{
this.customerNo = customerNo;
}
public String getCustomerNo() {
public String getCustomerNo()
{
return customerNo;
}
public void setClassNo(String classNo) {
public void setClassNo(String classNo)
{
this.classNo = classNo;
}
public String getClassNo() {
public String getClassNo()
{
return classNo;
}
public void setSupplierNo(String supplierNo) {
public void setSupplierNo(String supplierNo)
{
this.supplierNo = supplierNo;
}
public String getSupplierNo() {
public String getSupplierNo()
{
return supplierNo;
}
public void setSpare1(String spare1) {
public void setSpare1(String spare1)
{
this.spare1 = spare1;
}
public String getSpare1() {
public String getSpare1()
{
return spare1;
}
public void setSpare2(String spare2) {
public void setSpare2(String spare2)
{
this.spare2 = spare2;
}
public String getSpare2() {
public String getSpare2()
{
return spare2;
}
public void setSpare4(String spare4) {
public void setSpare4(String spare4)
{
this.spare4 = spare4;
}
public String getSpare4() {
public String getSpare4()
{
return spare4;
}
public void setSpare3(String spare3) {
public void setSpare3(String spare3)
{
this.spare3 = spare3;
}
public String getSpare3() {
public String getSpare3()
{
return spare3;
}
public void setSpare5(String spare5) {
public void setSpare5(String spare5)
{
this.spare5 = spare5;
}
public String getSpare5() {
public String getSpare5()
{
return spare5;
}

19
ruoyi-admin/src/main/java/com/ruoyi/in/stockinback/domain/InStockinBack.java
View File

@@ -95,17 +95,8 @@ public class InStockinBack extends BaseEntity
private String sendTime;
private String msg;
private String accountSetNo;
private String companyShortName;
public String getAccountSetNo() {
return accountSetNo;
}
public void setAccountSetNo(String accountSetNo) {
this.accountSetNo = accountSetNo;
}
private String accountSetNo;
public String getCompanyShortName() {
return companyShortName;
@@ -115,6 +106,14 @@ public class InStockinBack extends BaseEntity
this.companyShortName = companyShortName;
}
public String getAccountSetNo() {
return accountSetNo;
}
public void setAccountSetNo(String accountSetNo) {
this.accountSetNo = accountSetNo;
}
public String getSendStatus() {
return sendStatus;
}

2
ruoyi-admin/src/main/java/com/ruoyi/in/stockindeatilback/domain/InStockinDetailBack.java
View File

@@ -152,12 +152,12 @@ public class InStockinDetailBack extends BaseEntity
private String msg;
private String sourceLineId;
private String barCode;
private String isBatchManage;
private String oldProjectNo;
public String getSourceLineId() {
return sourceLineId;
}

18
ruoyi-admin/src/main/java/com/ruoyi/in/stockindeatilback/mapper/InStockinDetailBackMapper.java
View File

@@ -8,14 +8,15 @@ import org.apache.ibatis.annotations.Param;
/**
* 入库单据子信息Mapper接口
*
*
* @author ruoyi
* @date 2026-01-27
*/
public interface InStockinDetailBackMapper {
public interface InStockinDetailBackMapper
{
/**
* 查询入库单据子信息
*
*
* @param stockinDetailId 入库单据子信息主键
* @return 入库单据子信息
*/
@@ -23,7 +24,7 @@ public interface InStockinDetailBackMapper {
/**
* 查询入库单据子信息列表
*
*
* @param inStockinDetailBack 入库单据子信息
* @return 入库单据子信息集合
*/
@@ -31,17 +32,16 @@ public interface InStockinDetailBackMapper {
/**
* 新增入库单据子信息
*
*
* @param inStockinDetailBack 入库单据子信息
* @return 结果
*/
public int insertInStockinDetailBack(InStockinDetailBack inStockinDetailBack);
public int insertInStockinDetailBackById(InStockin inStockin);
/**
* 修改入库单据子信息
*
*
* @param inStockinDetailBack 入库单据子信息
* @return 结果
*/
@@ -49,7 +49,7 @@ public interface InStockinDetailBackMapper {
/**
* 删除入库单据子信息
*
*
* @param stockinDetailId 入库单据子信息主键
* @return 结果
*/
@@ -57,7 +57,7 @@ public interface InStockinDetailBackMapper {
/**
* 批量删除入库单据子信息
*
*
* @param stockinDetailIds 需要删除的数据主键集合
* @return 结果
*/

2
ruoyi-admin/src/main/java/com/ruoyi/in/stockindeatilback/service/IInStockinDetailBackService.java
View File

@@ -59,7 +59,7 @@ public interface IInStockinDetailBackService
*/
public int deleteInStockinDetailBackByStockinDetailId(String stockinDetailId);
void insertInStockInDetailBackFinish(List<InStockinDetailBack> inStockinDetailParam);
void insertInStockInDetailBackFinish(List<InStockinDetailBack> inStockinDetails);
void deleteInStockInDetailList(List<InStockinDetailBack> inStockinDetails);
}

4
ruoyi-admin/src/main/java/com/ruoyi/in/stockindeatilback/service/impl/InStockinDetailBackServiceImpl.java
View File

@@ -92,8 +92,8 @@ public class InStockinDetailBackServiceImpl implements IInStockinDetailBackServi
}
@Override
public void insertInStockInDetailBackFinish(List<InStockinDetailBack> inStockinDetailParam) {
inStockinDetailBackMapper.insertInStockInDetailBackFinish(inStockinDetailParam);
public void insertInStockInDetailBackFinish(List<InStockinDetailBack> inStockinDetails) {
inStockinDetailBackMapper.insertInStockInDetailBackFinish(inStockinDetails);
}
@Override

111
ruoyi-admin/src/main/java/com/ruoyi/in/stockindetail/domain/InStockinDetail.java
View File

@@ -18,73 +18,52 @@ import lombok.ToString;
@AllArgsConstructor
@NoArgsConstructor
@ToString
public class InStockinDetail extends BaseEntity {
public class InStockinDetail extends BaseEntity
{
private static final long serialVersionUID = 1L;
/**
* 子单ID
*/
/** 子单ID */
private String stockinDetailId;
/**
* 主单GUID
*/
/** 主单GUID */
@Excel(name = "主单GUID")
private String stockinGuid;
/**
* 主单ID
*/
/** 主单ID */
@Excel(name = "主单ID")
private String stockinId;
/**
* 批次号
*/
/** 批次号 */
@Excel(name = "批次号")
private String lotNo;
/**
* 物料ID
*/
/** 物料ID */
@Excel(name = "物料ID")
private String productGuid;
/**
* 品号
*/
/** 品号 */
@Excel(name = "品号")
private String productId;
@Excel(name = "品名")
private String productName;
/**
* 计划数量
*/
/** 计划数量 */
@Excel(name = "计划数量")
private String quantity;
/**
* 计划数量(箱)
*/
/** 计划数量(箱) */
@Excel(name = "计划数量(箱)")
private String quantityX;
/**
* 计划数量(件)
*/
/** 计划数量(件) */
@Excel(name = "计划数量(件)")
private String quantityJ;
/**
* 参考单价
*/
/** 参考单价 */
@Excel(name = "参考单价")
private String price;
/**
* 品牌
*/
/** 品牌 */
@Excel(name = "品牌")
private String cargoNo;
@@ -95,93 +74,63 @@ public class InStockinDetail extends BaseEntity {
@Excel(name = "扫码数量(件)")
private String scanNumJ;
/**
* 实际数量
*/
/** 实际数量 */
@Excel(name = "实际数量")
private String assignNum;
/**
* 实际数量(箱)
*/
/** 实际数量(箱) */
@Excel(name = "实际数量(箱)")
private String assignNumX;
/**
* 实际数量(件)
*/
/** 实际数量(件) */
@Excel(name = "实际数量(件)")
private String assignNumJ;
/**
* 入库日期
*/
/** 入库日期 */
@Excel(name = "入库日期")
private String printDate;
/**
* 单据状态
*/
/** 单据状态 */
@Excel(name = "单据状态")
private String stockStatus;
/**
* 供应商编码
*/
/** 供应商编码 */
@Excel(name = "供应商编码")
private String supplierId;
/**
* 客户编码
*/
/** 客户编码 */
@Excel(name = "客户编码")
private String customerId;
/**
* 单位
*/
/** 单位 */
@Excel(name = "单位")
private String unit;
/**
* 规格
*/
/** 规格 */
@Excel(name = "规格")
private String spec;
/**
* 备用字段1
*/
/** 备用字段1 */
@Excel(name = "型号")
private String spare1;
/**
* 备用字段2
*/
/** 备用字段2 */
@Excel(name = "净重")
private String spare2;
/**
* 备用字段3
*/
/** 备用字段3 */
@Excel(name = "颜色")
private String spare3;
/**
* 备用字段4
*/
/** 备用字段4 */
@Excel(name = "序列号")
private String spare4;
/**
* 备用字段5
*/
/** 备用字段5 */
@Excel(name = "电压")
private String spare5;
/**
* 备用字段6
*/
/** 备用字段6 */
@Excel(name = "功率")
private String spare6;
@Excel(name = "相位")
@@ -198,12 +147,8 @@ public class InStockinDetail extends BaseEntity {
private String warehouseName;
private String warehouseId;
private String sourceLineId;
private String barCode;
private String isBatchManage;
private String oldProjectNo;
}

2
ruoyi-admin/src/main/java/com/ruoyi/in/stockindetail/mapper/InStockinDetailMapper.java
View File

@@ -1,7 +1,6 @@
package com.ruoyi.in.stockindetail.mapper;
import com.ruoyi.in.stockin.domain.InStockin;
import com.ruoyi.in.stockindeatilback.domain.InStockinDetailBack;
import com.ruoyi.in.stockindetail.domain.InStockinDetail;
import org.apache.ibatis.annotations.Param;
@@ -70,5 +69,4 @@ public interface InStockinDetailMapper
void deleteInStockinDetailByStockinGuid(String stockinGuid);
InStockinDetail selectStockinByDetailById(InStockinDetail inStockinDetail);
}

3
ruoyi-admin/src/main/java/com/ruoyi/in/stockindetail/service/IInStockinDetailService.java
View File

@@ -2,7 +2,6 @@ package com.ruoyi.in.stockindetail.service;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.in.stockin.domain.InStockin;
import com.ruoyi.in.stockindeatilback.domain.InStockinDetailBack;
import com.ruoyi.in.stockindetail.domain.InStockinDetail;
import java.util.List;
@@ -82,6 +81,4 @@ public interface IInStockinDetailService
public InStockinDetail selectStockinByDetailById(InStockinDetail inStockinDetail);
}

3
ruoyi-admin/src/main/java/com/ruoyi/in/stockindetail/service/impl/InStockinDetailServiceImpl.java
View File

@@ -3,7 +3,6 @@ package com.ruoyi.in.stockindetail.service.impl;
import com.ruoyi.common.annotation.DataScope;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.in.stockin.domain.InStockin;
import com.ruoyi.in.stockindeatilback.domain.InStockinDetailBack;
import com.ruoyi.in.stockindetail.domain.InStockinDetail;
import com.ruoyi.in.stockindetail.mapper.InStockinDetailMapper;
import com.ruoyi.in.stockindetail.service.IInStockinDetailService;
@@ -128,6 +127,4 @@ public class InStockinDetailServiceImpl implements IInStockinDetailService
return inStockinDetailMapper.selectStockinByDetailById(inStockinDetail);
}
}

5
ruoyi-admin/src/main/java/com/ruoyi/log/service/IRequestLogService.java
View File

@@ -69,9 +69,7 @@ public interface IRequestLogService
* @return
*/
public RequestLog getRequestLog(String url, String param, String remark,String source,String target);
public RequestLog getRequestLog(String url, String param, String remark,String source,String target,String billType,String ciccid);
/**
* 接收接口记录
*
@@ -80,4 +78,7 @@ public interface IRequestLogService
* @return
*/
public RequestLog getRequestLog(String param, String remark, AjaxResult ajaxResult);
public RequestLog getRequestLogERP(String param, String remark, AjaxResult ajaxResult);
}

83
ruoyi-admin/src/main/java/com/ruoyi/log/service/impl/RequestLogServiceImpl.java
View File

@@ -3,7 +3,10 @@ package com.ruoyi.log.service.impl;
import cn.hutool.core.convert.Convert;
import cn.hutool.core.date.DateUnit;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.net.URLDecoder;
import cn.hutool.core.net.URLEncodeUtil;
import cn.hutool.http.HttpRequest;
import cn.hutool.http.HttpResponse;
import cn.hutool.http.HttpUtil;
import cn.hutool.json.JSONUtil;
import com.ruoyi.common.core.domain.AjaxResult;
@@ -13,7 +16,7 @@ import com.ruoyi.log.service.IRequestLogService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import cn.hutool.core.net.URLEncoder;
import java.util.Date;
import java.util.List;
@@ -25,7 +28,8 @@ import java.util.List;
*/
@Service
@Slf4j
public class RequestLogServiceImpl implements IRequestLogService {
public class RequestLogServiceImpl implements IRequestLogService
{
@Autowired
private RequestLogMapper requestLogMapper;
@@ -36,7 +40,8 @@ public class RequestLogServiceImpl implements IRequestLogService {
* @return 接口记录
*/
@Override
public RequestLog selectRequestLogByRequestId(Long requestId) {
public RequestLog selectRequestLogByRequestId(Long requestId)
{
return requestLogMapper.selectRequestLogByRequestId(requestId);
}
@@ -47,7 +52,8 @@ public class RequestLogServiceImpl implements IRequestLogService {
* @return 接口记录
*/
@Override
public List<RequestLog> selectRequestLogList(RequestLog requestLog) {
public List<RequestLog> selectRequestLogList(RequestLog requestLog)
{
return requestLogMapper.selectRequestLogList(requestLog);
}
@@ -58,9 +64,10 @@ public class RequestLogServiceImpl implements IRequestLogService {
* @return 结果
*/
@Override
public int insertRequestLog(RequestLog requestLog) {
public int insertRequestLog(RequestLog requestLog)
{
return requestLogMapper.insertRequestLog(requestLog);
return requestLogMapper.insertRequestLog(requestLog);
}
@@ -71,7 +78,8 @@ public class RequestLogServiceImpl implements IRequestLogService {
* @return 结果
*/
@Override
public int updateRequestLog(RequestLog requestLog) {
public int updateRequestLog(RequestLog requestLog)
{
return requestLogMapper.updateRequestLog(requestLog);
}
@@ -82,7 +90,8 @@ public class RequestLogServiceImpl implements IRequestLogService {
* @return 结果
*/
@Override
public int deleteRequestLogByRequestIds(Long[] requestIds) {
public int deleteRequestLogByRequestIds(Long[] requestIds)
{
return requestLogMapper.deleteRequestLogByRequestIds(requestIds);
}
@@ -93,7 +102,8 @@ public class RequestLogServiceImpl implements IRequestLogService {
* @return 结果
*/
@Override
public int deleteRequestLogByRequestId(Long requestId) {
public int deleteRequestLogByRequestId(Long requestId)
{
return requestLogMapper.deleteRequestLogByRequestId(requestId);
}
@@ -105,7 +115,7 @@ public class RequestLogServiceImpl implements IRequestLogService {
* @return requestLog
*/
@Override
public RequestLog getRequestLog(String url, String param, String remark, String source, String target) {
public RequestLog getRequestLog(String url, String param, String remark,String source,String target) {
RequestLog requestLog = new RequestLog();
requestLog.setRequestTime(DateUtil.formatDateTime(new Date()));
requestLog.setSourceSystem(source);
@@ -116,9 +126,9 @@ public class RequestLogServiceImpl implements IRequestLogService {
requestLog.setRequestBody(param);
requestLog.setRequestUrl(url);
try {
String resStr = HttpRequest.post(url).form("datajson", param).form("ibilltype", "").form("cacc_id", "").contentType("application/x-www-from-urlencoded").
timeout(2000).execute().body();
// String resStr = HttpUtil.post(url, param);
// String resStr = HttpRequest.post(url).contentType("application/x-www-from-urlencoded").timeout(2000).body(param).execute().body();
String resStr = HttpUtil.post(url, param);
requestLog.setResponseBody(resStr);
// 判断resStr的状态码，如果不是200抛出异常让catch捕获
if (!JSONUtil.isJsonObj(resStr)) {
@@ -143,9 +153,12 @@ public class RequestLogServiceImpl implements IRequestLogService {
return requestLog;
}
@Override
public RequestLog getRequestLog(String url, String param, String remark, String source, String target, String billType, String ciccid) {
String body = "datajson=" + param
+ "&ibilltype=" + URLEncodeUtil.encodeAll(billType)
+ "&cacc_id=" + URLEncodeUtil.encodeAll(ciccid);
RequestLog requestLog = new RequestLog();
requestLog.setRequestTime(DateUtil.formatDateTime(new Date()));
requestLog.setSourceSystem(source);
@@ -153,20 +166,22 @@ public class RequestLogServiceImpl implements IRequestLogService {
requestLog.setEndpoint(remark);
requestLog.setRequestMethod("post");
requestLog.setRequestHeaders(null);
requestLog.setRequestBody("datajson:" + param + ",ibilltype:" + billType + ",cacc_id:" + ciccid);
requestLog.setRequestBody(body);
requestLog.setRequestUrl(url);
try {
String resStr = HttpRequest.post(url).form("datajson", param).form("ibilltype", billType).form("cacc_id", ciccid).contentType("application/x-www-from-urlencoded").
timeout(2000).execute().body();
// String resStr = HttpUtil.post(url, param);
String resStr = HttpRequest.post(url)
.contentType("application/x-www-form-urlencoded;charset=UTF-8")
.body(body)
.execute().body();
requestLog.setResponseBody(resStr);
// 判断resStr的状态码，如果不是200抛出异常让catch捕获
if (!JSONUtil.isJsonObj(resStr)) {
throw new RuntimeException("返回结果不是有效的JSON对象");
}
cn.hutool.json.JSONObject jsonObject = JSONUtil.parseObj(resStr);
Object codeObj = jsonObject.get("code");
if (codeObj == null || !codeObj.toString().equals("200")) {
Object codeObj = jsonObject.get("ErrCode");
if (codeObj == null || !codeObj.toString().equals("0")) {
throw new RuntimeException("请求失败，状态码: " + (codeObj != null ? codeObj.toString() : "null"));
}
requestLog.setResponseTime(DateUtil.formatDateTime(new Date()));
@@ -184,13 +199,14 @@ public class RequestLogServiceImpl implements IRequestLogService {
}
/**
* 插入请求日志
*
* @return requestLog
*/
@Override
public RequestLog getRequestLog(String param, String remark, AjaxResult ajaxResult) {
public RequestLog getRequestLog(String param, String remark,AjaxResult ajaxResult) {
RequestLog requestLog = new RequestLog();
requestLog.setRequestTime(DateUtil.formatDateTime(new Date()));
requestLog.setRequestBody(param);
@@ -201,9 +217,30 @@ public class RequestLogServiceImpl implements IRequestLogService {
requestLog.setResponseTime(DateUtil.formatDateTime(new Date()));
requestLog.setDuration(Convert.toStr(DateUtil.between(Convert.toDate(requestLog.getRequestTime()), Convert.toDate(requestLog.getResponseTime()), DateUnit.MS)));
requestLog.setResponseStatus("1");
if (ajaxResult.isSuccess()) {
if (ajaxResult.isSuccess()){
requestLog.setIsSuccessful("1");
} else {
}else {
requestLog.setIsSuccessful("0");
}
requestLog.setResponseBody(Convert.toStr(ajaxResult.get("msg")));
return requestLog;
}
@Override
public RequestLog getRequestLogERP(String param, String remark, AjaxResult ajaxResult) {
RequestLog requestLog = new RequestLog();
requestLog.setRequestTime(DateUtil.formatDateTime(new Date()));
requestLog.setRequestBody(param);
requestLog.setSourceSystem("erp");
requestLog.setTargetSystem("wms");
requestLog.setEndpoint(remark);
requestLog.setRequestMethod("post");
requestLog.setResponseTime(DateUtil.formatDateTime(new Date()));
requestLog.setDuration(Convert.toStr(DateUtil.between(Convert.toDate(requestLog.getRequestTime()), Convert.toDate(requestLog.getResponseTime()), DateUnit.MS)));
requestLog.setResponseStatus("1");
if (ajaxResult.isSuccess()){
requestLog.setIsSuccessful("1");
}else {
requestLog.setIsSuccessful("0");
}
requestLog.setResponseBody(Convert.toStr(ajaxResult.get("msg")));

9
ruoyi-admin/src/main/java/com/ruoyi/out/outStockout/controller/OutStockoutController.java
View File

@@ -134,8 +134,13 @@ public class OutStockoutController extends BaseController {
*/
@PreAuthorize("@ss.hasPermi('out:outStockout:autoAllot')")
@Log(title = "出库单自动分配", businessType = BusinessType.OTHER)
@GetMapping("/autoAllot")
public AjaxResult autoAllot(@RequestParam("stockoutId") String stockoutId) {
@PostMapping("/autoAllot")
public AjaxResult autoAllot(@RequestParam("stockoutId") String stockoutId,@RequestParam("spare8") String spare8) {
// 修改出库方向
// OutStockout outStockout = new OutStockout();
// outStockout.setStockoutId(stockoutId);
// outStockout.setSpare8(spare8);
// outStockoutService.updateOutStockout(outStockout);
return outStockoutService.autoAllot(stockoutId);
}

1
ruoyi-admin/src/main/java/com/ruoyi/out/outStockout/domain/OutStockout.java
View File

@@ -102,7 +102,6 @@ public class OutStockout extends BaseEntity
private String productId;
private String productName;
private String companyShortName;
private String accountSetNo;

1
ruoyi-admin/src/main/java/com/ruoyi/out/outStockout/service/impl/OutStockoutServiceImpl.java
View File

@@ -183,7 +183,6 @@ public class OutStockoutServiceImpl implements IOutStockoutService
map.put("v_result", null);
map.put("v_resultmsg", null);
outStockoutMapper.autoAllot(map);
//toWcsService.pushOutMydoJob();
if (!"10".equals(map.get("v_result"))){
stringBuilder.append(",").append(detail.getStockoutDetailId()+map.get("v_resultmsg"));
}

2
ruoyi-admin/src/main/java/com/ruoyi/out/outStockoutBack/domain/OutStockoutBack.java
View File

@@ -127,6 +127,8 @@ public class OutStockoutBack extends BaseEntity
@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
private String msg;
private String companyShortName;
private String accountSetNo;

30
ruoyi-admin/src/main/java/com/ruoyi/out/outStockoutDetail/domain/OutStockoutDetail.java
View File

@@ -48,7 +48,7 @@ public class OutStockoutDetail extends BaseEntity
/** 计划数量（箱） */
@Excel(name = "计划数量", readConverterExp = "箱=")
private BigDecimal quantityX;
private String quantityX;
/** 计划数量（件） */
@Excel(name = "计划数量", readConverterExp = "件=")
@@ -199,20 +199,12 @@ public class OutStockoutDetail extends BaseEntity
private String spare8;
private String spare9;
private String sourceLineId;
private String barCode;
private String isBatchManage;
private String oldProjectNo;
public String getOldProjectNo() {
return oldProjectNo;
}
public void setOldProjectNo(String oldProjectNo) {
this.oldProjectNo = oldProjectNo;
}
public String getSourceLineId() {
return sourceLineId;
}
@@ -237,6 +229,14 @@ public class OutStockoutDetail extends BaseEntity
this.isBatchManage = isBatchManage;
}
public String getOldProjectNo() {
return oldProjectNo;
}
public void setOldProjectNo(String oldProjectNo) {
this.oldProjectNo = oldProjectNo;
}
public String getSpare1() {
return spare1;
}
@@ -443,14 +443,12 @@ public class OutStockoutDetail extends BaseEntity
return quantity;
}
public void setQuantityX(BigDecimal quantityX)
{
this.quantityX = quantityX;
public String getQuantityX() {
return quantityX;
}
public BigDecimal getQuantityX()
{
return quantityX;
public void setQuantityX(String quantityX) {
this.quantityX = quantityX;
}
public void setQuantityJ(BigDecimal quantityJ)

5
ruoyi-admin/src/main/java/com/ruoyi/out/outStockoutDetailBack/mapper/OutStockoutDetailBackMapper.java
View File

@@ -2,6 +2,7 @@ package com.ruoyi.out.outStockoutDetailBack.mapper;
import java.util.List;
import com.ruoyi.out.outStockoutDetailBack.domain.OutStockoutDetailBack;
import org.apache.ibatis.annotations.Param;
/**
* 历史出库单据子信息Mapper接口
@@ -58,4 +59,8 @@ public interface OutStockoutDetailBackMapper
* @return 结果
*/
public int deleteOutStockoutDetailBackByStockoutDetailIds(String[] stockoutDetailIds);
void insertOutStockDetailBackFinish(@Param("list") List<OutStockoutDetailBack> outStockoutDetailBacks);
void deleteOutStockDetailList(@Param("list") List<OutStockoutDetailBack> outStockoutDetailBacks);
}

4
ruoyi-admin/src/main/java/com/ruoyi/out/outStockoutDetailBack/service/IOutStockoutDetailBackService.java
View File

@@ -58,4 +58,8 @@ public interface IOutStockoutDetailBackService
* @return 结果
*/
public int deleteOutStockoutDetailBackByStockoutDetailId(String stockoutDetailId);
void insertOutStockDetailBackFinish(List<OutStockoutDetailBack> outStockoutDetailBacks);
void deleteOutStockDetailList(List<OutStockoutDetailBack> outStockoutDetailBacks);
}

10
ruoyi-admin/src/main/java/com/ruoyi/out/outStockoutDetailBack/service/impl/OutStockoutDetailBackServiceImpl.java
View File

@@ -90,4 +90,14 @@ public class OutStockoutDetailBackServiceImpl implements IOutStockoutDetailBackS
{
return outStockoutDetailBackMapper.deleteOutStockoutDetailBackByStockoutDetailId(stockoutDetailId);
}
@Override
public void insertOutStockDetailBackFinish(List<OutStockoutDetailBack> outStockoutDetailBacks) {
outStockoutDetailBackMapper.insertOutStockDetailBackFinish(outStockoutDetailBacks);
}
@Override
public void deleteOutStockDetailList(List<OutStockoutDetailBack> outStockoutDetailBacks) {
outStockoutDetailBackMapper.deleteOutStockDetailList(outStockoutDetailBacks);
}
}

55
ruoyi-admin/src/main/java/com/ruoyi/pda/controller/PdaController.java
View File

@@ -1,10 +1,7 @@
package com.ruoyi.pda.controller;
import com.ruoyi.api.domain.AgvMoveParam;
import com.ruoyi.api.domain.RequestEnter;
import com.ruoyi.api.domain.WcsPort;
import com.ruoyi.api.service.IToWcsService;
import com.ruoyi.bas.agvPoint.domain.AgvPoint;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
@@ -35,8 +32,6 @@ public class PdaController extends BaseController {
private PdaService pdaService;
@Autowired
private IInStockinDetailService iInStockinDetailService;
@Autowired
private IToWcsService iToWcsService;
/**
* 查询是否有半满托盘
@@ -55,7 +50,7 @@ public class PdaController extends BaseController {
@ResponseBody
public AjaxResult selectDetailById(String inStockinDetailId) {
InStockinDetail inStockinDetail = iInStockinDetailService.selectInStockinDetailByStockinDetailId(inStockinDetailId);
if(inStockinDetail != null) {
if (inStockinDetail != null) {
inStockinDetail.setQuantity(String.valueOf(Integer.valueOf(inStockinDetail.getQuantity()) - Integer.valueOf(inStockinDetail.getScanNum())));
}
return AjaxResult.success(inStockinDetail);
@@ -110,12 +105,13 @@ public class PdaController extends BaseController {
/**
* 出库确认查询子作业信息
*
* @param trayCodeMsg
* @return
*/
@RequestMapping("/selectJobDetailByTray")
@ResponseBody
public AjaxResult selectJobDetailByTray(@RequestBody TrayCodeMsg trayCodeMsg){
public AjaxResult selectJobDetailByTray(@RequestBody TrayCodeMsg trayCodeMsg) {
return pdaService.selectJobDetailByTray(trayCodeMsg);
}
@@ -144,19 +140,12 @@ public class PdaController extends BaseController {
}
@RequestMapping("/selectDetailByPDTray")
@ResponseBody
public AjaxResult selectDetailByPDTray(@RequestBody TrayCodeMakeSure trayCodeMakeSure) {
return pdaService.selectDetailByPDTray(trayCodeMakeSure);
}
@RequestMapping("/selectHcTray")
@ResponseBody
public AjaxResult selectHcTray(@RequestBody TrayCodeMakeSure trayCodeMakeSure) {
return pdaService.selectHcTray(trayCodeMakeSure);
}
/**
* 盘点出库确认
@@ -184,31 +173,33 @@ public class PdaController extends BaseController {
return pdaService.updateWcsPort(wcsPort);
}
/**
* 根据类型查询AGV站点
*/
@RequestMapping("/selectAgvPointByType")
@ResponseBody
public AjaxResult selectAgvPointByType(String type) {
List<AgvPoint> list = pdaService.selectAgvPointByType(type);
return AjaxResult.success(list);
}
@RequestMapping("/insertAgvJob")
@ResponseBody
public AjaxResult insertAgvJob(@RequestBody AgvMoveParam agvMoveParam) {
return iToWcsService.insertAgvMoveJob(agvMoveParam);
}
@RequestMapping("/hcoutMakesure")
@ResponseBody
@Log(title = "手持机缓存出库确认",businessType = BusinessType.OTHER)
public AjaxResult hcoutMakesure(String trayCode ){
@Log(title = "手持机缓存出库确认", businessType = BusinessType.OTHER)
public AjaxResult hcoutMakesure(String trayCode) {
return pdaService.hcoutMakesure(trayCode);
}
/**
* 平库入库
*/
@RequestMapping("/inStockPk")
@ResponseBody
public AjaxResult inStockPk(@RequestBody TrayCodeMakeSure trayCodeMakeSure) {
return pdaService.completeInPk(trayCodeMakeSure);
}
/**
* 库存查询(平库扫码查询托盘入库信息)
*/
@RequestMapping("/searchStock")
@ResponseBody
public AjaxResult searchStock(@RequestBody TrayCodeMakeSure trayCodeMakeSure) {
return AjaxResult.success(pdaService.selectBasStockHc(trayCodeMakeSure.getTrayCode()));
}
}

4
ruoyi-admin/src/main/java/com/ruoyi/pda/domain/TrayCodeMakeSure.java
View File

@@ -22,10 +22,14 @@ public class TrayCodeMakeSure {
private String exitId;
private String isFull;
// 选中传1 没选中传0
private String isBoundByAccord;
//拣选详情列表
private List<MydoJobDetail> mydoJobDetailList;
//盘点详情列表
private List<MydoJobDetail> materials;
//异常详情列表
private List<MydoJobDetail> materialDetails;
private String quantity;
private String stockinDetailId;
}

2
ruoyi-admin/src/main/java/com/ruoyi/pda/mapper/PdaMapper.java
View File

@@ -40,4 +40,6 @@ public interface PdaMapper {
void outMakeSureException(HashMap<String, Object> map);
void hcoutMakesure(HashMap<String, Object> map);
void completeInPk(HashMap<String, Object> map);
}

8
ruoyi-admin/src/main/java/com/ruoyi/pda/service/PdaService.java
View File

@@ -2,7 +2,6 @@ package com.ruoyi.pda.service;
import com.ruoyi.api.domain.RequestEnter;
import com.ruoyi.api.domain.WcsPort;
import com.ruoyi.bas.agvPoint.domain.AgvPoint;
import com.ruoyi.bas.container.domain.BasContainer;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.pda.domain.TrayCodeMakeSure;
@@ -48,8 +47,6 @@ public interface PdaService {
public AjaxResult selectDetailByPDTray(TrayCodeMakeSure trayCodeMakeSure);
public AjaxResult selectHcTray(TrayCodeMakeSure trayCodeMakeSure);
AjaxResult outMakeSure(TrayCodeMakeSure trayCodeMakeSure);
AjaxResult checkMakeSure(TrayCodeMakeSure trayCodeMakeSure);
@@ -58,7 +55,10 @@ public interface PdaService {
AjaxResult updateWcsPort(WcsPort wcsport);
List<AgvPoint> selectAgvPointByType(String type);
AjaxResult hcoutMakesure(String trayCode);
AjaxResult completeInPk(TrayCodeMakeSure trayCodeMakeSure);
AjaxResult selectBasStockHc(String trayCode);
}

66
ruoyi-admin/src/main/java/com/ruoyi/pda/service/PdaServiceImp.java
View File

@@ -6,8 +6,6 @@ import com.ruoyi.api.domain.RequestEnter;
import com.ruoyi.api.domain.WcsPort;
import com.ruoyi.api.service.IToWcsService;
import com.ruoyi.api.service.IToWmsService;
import com.ruoyi.bas.agvPoint.domain.AgvPoint;
import com.ruoyi.bas.agvPoint.service.IAgvPointService;
import com.ruoyi.check.commit.domain.CheckCommitRecord;
import com.ruoyi.check.commit.service.ICheckCommitRecordService;
import com.ruoyi.common.core.domain.AjaxResult;
@@ -27,8 +25,6 @@ import com.ruoyi.pda.domain.TrayCodeMsg;
import com.ruoyi.pda.mapper.PdaMapper;
import com.ruoyi.pda.trayMsg.domain.TrayMsg;
import com.ruoyi.pda.trayMsg.service.ITrayMsgService;
import com.ruoyi.stock.hcstock.domain.BasStockHc;
import com.ruoyi.stock.hcstock.service.IBasStockHcService;
import com.ruoyi.stock.stock.domain.BasStock;
import com.ruoyi.stock.stock.mapper.BasStockMapper;
import com.ruoyi.system.service.ISysRoleService;
@@ -64,17 +60,13 @@ public class PdaServiceImp implements PdaService {
private BasStockMapper basStockMapper;
@Autowired
private IInStockinService inStockinService;
@Autowired
private IAgvPointService agvPointService;
@Autowired
private IBasStockHcService basStockHcService;
@Override
public List<BasStock> selectHasHalfTray(String inStockinDetailId) {
InStockinDetail inStockinDetail = inStockinDetailService.selectInStockinDetailByStockinDetailId(inStockinDetailId);
InStockin inStockin = inStockinService.selectInStockinByStockinId(inStockinDetail.getStockinId());
inStockinDetail.setSpare4(inStockin.getDepartmentNo());
// InStockin inStockin = inStockinService.selectInStockinByStockinId(inStockinDetail.getStockinId());
// inStockinDetail.setSpare4(inStockinDetail.getSpare4());
List<BasStock> hasHalfTray = basStockMapper.selectHasHalfTray(inStockinDetail);
return hasHalfTray;
}
@@ -83,8 +75,8 @@ public class PdaServiceImp implements PdaService {
@Override
public AjaxResult halfTrayOut(TrayCodeMsg trayCodeMsg) {
InStockinDetail inStockinDetail = inStockinDetailService.selectInStockinDetailByStockinDetailId(trayCodeMsg.getStockinDetailId());
InStockin inStockin = inStockinService.selectInStockinByStockinId(inStockinDetail.getStockinId());
inStockinDetail.setSpare4(inStockin.getDepartmentNo());
// InStockin inStockin = inStockinService.selectInStockinByStockinId(inStockinDetail.getStockinId());
// inStockinDetail.setSpare4(inStockin.getDepartmentNo());
List<BasStock> hasHalfTray = basStockMapper.selectHasHalfTray(inStockinDetail);
HashMap<String, Object> map = new HashMap<>();
map.put("v_tray_code", hasHalfTray.get(0).getTrayCode());
@@ -126,6 +118,7 @@ public class PdaServiceImp implements PdaService {
HashMap<String, Object> map = new HashMap<>();
map.put("v_tray_code", trayCodeMakeSure.getTrayCode());
map.put("v_stockin_detail_id", mydoJobDetail.getStockinDetailId());
map.put("v_is_bound_accord", trayCodeMakeSure.getIsBoundByAccord());
map.put("v_quantity", Integer.valueOf(mydoJobDetail.getInQuantity()));
pdaMapper.bindTray(map);
if (!"10".equals(map.get("v_result").toString())) {
@@ -207,23 +200,13 @@ public class PdaServiceImp implements PdaService {
@Override
public AjaxResult selectDetailByPDTray(TrayCodeMakeSure trayCodeMakeSure) {
MydoJob mydoJob = new MydoJob();
mydoJob.setTrayCode(trayCodeMakeSure.getTrayCode());
mydoJob.setExitId(trayCodeMakeSure.getExitId());
mydoJob.setStatus("3");
mydoJob.setInOrOut("28");
List<MydoJobDetail> mydoJobDetails = mydoJobDetailService.selectPdMydoJobDetailListByExit(mydoJob);
return AjaxResult.success(mydoJobDetails);
}
@Override
public AjaxResult selectHcTray(TrayCodeMakeSure trayCodeMakeSure) {
BasStockHc basStockHc = new BasStockHc();
basStockHc.setTrayCode(trayCodeMakeSure.getTrayCode());
List<BasStockHc> basStockHcs = basStockHcService.selectBasStockHcList(basStockHc);
return AjaxResult.success(basStockHcs);
}
@Override
public AjaxResult outMakeSure(TrayCodeMakeSure trayCodeMakeSure) {
String trayCode = trayCodeMakeSure.getTrayCode();
@@ -257,9 +240,9 @@ public class PdaServiceImp implements PdaService {
public AjaxResult checkMakeSure(TrayCodeMakeSure trayCodeMakeSure) {
MydoJob mydoJob = new MydoJob();
mydoJob.setTrayCode(trayCodeMakeSure.getTrayCode());
mydoJob.setExitId(trayCodeMakeSure.getExitId());
mydoJob.setStatus("3");
mydoJob.setInOrOut("28");
mydoJob.setInOrOut("26");
List<MydoJobDetail> mydoJobDetails = mydoJobDetailService.selectPdMydoJobDetailListByExit(mydoJob);
if (mydoJobDetails.isEmpty()) {
return AjaxResult.error("该物料没有盘点出库作业，请检查");
@@ -269,7 +252,7 @@ public class PdaServiceImp implements PdaService {
if (CollUtil.isNotEmpty(mydoJobDetailList)) {
boolean flag = mydoJobDetailList.stream().anyMatch(x -> StrUtil.isEmpty(x.getStockId()) && "0".equals(x.getInQuantity()));
if (flag) {
return AjaxResult.warn(MessageUtils.message("数量不可为0"));
return AjaxResult.warn(MessageUtils.message("warn.message8"));
}
for (MydoJobDetail mydoJobDetail : mydoJobDetailList) {
//插入盘点提交表
@@ -279,7 +262,7 @@ public class PdaServiceImp implements PdaService {
checkCommitRecord.setStockId(mydoJobDetail.getStockId());
checkCommitRecord.setSpare1(mydoJobDetail.getInOrOutDId());
checkCommitRecord.setSpare2(mydoJobDetail.getProductId());
// checkCommitRecord.setSpare3(mydoJobDetail.getOutQuantity());
checkCommitRecord.setSpare3(mydoJobDetail.getOutQuantity());
checkCommitRecordService.insertCheckCommitRecord(checkCommitRecord);
}
@@ -308,13 +291,6 @@ public class PdaServiceImp implements PdaService {
return ajaxResult;
}
@Override
public List<AgvPoint> selectAgvPointByType(String type) {
AgvPoint agvPoint = new AgvPoint();
agvPoint.setType(type);
return agvPointService.selectAgvPointList(agvPoint);
}
@Override
public AjaxResult hcoutMakesure(String trayCode) {
HashMap<String, Object> map = new HashMap<>();
@@ -326,6 +302,28 @@ public class PdaServiceImp implements PdaService {
} else {
return AjaxResult.error(map.get("v_resultmsg").toString());
}
}
@Override
public AjaxResult completeInPk(TrayCodeMakeSure trayCodeMakeSure) {
HashMap<String, Object> map = new HashMap<>();
map.put("v_tray_code", trayCodeMakeSure.getTrayCode());
map.put("v_in_stockin_detail_id", trayCodeMakeSure.getStockinDetailId());
map.put("v_quantity", trayCodeMakeSure.getQuantity());
pdaMapper.completeInPk(map);
String result = map.get("v_result").toString();
if ("10".equals(result)) {
return AjaxResult.success();
} else {
return AjaxResult.error(map.get("v_resultmsg").toString());
}
}
@Override
public AjaxResult selectBasStockHc(String trayCode) {
BasStock basStock = new BasStock();
basStock.setTrayCode(trayCode);
List<BasStock> stocks=basStockMapper.selectBasStockListHc(basStock);
return AjaxResult.success(stocks);
}
}

2
ruoyi-admin/src/main/java/com/ruoyi/stock/stock/mapper/BasStockMapper.java
View File

@@ -73,4 +73,6 @@ public interface BasStockMapper
List<BasStock> getStockBySerial(String trayCode);
List<BasStock> selectHasHalfTray(InStockinDetail inStockinDetail);
List<BasStock> selectBasStockListHc(BasStock basStock);
}

4
ruoyi-admin/src/main/resources/application-druid.yml
View File

@@ -6,9 +6,9 @@ spring:
druid:
# 主库数据源
master:
url: jdbc:sqlserver://127.0.0.1:1433;databaseName=FT546-wms;encrypt=true;trustServerCertificate=true;
url: jdbc:sqlserver://192.168.188.236:1433;databaseName=FT546-wms;encrypt=true;trustServerCertificate=true;
username: sa
password: 123456
password: Flrd0914.
# 从库数据源
slave:
# 从数据源开关/默认关闭

21
ruoyi-admin/src/main/resources/mapper/agv/AgvContainerTaskMapper.xml
View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8" ?>
<?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">
@@ -25,15 +25,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectAgvContainerTaskList" parameterType="AgvContainerTask" resultMap="AgvContainerTaskResult">
<include refid="selectAgvContainerTaskVo"/>
<where>
<if test="container != null and container != ''"> and container = #{container}</if>
<if test="startPoint != null and startPoint != ''"> and start_point = #{startPoint}</if>
<if test="endPoint != null and endPoint != ''"> and end_point = #{endPoint}</if>
<if test="startTime != null and startTime != ''"> and start_time = #{startTime}</if>
<if test="finishTime != null and finishTime != ''"> and finish_time = #{finishTime}</if>
<if test="taskNo != null and taskNo != ''"> and task_no = #{taskNo}</if>
<if test="status != null and status != ''"> and status = #{status}</if>
<if test="spare1 != null and spare1 != ''"> and spare1 = #{spare1}</if>
<if test="spare2 != null and spare2 != ''"> and spare2 = #{spare2}</if>
<if test="container != null and container != ''"> and container like concat('%', #{container}, '%')</if>
<if test="startPoint != null and startPoint != ''"> and start_point like concat('%', #{startPoint}, '%')</if>
<if test="endPoint != null and endPoint != ''"> and end_point like concat('%', #{endPoint}, '%')</if>
<if test="startTime != null and startTime != ''"> and start_time like concat('%', #{startTime}, '%')</if>
<if test="finishTime != null and finishTime != ''"> and finish_time like concat('%', #{finishTime}, '%')</if>
<if test="taskNo != null and taskNo != ''"> and task_no like concat('%', #{taskNo}, '%')</if>
<if test="status != null and status != ''"> and status like concat('%', #{status}, '%')</if>
<if test="spare1 != null and spare1 != ''"> and spare1 like concat('%', #{spare1}, '%')</if>
<if test="spare2 != null and spare2 != ''"> and spare2 like concat('%', #{spare2}, '%')</if>
</where>
</select>
@@ -102,3 +102,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</foreach>
</delete>
</mapper>

17
ruoyi-admin/src/main/resources/mapper/ai/ChatMessageMapper.xml
View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8" ?>
<?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">
@@ -28,14 +28,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectChatMessageList" parameterType="ChatMessage" resultMap="ChatMessageResult">
<include refid="selectChatMessageVo"/>
<where>
<if test="sessionId != null "> and session_id = #{sessionId}</if>
<if test="conversationId != null "> and conversation_id = #{conversationId}</if>
<if test="content != null and content != ''"> and content = #{content}</if>
<if test="role != null and role != ''"> and role = #{role}</if>
<if test="deductCost != null "> and deduct_cost = #{deductCost}</if>
<if test="totalTokens != null "> and total_tokens = #{totalTokens}</if>
<if test="sessionId != null "> and session_id like concat('%', #{sessionId}, '%')</if>
<if test="conversationId != null "> and conversation_id like concat('%', #{conversationId}, '%')</if>
<if test="content != null and content != ''"> and content like concat('%', #{content}, '%')</if>
<if test="role != null and role != ''"> and role like concat('%', #{role}, '%')</if>
<if test="deductCost != null "> and deduct_cost like concat('%', #{deductCost}, '%')</if>
<if test="totalTokens != null "> and total_tokens like concat('%', #{totalTokens}, '%')</if>
<if test="modelName != null and modelName != ''"> and model_name like concat('%', #{modelName}, '%')</if>
<if test="createDept != null "> and create_dept = #{createDept}</if>
<if test="createDept != null "> and create_dept like concat('%', #{createDept}, '%')</if>
</where>
order by create_time asc
</select>
@@ -115,3 +115,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
delete from chat_message where conversation_id = #{conversationId}
</delete>
</mapper>

25
ruoyi-admin/src/main/resources/mapper/ai/ConversationsMapper.xml
View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8" ?>
<?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">
@@ -26,17 +26,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectConversationsList" parameterType="Conversations" resultMap="ConversationsResult">
<include refid="selectConversationsVo"/>
<where>
<if test="sessionId != null and sessionId != ''"> and session_id = #{sessionId}</if>
<if test="userId != null and userId != ''"> and user_id = #{userId}</if>
<if test="title != null and title != ''"> and title = #{title}</if>
<if test="status != null and status != ''"> and status = #{status}</if>
<if test="metadata != null and metadata != ''"> and metadata = #{metadata}</if>
<if test="firstQuery != null and firstQuery != ''"> and first_query = #{firstQuery}</if>
<if test="messageCount != null "> and message_count = #{messageCount}</if>
<if test="tokenUsage != null "> and token_usage = #{tokenUsage}</if>
<if test="createdAt != null "> and created_at = #{createdAt}</if>
<if test="updatedAt != null "> and updated_at = #{updatedAt}</if>
<if test="lastInteractionAt != null "> and last_interaction_at = #{lastInteractionAt}</if>
<if test="sessionId != null and sessionId != ''"> and session_id like concat('%', #{sessionId}, '%')</if>
<if test="userId != null and userId != ''"> and user_id like concat('%', #{userId}, '%')</if>
<if test="title != null and title != ''"> and title like concat('%', #{title}, '%')</if>
<if test="status != null and status != ''"> and status like concat('%', #{status}, '%')</if>
<if test="metadata != null and metadata != ''"> and metadata like concat('%', #{metadata}, '%')</if>
<if test="firstQuery != null and firstQuery != ''"> and first_query like concat('%', #{firstQuery}, '%')</if>
<if test="messageCount != null "> and message_count like concat('%', #{messageCount}, '%')</if>
<if test="tokenUsage != null "> and token_usage like concat('%', #{tokenUsage}, '%')</if>
<if test="createdAt != null "> and created_at like concat('%', #{createdAt}, '%')</if>
<if test="updatedAt != null "> and updated_at like concat('%', #{updatedAt}, '%')</if>
<if test="lastInteractionAt != null "> and last_interaction_at like concat('%', #{lastInteractionAt}, '%')</if>
order by id desc
</where>
</select>
@@ -105,3 +105,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</foreach>
</delete>
</mapper>

24
ruoyi-admin/src/main/resources/mapper/api/KnowledgeFileMapper.xml
View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8" ?>
<?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">
@@ -26,17 +26,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectKnowledgeFileList" parameterType="KnowledgeFile" resultMap="KnowledgeFileResult">
<include refid="selectKnowledgeFileVo"/>
<where>
<if test="knowledgeBaseId != null "> and knowledge_base_id = #{knowledgeBaseId}</if>
<if test="knowledgeBaseId != null "> and knowledge_base_id like concat('%', #{knowledgeBaseId}, '%')</if>
<if test="fileName != null and fileName != ''"> and file_name like concat('%', #{fileName}, '%')</if>
<if test="filePath != null and filePath != ''"> and file_path = #{filePath}</if>
<if test="fileSize != null "> and file_size = #{fileSize}</if>
<if test="fileType != null and fileType != ''"> and file_type = #{fileType}</if>
<if test="description != null and description != ''"> and description = #{description}</if>
<if test="isVectorized != null "> and is_vectorized = #{isVectorized}</if>
<if test="vectorizedTime != null "> and vectorized_time = #{vectorizedTime}</if>
<if test="uploadTime != null "> and upload_time = #{uploadTime}</if>
<if test="updatedAt != null "> and updated_at = #{updatedAt}</if>
<if test="isDeleted != null "> and is_deleted = #{isDeleted}</if>
<if test="filePath != null and filePath != ''"> and file_path like concat('%', #{filePath}, '%')</if>
<if test="fileSize != null "> and file_size like concat('%', #{fileSize}, '%')</if>
<if test="fileType != null and fileType != ''"> and file_type like concat('%', #{fileType}, '%')</if>
<if test="description != null and description != ''"> and description like concat('%', #{description}, '%')</if>
<if test="isVectorized != null "> and is_vectorized like concat('%', #{isVectorized}, '%')</if>
<if test="vectorizedTime != null "> and vectorized_time like concat('%', #{vectorizedTime}, '%')</if>
<if test="uploadTime != null "> and upload_time like concat('%', #{uploadTime}, '%')</if>
<if test="updatedAt != null "> and updated_at like concat('%', #{updatedAt}, '%')</if>
<if test="isDeleted != null "> and is_deleted like concat('%', #{isDeleted}, '%')</if>
</where>
</select>
@@ -103,4 +103,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{id}
</foreach>
</delete>
</mapper>
</mapper>

26
ruoyi-admin/src/main/resources/mapper/api/MoveMsgMapper.xml
View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8" ?>
<?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">
@@ -26,17 +26,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectMoveMsgList" parameterType="MoveMsg" resultMap="MoveMsgResult">
<include refid="selectMoveMsgVo"/>
<where>
<if test="trayCode != null and trayCode != ''"> and tray_code = #{trayCode}</if>
<if test="oldSpace != null and oldSpace != ''"> and old_space = #{oldSpace}</if>
<if test="newSpace != null and newSpace != ''"> and new_space = #{newSpace}</if>
<if test="status != null and status != ''"> and status = #{status}</if>
<if test="sendTime != null and sendTime != ''"> and send_time = #{sendTime}</if>
<if test="msg != null and msg != ''"> and msg = #{msg}</if>
<if test="spare1 != null and spare1 != ''"> and spare1 = #{spare1}</if>
<if test="spare2 != null and spare2 != ''"> and spare2 = #{spare2}</if>
<if test="spare3 != null and spare3 != ''"> and spare3 = #{spare3}</if>
<if test="spare4 != null and spare4 != ''"> and spare4 = #{spare4}</if>
<if test="spare5 != null and spare5 != ''"> and spare5 = #{spare5}</if>
<if test="trayCode != null and trayCode != ''"> and tray_code like concat('%', #{trayCode}, '%')</if>
<if test="oldSpace != null and oldSpace != ''"> and old_space like concat('%', #{oldSpace}, '%')</if>
<if test="newSpace != null and newSpace != ''"> and new_space like concat('%', #{newSpace}, '%')</if>
<if test="status != null and status != ''"> and status like concat('%', #{status}, '%')</if>
<if test="sendTime != null and sendTime != ''"> and send_time like concat('%', #{sendTime}, '%')</if>
<if test="msg != null and msg != ''"> and msg like concat('%', #{msg}, '%')</if>
<if test="spare1 != null and spare1 != ''"> and spare1 like concat('%', #{spare1}, '%')</if>
<if test="spare2 != null and spare2 != ''"> and spare2 like concat('%', #{spare2}, '%')</if>
<if test="spare3 != null and spare3 != ''"> and spare3 like concat('%', #{spare3}, '%')</if>
<if test="spare4 != null and spare4 != ''"> and spare4 like concat('%', #{spare4}, '%')</if>
<if test="spare5 != null and spare5 != ''"> and spare5 like concat('%', #{spare5}, '%')</if>
</where>
</select>
@@ -105,4 +105,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{id}
</foreach>
</delete>
</mapper>
</mapper>

18
ruoyi-admin/src/main/resources/mapper/bas/BasContainerDetailsMapper.xml
View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8" ?>
<?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">
@@ -23,14 +23,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectBasContainerDetailsList" parameterType="BasContainerDetails" resultMap="BasContainerDetailsResult">
<include refid="selectBasContainerDetailsVo"/>
<where>
<if test="containerId != null and containerId != ''"> and container_id = #{containerId}</if>
<if test="productId != null and productId != ''"> and product_id = #{productId}</if>
<if test="containerId != null and containerId != ''"> and container_id like concat('%', #{containerId}, '%')</if>
<if test="productId != null and productId != ''"> and product_id like concat('%', #{productId}, '%')</if>
<if test="productName != null and productName != ''"> and product_name like concat('%', #{productName}, '%')</if>
<if test="quantity != null "> and quantity = #{quantity}</if>
<if test="unit != null and unit != ''"> and unit = #{unit}</if>
<if test="spare1 != null and spare1 != ''"> and spare1 = #{spare1}</if>
<if test="spare2 != null and spare2 != ''"> and spare2 = #{spare2}</if>
<if test="spare3 != null and spare3 != ''"> and spare3 = #{spare3}</if>
<if test="quantity != null "> and quantity like concat('%', #{quantity}, '%')</if>
<if test="unit != null and unit != ''"> and unit like concat('%', #{unit}, '%')</if>
<if test="spare1 != null and spare1 != ''"> and spare1 like concat('%', #{spare1}, '%')</if>
<if test="spare2 != null and spare2 != ''"> and spare2 like concat('%', #{spare2}, '%')</if>
<if test="spare3 != null and spare3 != ''"> and spare3 like concat('%', #{spare3}, '%')</if>
</where>
</select>
@@ -90,4 +90,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{id}
</foreach>
</delete>
</mapper>
</mapper>

14
ruoyi-admin/src/main/resources/mapper/bas/BasContainerMapper.xml
View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8" ?>
<?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">
@@ -26,11 +26,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<include refid="selectBasContainerVo"/>
<where>
<if test="containerId != null and containerId != ''"> and container_id like concat('%', #{containerId}, '%')</if>
<if test="portName != null and portName != ''"> and port_name = #{portName}</if>
<if test="status != null "> and status = #{status}</if>
<if test="productTypeQuantity != null "> and product_type_quantity = #{productTypeQuantity}</if>
<if test="updateTime != null and updateTime != ''"> and update_time = #{updateTime}</if>
<if test="operationMan != null and operationMan != ''"> and operation_man = #{operationMan}</if>
<if test="portName != null and portName != ''"> and port_name like concat('%', #{portName}, '%')</if>
<if test="status != null "> and status like concat('%', #{status}, '%')</if>
<if test="productTypeQuantity != null "> and product_type_quantity like concat('%', #{productTypeQuantity}, '%')</if>
<if test="updateTime != null and updateTime != ''"> and update_time like concat('%', #{updateTime}, '%')</if>
<if test="operationMan != null and operationMan != ''"> and operation_man like concat('%', #{operationMan}, '%')</if>
</where>
</select>
@@ -102,4 +102,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectPortNames" resultType="string">
SELECT DISTINCT port_name FROM bas_product_port WHERE port_name != null or port_name != ''
</select>
</mapper>
</mapper>

6
ruoyi-admin/src/main/resources/mapper/bas/BasCustomerMapper.xml
View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8" ?>
<?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">
@@ -39,7 +39,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="customerGroupNo != null and customerGroupNo != ''"> and customer_group_no like concat('%', #{customerGroupNo}, '%')</if>
<if test="customerName != null and customerName != ''"> and customer_name like concat('%', #{customerName}, '%')</if>
<if test="simpleName != null and simpleName != ''"> and simple_name like concat('%', #{simpleName}, '%')</if>
<if test="useable != null and useable != ''"> and useable = #{useable}</if>
<if test="useable != null and useable != ''"> and useable like concat('%', #{useable}, '%')</if>
<if test="businessDepartment != null and businessDepartment != ''"> and business_department like concat('%', #{businessDepartment}, '%')</if>
<if test="salesman != null and salesman != ''"> and salesman like concat('%', #{salesman}, '%')</if>
<if test="mnemonicCode != null and mnemonicCode != ''"> and mnemonic_code like concat('%', #{mnemonicCode}, '%')</if>
@@ -149,4 +149,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{id}
</foreach>
</delete>
</mapper>
</mapper>

41
ruoyi-admin/src/main/resources/mapper/bas/BasJobIdMapper.xml
View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8" ?>
<?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">
@@ -34,25 +34,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectBasJobIdList" parameterType="BasJobId" resultMap="BasJobIdResult">
<include refid="selectBasJobIdVo"/>
<where>
<if test="type != null and type != ''"> and type = #{type}</if>
<if test="jobId != null and jobId != ''"> and job_id = #{jobId}</if>
<if test="jobDetail != null and jobDetail != ''"> and job_detail = #{jobDetail}</if>
<if test="stockId != null and stockId != ''"> and stock_id = #{stockId}</if>
<if test="orderId != null and orderId != ''"> and order_id = #{orderId}</if>
<if test="exorderId != null and exorderId != ''"> and Exorder_id = #{exorderId}</if>
<if test="jobIdR != null and jobIdR != ''"> and job_id_R = #{jobIdR}</if>
<if test="jobDetailR != null and jobDetailR != ''"> and job_detail_R = #{jobDetailR}</if>
<if test="jobIdC != null and jobIdC != ''"> and job_id_C = #{jobIdC}</if>
<if test="jobDetailC != null and jobDetailC != ''"> and job_detail_C = #{jobDetailC}</if>
<if test="tempOrderId != null and tempOrderId != ''"> and temp_order_id = #{tempOrderId}</if>
<if test="lotNo != null and lotNo != ''"> and lot_no = #{lotNo}</if>
<if test="stockinId != null and stockinId != ''"> and stockin_id = #{stockinId}</if>
<if test="stockinDetailId != null and stockinDetailId != ''"> and stockin_detail_id = #{stockinDetailId}</if>
<if test="stockoutId != null and stockoutId != ''"> and stockout_id = #{stockoutId}</if>
<if test="stockoutDetailId != null and stockoutDetailId != ''"> and stockout_detail_id = #{stockoutDetailId}</if>
<if test="planId != null and planId != ''"> and plan_id = #{planId}</if>
<if test="jobIdY != null and jobIdY != ''"> and job_id_y = #{jobIdY}</if>
<if test="jobIdS != null and jobIdS != ''"> and job_id_s = #{jobIdS}</if>
<if test="type != null and type != ''"> and type like concat('%', #{type}, '%')</if>
<if test="jobId != null and jobId != ''"> and job_id like concat('%', #{jobId}, '%')</if>
<if test="jobDetail != null and jobDetail != ''"> and job_detail like concat('%', #{jobDetail}, '%')</if>
<if test="stockId != null and stockId != ''"> and stock_id like concat('%', #{stockId}, '%')</if>
<if test="orderId != null and orderId != ''"> and order_id like concat('%', #{orderId}, '%')</if>
<if test="exorderId != null and exorderId != ''"> and Exorder_id like concat('%', #{exorderId}, '%')</if>
<if test="jobIdR != null and jobIdR != ''"> and job_id_R like concat('%', #{jobIdR}, '%')</if>
<if test="jobDetailR != null and jobDetailR != ''"> and job_detail_R like concat('%', #{jobDetailR}, '%')</if>
<if test="jobIdC != null and jobIdC != ''"> and job_id_C like concat('%', #{jobIdC}, '%')</if>
<if test="jobDetailC != null and jobDetailC != ''"> and job_detail_C like concat('%', #{jobDetailC}, '%')</if>
<if test="tempOrderId != null and tempOrderId != ''"> and temp_order_id like concat('%', #{tempOrderId}, '%')</if>
<if test="lotNo != null and lotNo != ''"> and lot_no like concat('%', #{lotNo}, '%')</if>
<if test="stockinId != null and stockinId != ''"> and stockin_id like concat('%', #{stockinId}, '%')</if>
<if test="stockinDetailId != null and stockinDetailId != ''"> and stockin_detail_id like concat('%', #{stockinDetailId}, '%')</if>
<if test="stockoutId != null and stockoutId != ''"> and stockout_id like concat('%', #{stockoutId}, '%')</if>
<if test="stockoutDetailId != null and stockoutDetailId != ''"> and stockout_detail_id like concat('%', #{stockoutDetailId}, '%')</if>
<if test="planId != null and planId != ''"> and plan_id like concat('%', #{planId}, '%')</if>
<if test="jobIdY != null and jobIdY != ''"> and job_id_y like concat('%', #{jobIdY}, '%')</if>
<if test="jobIdS != null and jobIdS != ''"> and job_id_s like concat('%', #{jobIdS}, '%')</if>
</where>
</select>
@@ -162,3 +162,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</select>
</mapper>

20
ruoyi-admin/src/main/resources/mapper/bas/BasProductCodeMapper.xml
View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8" ?>
<?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">
@@ -31,7 +31,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectBasProductCodeList" parameterType="BasProductCode" resultMap="BasProductCodeResult">
<include refid="selectBasProductCodeVo"/>
<where>
<if test="model != null and model != ''"> and model = #{model}</if>
<if test="model != null and model != ''"> and model like concat('%', #{model}, '%')</if>
<if test="color != null and color != ''"> and color like concat('%', #{color}, '%')</if>
<if test="serial != null and serial != ''"> and serial like concat('%', #{serial}, '%')</if>
<if test="v != null and v != ''"> and v like concat('%', #{v}, '%')</if>
@@ -39,13 +39,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="ph != null and ph != ''"> and ph like concat('%', #{ph}, '%')</if>
<if test="nW != null and nW != ''"> and n_w like concat('%', #{nW}, '%')</if>
<if test="gW != null and gW != ''"> and g_w like concat('%', #{gW}, '%')</if>
<if test="type != null and type != ''"> and type = #{type}</if>
<if test="spare1 != null and spare1 != ''"> and spare1 = #{spare1}</if>
<if test="spare2 != null and spare2 != ''"> and spare2 = #{spare2}</if>
<if test="spare3 != null and spare3 != ''"> and spare3 = #{spare3}</if>
<if test="spare4 != null and spare4 != ''"> and spare4 = #{spare4}</if>
<if test="spare5 != null and spare5 != ''"> and spare5 = #{spare5}</if>
<if test="spare6 != null and spare6 != ''"> and spare6 = #{spare6}</if>
<if test="type != null and type != ''"> and type like concat('%', #{type}, '%')</if>
<if test="spare1 != null and spare1 != ''"> and spare1 like concat('%', #{spare1}, '%')</if>
<if test="spare2 != null and spare2 != ''"> and spare2 like concat('%', #{spare2}, '%')</if>
<if test="spare3 != null and spare3 != ''"> and spare3 like concat('%', #{spare3}, '%')</if>
<if test="spare4 != null and spare4 != ''"> and spare4 like concat('%', #{spare4}, '%')</if>
<if test="spare5 != null and spare5 != ''"> and spare5 like concat('%', #{spare5}, '%')</if>
<if test="spare6 != null and spare6 != ''"> and spare6 like concat('%', #{spare6}, '%')</if>
</where>
</select>
@@ -129,4 +129,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{id}
</foreach>
</delete>
</mapper>
</mapper>

10
ruoyi-admin/src/main/resources/mapper/bas/BasProductPortMapper.xml
View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8" ?>
<?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">
@@ -21,9 +21,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<include refid="selectBasProductPortVo"/>
<where>
<if test="portName != null and portName != ''"> and port_name like concat('%', #{portName}, '%')</if>
<if test="portType != null and portType != ''"> and port_type = #{portType}</if>
<if test="portDesc != null and portDesc != ''"> and port_desc = #{portDesc}</if>
<if test="createMan != null and createMan != ''"> and create_man = #{createMan}</if>
<if test="portType != null and portType != ''"> and port_type like concat('%', #{portType}, '%')</if>
<if test="portDesc != null and portDesc != ''"> and port_desc like concat('%', #{portDesc}, '%')</if>
<if test="createMan != null and createMan != ''"> and create_man like concat('%', #{createMan}, '%')</if>
</where>
</select>
@@ -74,4 +74,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{id}
</foreach>
</delete>
</mapper>
</mapper>

11
ruoyi-admin/src/main/resources/mapper/bas/BasProductPortRelMapper.xml
View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8" ?>
<?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">
@@ -43,9 +43,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectBasProductPortRelList" parameterType="BasProductPortRel" resultMap="BasProductPortRelResult">
<include refid="selectBasProductPortRelVo"/>
<where>
<if test="productGuid != null and productGuid != ''"> and product_guid = #{productGuid}</if>
<if test="productId != null and productId != ''"> and product_id = #{productId}</if>
<if test="portId != null and portId != ''"> and port_id = #{portId}</if>
<if test="productGuid != null and productGuid != ''"> and product_guid like concat('%', #{productGuid}, '%')</if>
<if test="productId != null and productId != ''"> and product_id like concat('%', #{productId}, '%')</if>
<if test="portId != null and portId != ''"> and port_id like concat('%', #{portId}, '%')</if>
</where>
</select>
@@ -63,7 +63,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="bindStatus =='0'.toString()">
and product_id not in (select product_id from bas_product_port_rel where port_id=#{portId})
</if>
<if test="productId != null and productId != ''"> and product_id = #{productId}</if>
<if test="productId != null and productId != ''"> and product_id like concat('%', #{productId}, '%')</if>
<if test="productName != null and productName != ''"> and product_name like concat('%', #{productName}, '%')</if>
</where>
@@ -112,3 +112,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</foreach>
</delete>
</mapper>

18
ruoyi-admin/src/main/resources/mapper/bas/BasRoadwayMapper.xml
View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8" ?>
<?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">
@@ -23,14 +23,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectBasRoadwayList" parameterType="BasRoadway" resultMap="BasRoadwayResult">
<include refid="selectBasRoadwayVo"/>
<where>
<if test="roadwayId != null and roadwayId != ''"> and roadway_id = #{roadwayId}</if>
<if test="warehouseId != null and warehouseId != ''"> and warehouse_id = #{warehouseId}</if>
<if test="roadwayId != null and roadwayId != ''"> and roadway_id like concat('%', #{roadwayId}, '%')</if>
<if test="warehouseId != null and warehouseId != ''"> and warehouse_id like concat('%', #{warehouseId}, '%')</if>
<if test="roadwayName != null and roadwayName != ''"> and roadway_name like concat('%', #{roadwayName}, '%')</if>
<if test="deviceId != null and deviceId != ''"> and device_id = #{deviceId}</if>
<if test="inLocked != null and inLocked != ''"> and in_locked = #{inLocked}</if>
<if test="outLocked != null and outLocked != ''"> and out_locked = #{outLocked}</if>
<if test="inLocked2 != null and inLocked2 != ''"> and in_locked2 = #{inLocked2}</if>
<if test="outLocked2 != null and outLocked2 != ''"> and out_locked2 = #{outLocked2}</if>
<if test="deviceId != null and deviceId != ''"> and device_id like concat('%', #{deviceId}, '%')</if>
<if test="inLocked != null and inLocked != ''"> and in_locked like concat('%', #{inLocked}, '%')</if>
<if test="outLocked != null and outLocked != ''"> and out_locked like concat('%', #{outLocked}, '%')</if>
<if test="inLocked2 != null and inLocked2 != ''"> and in_locked2 like concat('%', #{inLocked2}, '%')</if>
<if test="outLocked2 != null and outLocked2 != ''"> and out_locked2 like concat('%', #{outLocked2}, '%')</if>
</where>
</select>
@@ -90,4 +90,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{id}
</foreach>
</delete>
</mapper>
</mapper>

6
ruoyi-admin/src/main/resources/mapper/bas/BasSupplierMapper.xml
View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8" ?>
<?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">
@@ -37,7 +37,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="supplierGroupNo != null and supplierGroupNo != ''"> and supplier_group_no like concat('%', #{supplierGroupNo}, '%')</if>
<if test="supplierName != null and supplierName != ''"> and supplier_name like concat('%', #{supplierName}, '%')</if>
<if test="simpleName != null and simpleName != ''"> and simple_name like concat('%', #{simpleName}, '%')</if>
<if test="useable != null and useable != ''"> and useable = #{useable}</if>
<if test="useable != null and useable != ''"> and useable like concat('%', #{useable}, '%')</if>
<if test="supplierArae != null and supplierArae != ''"> and supplier_arae like concat('%', #{supplierArae}, '%')</if>
<if test="taxpayerRegistrationNumber != null and taxpayerRegistrationNumber != ''"> and taxpayer_registration_number like concat('%', #{taxpayerRegistrationNumber}, '%')</if>
<if test="country != null and country != ''"> and country like concat('%', #{country}, '%')</if>
@@ -139,4 +139,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{id}
</foreach>
</delete>
</mapper>
</mapper>

19
ruoyi-admin/src/main/resources/mapper/bas/BasTagMapper.xml
View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8" ?>
<?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">
@@ -23,14 +23,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectBasTagList" parameterType="BasTag" resultMap="BasTagResult">
<include refid="selectBasTagVo"/>
<where>
<if test="ip != null and ip != ''"> and ip = #{ip}</if>
<if test="pickAdd != null and pickAdd != ''"> and pick_add = #{pickAdd}</if>
<if test="trayCode != null and trayCode != ''"> and tray_code = #{trayCode}</if>
<if test="curNum != null and curNum != ''"> and cur_num = #{curNum}</if>
<if test="sendCompleted != null and sendCompleted != ''"> and send_completed = #{sendCompleted}</if>
<if test="spare1 != null and spare1 != ''"> and spare1 = #{spare1}</if>
<if test="spare2 != null and spare2 != ''"> and spare2 = #{spare2}</if>
<if test="spare3 != null and spare3 != ''"> and spare3 = #{spare3}</if>
<if test="ip != null and ip != ''"> and ip like concat('%', #{ip}, '%')</if>
<if test="pickAdd != null and pickAdd != ''"> and pick_add like concat('%', #{pickAdd}, '%')</if>
<if test="trayCode != null and trayCode != ''"> and tray_code like concat('%', #{trayCode}, '%')</if>
<if test="curNum != null and curNum != ''"> and cur_num like concat('%', #{curNum}, '%')</if>
<if test="sendCompleted != null and sendCompleted != ''"> and send_completed like concat('%', #{sendCompleted}, '%')</if>
<if test="spare1 != null and spare1 != ''"> and spare1 like concat('%', #{spare1}, '%')</if>
<if test="spare2 != null and spare2 != ''"> and spare2 like concat('%', #{spare2}, '%')</if>
<if test="spare3 != null and spare3 != ''"> and spare3 like concat('%', #{spare3}, '%')</if>
</where>
</select>
@@ -93,3 +93,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</foreach>
</delete>
</mapper>

10
ruoyi-admin/src/main/resources/mapper/bas/BasTraycodeFormatMapper.xml
View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8" ?>
<?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">
@@ -32,9 +32,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="remarks != null and remarks != ''"> and remarks like concat('%',#{remarks}, '%')</if>
<if test="minNum != null "> and min_num like concat('%',#{minNum}, '%')</if>
<if test="maxNum != null "> and max_num like concat('%',#{maxNum}, '%')</if>
<if test="spare1 != null and spare1 != ''"> and spare1 = #{spare1}</if>
<if test="spare2 != null and spare2 != ''"> and spare2 = #{spare2}</if>
<if test="spare3 != null and spare3 != ''"> and spare3 = #{spare3}</if>
<if test="spare1 != null and spare1 != ''"> and spare1 like concat('%', #{spare1}, '%')</if>
<if test="spare2 != null and spare2 != ''"> and spare2 like concat('%', #{spare2}, '%')</if>
<if test="spare3 != null and spare3 != ''"> and spare3 like concat('%', #{spare3}, '%')</if>
</where>
</select>
@@ -103,4 +103,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{id}
</foreach>
</delete>
</mapper>
</mapper>

11
ruoyi-admin/src/main/resources/mapper/bas/BasTraycodeMapper.xml
View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8" ?>
<?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">
@@ -26,11 +26,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectBasTraycodeList" parameterType="BasTraycode" resultMap="BasTraycodeResult">
<include refid="selectBasTraycodeVo"/>
<where>
<if test="formatId != null "> and bt.format_id = #{formatId}</if>
<if test="formatId != null "> and bt.format_id like concat('%', #{formatId}, '%')</if>
<if test="trayCode != null and trayCode != ''"> and bt.tray_code like concat('%',#{trayCode}, '%')</if>
<if test="spare1 != null and spare1 != ''"> and bt.spare1 = #{spare1}</if>
<if test="spare2 != null and spare2 != ''"> and bt.spare2 = #{spare2}</if>
<if test="spare3 != null and spare3 != ''"> and bt.spare3 = #{spare3}</if>
<if test="spare1 != null and spare1 != ''"> and bt.spare1 like concat('%', #{spare1}, '%')</if>
<if test="spare2 != null and spare2 != ''"> and bt.spare2 like concat('%', #{spare2}, '%')</if>
<if test="spare3 != null and spare3 != ''"> and bt.spare3 like concat('%', #{spare3}, '%')</if>
</where>
</select>
@@ -98,3 +98,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</foreach>
</delete>
</mapper>

10
ruoyi-admin/src/main/resources/mapper/bas/BasWarehousePortMapper.xml
View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8" ?>
<?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">
@@ -19,10 +19,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectBasWarehousePortList" parameterType="BasWarehousePort" resultMap="BasWarehousePortResult">
<include refid="selectBasWarehousePortVo"/>
<where>
<if test="warehouseId != null and warehouseId != ''"> and warehouse_id = #{warehouseId}</if>
<if test="portCode != null and portCode != ''"> and port_code = #{portCode}</if>
<if test="warehouseId != null and warehouseId != ''"> and warehouse_id like concat('%', #{warehouseId}, '%')</if>
<if test="portCode != null and portCode != ''"> and port_code like concat('%', #{portCode}, '%')</if>
<if test="portName != null and portName != ''"> and port_name like concat('%', #{portName}, '%')</if>
<if test="portType != null and portType != ''"> and port_type = #{portType}</if>
<if test="portType != null and portType != ''"> and port_type like concat('%', #{portType}, '%')</if>
</where>
</select>
@@ -70,4 +70,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{id}
</foreach>
</delete>
</mapper>
</mapper>

53
ruoyi-admin/src/main/resources/mapper/bas/cargoSpace/BasCargoSpaceMapper.xml
View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8" ?>
<?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">
@@ -63,24 +63,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<include refid="selectBasCargoSpaceVo"/>
<where>
<if test="cargoSpaceId != null and cargoSpaceId != ''"> and bcs.cargo_space_id like concat('%', #{cargoSpaceId}, '%')</if>
<if test="warehouseId != null and warehouseId != ''"> and bcs.warehouse_id = #{warehouseId}</if>
<if test="roadwayId != null and roadwayId != ''"> and bcs.roadway_id = #{roadwayId}</if>
<if test="cargoAreaId != null and cargoAreaId != ''"> and bcs.cargo_area_id = #{cargoAreaId}</if>
<if test="theType != null and theType != ''"> and bcs.the_type = #{theType}</if>
<if test="warehouseId != null and warehouseId != ''"> and bcs.warehouse_id like concat('%', #{warehouseId}, '%')</if>
<if test="roadwayId != null and roadwayId != ''"> and bcs.roadway_id like concat('%', #{roadwayId}, '%')</if>
<if test="cargoAreaId != null and cargoAreaId != ''"> and bcs.cargo_area_id like concat('%', #{cargoAreaId}, '%')</if>
<if test="theType != null and theType != ''"> and bcs.the_type like concat('%', #{theType}, '%')</if>
<if test="theTypeName != null and theTypeName != ''"> and bcs.the_type_name like concat('%', #{theTypeName}, '%')</if>
<if test="cargoSpaceName != null and cargoSpaceName != ''"> and bcs.cargo_space_name like concat('%', #{cargoSpaceName}, '%')</if>
<if test="thePlatoon != null "> and bcs.the_platoon = #{thePlatoon}</if>
<if test="theColumn != null "> and bcs.the_column = #{theColumn}</if>
<if test="theFloor != null "> and bcs.the_floor = #{theFloor}</if>
<if test="status != null and status != ''"> and bcs.status = #{status}</if>
<if test="locked != null and locked != ''"> and bcs.locked = #{locked}</if>
<if test="thePlatoon != null "> and bcs.the_platoon like concat('%', #{thePlatoon}, '%')</if>
<if test="theColumn != null "> and bcs.the_column like concat('%', #{theColumn}, '%')</if>
<if test="theFloor != null "> and bcs.the_floor like concat('%', #{theFloor}, '%')</if>
<if test="status != null and status != ''"> and bcs.status like concat('%', #{status}, '%')</if>
<if test="locked != null and locked != ''"> and bcs.locked like concat('%', #{locked}, '%')</if>
<if test="trayCode != null and trayCode != ''"> and bcs.tray_code like concat('%', #{trayCode}, '%')</if>
<if test="cargoHight != null and cargoHight != ''"> and bcs.cargo_hight = #{cargoHight}</if>
<if test="issDouble != null and issDouble != ''"> and bcs.iss_double = #{issDouble}</if>
<if test="groupCodingNo != null and groupCodingNo != ''"> and bcs.group_coding_no = #{groupCodingNo}</if>
<if test="groupCoding != null and groupCoding != ''"> and bcs.group_coding = #{groupCoding}</if>
<if test="cargoSpaceLogo != null and cargoSpaceLogo != ''"> and bcs.cargo_space_logo = #{cargoSpaceLogo}</if>
<if test="thisCargoArea != null and thisCargoArea != ''"> and bcs.this_cargo_area = #{thisCargoArea}</if>
<if test="cargoHight != null and cargoHight != ''"> and bcs.cargo_hight like concat('%', #{cargoHight}, '%')</if>
<if test="issDouble != null and issDouble != ''"> and bcs.iss_double like concat('%', #{issDouble}, '%')</if>
<if test="groupCodingNo != null and groupCodingNo != ''"> and bcs.group_coding_no like concat('%', #{groupCodingNo}, '%')</if>
<if test="groupCoding != null and groupCoding != ''"> and bcs.group_coding like concat('%', #{groupCoding}, '%')</if>
<if test="cargoSpaceLogo != null and cargoSpaceLogo != ''"> and bcs.cargo_space_logo like concat('%', #{cargoSpaceLogo}, '%')</if>
<if test="thisCargoArea != null and thisCargoArea != ''"> and bcs.this_cargo_area like concat('%', #{thisCargoArea}, '%')</if>
<if test="params.warehouseDataScope != null and params.warehouseDataScope !=''">
${params.warehouseDataScope}
</if>
@@ -188,10 +188,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
WHERE status = '1'
and locked = 'N'
<if test="warehouseId != null">
and warehouse_id = #{warehouseId}
and warehouse_id like concat('%', #{warehouseId}, '%')
</if>
<if test="roadwayId != null">
and roadway_id = #{roadwayId}
and roadway_id like concat('%', #{roadwayId}, '%')
</if>
ORDER BY the_platoon, the_floor,the_column
</select>
@@ -219,18 +219,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and br.roadway_id = bcs.roadway_id
and bp.product_id = bs.product_id
and br.out_locked = 'N'
<if test="warehouseId != null and warehouseId != ''"> and bcs.warehouse_id = #{warehouseId}</if>
<if test="roadwayId != null and roadwayId != ''"> and bcs.roadway_id = #{roadwayId}</if>
<if test="warehouseId != null and warehouseId != ''"> and bcs.warehouse_id like concat('%', #{warehouseId}, '%')</if>
<if test="roadwayId != null and roadwayId != ''"> and bcs.roadway_id like concat('%', #{roadwayId}, '%')</if>
<if test="cargoSpaceName != null and cargoSpaceName != ''"> and bcs.cargo_space_name like concat('%', #{cargoSpaceName}, '%')</if>
<if test="thePlatoon != null "> and bcs.the_platoon = #{thePlatoon}</if>
<if test="theColumn != null "> and bcs.the_column = #{theColumn}</if>
<if test="theFloor != null "> and bcs.the_floor = #{theFloor}</if>
<if test="status != null and status != ''"> and bcs.status = #{status}</if>
<if test="locked != null and locked != ''"> and bcs.locked = #{locked}</if>
<if test="thePlatoon != null "> and bcs.the_platoon like concat('%', #{thePlatoon}, '%')</if>
<if test="theColumn != null "> and bcs.the_column like concat('%', #{theColumn}, '%')</if>
<if test="theFloor != null "> and bcs.the_floor like concat('%', #{theFloor}, '%')</if>
<if test="status != null and status != ''"> and bcs.status like concat('%', #{status}, '%')</if>
<if test="locked != null and locked != ''"> and bcs.locked like concat('%', #{locked}, '%')</if>
<if test="trayCode != null and trayCode != ''"> and bs.tray_code like concat('%', #{trayCode}, '%')</if>
<if test="spare7 != null and spare7 != ''"> and bs.spare7 = #{spare7}</if>
<if test="spare7 != null and spare7 != ''"> and bs.spare7 like concat('%', #{spare7}, '%')</if>
<if test="spare6 != null and spare6 != ''"> and bs.spare6 like concat('%', #{spare6}, '%')</if>
<if test="productId != null and productId != ''"> and bs.product_id like concat('%', #{productId}, '%')</if>
<if test="productName != null and productName != ''"> and bp.product_name like concat('%', #{productName}, '%')</if>
</select>
</mapper>

13
ruoyi-admin/src/main/resources/mapper/bas/warehouse/BasWarehouseMapper.xml
View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8" ?>
<?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">
@@ -29,11 +29,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="warehouseName != null and warehouseName != ''">and warehouse_name like concat('%',
#{warehouseName}, '%')
</if>
<if test="address != null and address != ''">and address = #{address}</if>
<if test="cDesc != null and cDesc != ''">and c_desc = #{cDesc}</if>
<if test="warehouseKind != null and warehouseKind != ''">and warehouse_kind = #{warehouseKind}</if>
<if test="warehouseType != null and warehouseType != ''">and warehouse_type = #{warehouseType}</if>
<if test="isCurrent != null and isCurrent != ''">and is_current = #{isCurrent}</if>
<if test="address != null and address != ''">and address like concat('%', #{address}, '%')</if>
<if test="cDesc != null and cDesc != ''">and c_desc like concat('%', #{cDesc}, '%')</if>
<if test="warehouseKind != null and warehouseKind != ''">and warehouse_kind like concat('%', #{warehouseKind}, '%')</if>
<if test="warehouseType != null and warehouseType != ''">and warehouse_type like concat('%', #{warehouseType}, '%')</if>
<if test="isCurrent != null and isCurrent != ''">and is_current like concat('%', #{isCurrent}, '%')</if>
<if test="dataScope !=null and dataScope.size()>0">
and warehouse_id in
<foreach item="item" index="index" collection="dataScope" open="(" separator="," close=")">
@@ -111,3 +111,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</mapper>

18
ruoyi-admin/src/main/resources/mapper/check/CheckCommitRecordMapper.xml
View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8" ?>
<?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">
@@ -21,13 +21,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectCheckCommitRecordList" parameterType="CheckCommitRecord" resultMap="CheckCommitRecordResult">
<include refid="selectCheckCommitRecordVo"/>
<where>
<if test="pdGuid != null "> and pd_guid = #{pdGuid}</if>
<if test="trayCode != null and trayCode != ''"> and tray_code = #{trayCode}</if>
<if test="stockId != null and stockId != ''"> and stock_id = #{stockId}</if>
<if test="quantity != null and quantity != ''"> and quantity = #{quantity}</if>
<if test="spare1 != null and spare1 != ''"> and spare1 = #{spare1}</if>
<if test="spare2 != null and spare2 != ''"> and spare2 = #{spare2}</if>
<if test="spare3 != null and spare3 != ''"> and spare3 = #{spare3}</if>
<if test="pdGuid != null "> and pd_guid like concat('%', #{pdGuid}, '%')</if>
<if test="trayCode != null and trayCode != ''"> and tray_code like concat('%', #{trayCode}, '%')</if>
<if test="stockId != null and stockId != ''"> and stock_id like concat('%', #{stockId}, '%')</if>
<if test="quantity != null and quantity != ''"> and quantity like concat('%', #{quantity}, '%')</if>
<if test="spare1 != null and spare1 != ''"> and spare1 like concat('%', #{spare1}, '%')</if>
<if test="spare2 != null and spare2 != ''"> and spare2 like concat('%', #{spare2}, '%')</if>
<if test="spare3 != null and spare3 != ''"> and spare3 like concat('%', #{spare3}, '%')</if>
</where>
</select>
@@ -79,4 +79,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{pdGuid}
</foreach>
</delete>
</mapper>
</mapper>

31
ruoyi-admin/src/main/resources/mapper/check/CheckDifferenceRecordFinishMapper.xml
View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8" ?>
<?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">
@@ -72,46 +72,46 @@
<include refid="selectCheckDifferenceRecordVo"/>
<where>
<if test="checkStockDetailId != null and checkStockDetailId != ''">
and r.check_stock_detail_id = #{checkStockDetailId}
and r.check_stock_detail_id like concat('%', #{checkStockDetailId}, '%')
</if>
<if test="stockId != null and stockId != ''">
and r.stock_id = #{stockId}
and r.stock_id like concat('%', #{stockId}, '%')
</if>
<if test="trayCode != null and trayCode != ''">
and r.tray_code = #{trayCode}
and r.tray_code like concat('%', #{trayCode}, '%')
</if>
<if test="cargoSpaceId != null and cargoSpaceId != ''">
and r.cargo_space_id = #{cargoSpaceId}
and r.cargo_space_id like concat('%', #{cargoSpaceId}, '%')
</if>
<if test="productId != null and productId != ''">
and r.product_id = #{productId}
and r.product_id like concat('%', #{productId}, '%')
</if>
<if test="lotNo != null and lotNo != ''">
and r.lot_no = #{lotNo}
and r.lot_no like concat('%', #{lotNo}, '%')
</if>
<if test="supplier != null and supplier != ''">
and r.supplier = #{supplier}
and r.supplier like concat('%', #{supplier}, '%')
</if>
<if test="customer != null and customer != ''">
and r.customer = #{customer}
and r.customer like concat('%', #{customer}, '%')
</if>
<if test="oldQuantity != null and oldQuantity != ''">
and r.old_quantity = #{oldQuantity}
and r.old_quantity like concat('%', #{oldQuantity}, '%')
</if>
<if test="newQuantity != null and newQuantity != ''">
and r.new_quantity = #{newQuantity}
and r.new_quantity like concat('%', #{newQuantity}, '%')
</if>
<if test="recordType != null ">
and r.record_type = #{recordType}
and r.record_type like concat('%', #{recordType}, '%')
</if>
<if test="productGuid != null and productGuid != ''">
and r.product_guid = #{productGuid}
and r.product_guid like concat('%', #{productGuid}, '%')
</if>
<if test="status != null and status != ''">
and r.status = #{status}
and r.status like concat('%', #{status}, '%')
</if>
<if test="warehouseId != null and warehouseId != ''">
and r.warehouse_id = #{warehouseId}
and r.warehouse_id like concat('%', #{warehouseId}, '%')
</if>
<if test="params.warehouseDataScope != null and params.warehouseDataScope !=''">
${params.warehouseDataScope}
@@ -200,3 +200,4 @@
</foreach>
</delete>
</mapper>

31
ruoyi-admin/src/main/resources/mapper/check/CheckDifferenceRecordMapper.xml
View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8" ?>
<?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">
@@ -72,46 +72,46 @@
<include refid="selectCheckDifferenceRecordVo"/>
<where>
<if test="checkStockDetailId != null and checkStockDetailId != ''">
and r.check_stock_detail_id = #{checkStockDetailId}
and r.check_stock_detail_id like concat('%', #{checkStockDetailId}, '%')
</if>
<if test="stockId != null and stockId != ''">
and r.stock_id = #{stockId}
and r.stock_id like concat('%', #{stockId}, '%')
</if>
<if test="trayCode != null and trayCode != ''">
and r.tray_code = #{trayCode}
and r.tray_code like concat('%', #{trayCode}, '%')
</if>
<if test="cargoSpaceId != null and cargoSpaceId != ''">
and r.cargo_space_id = #{cargoSpaceId}
and r.cargo_space_id like concat('%', #{cargoSpaceId}, '%')
</if>
<if test="productId != null and productId != ''">
and r.product_id = #{productId}
and r.product_id like concat('%', #{productId}, '%')
</if>
<if test="lotNo != null and lotNo != ''">
and r.lot_no = #{lotNo}
and r.lot_no like concat('%', #{lotNo}, '%')
</if>
<if test="supplier != null and supplier != ''">
and r.supplier = #{supplier}
and r.supplier like concat('%', #{supplier}, '%')
</if>
<if test="customer != null and customer != ''">
and r.customer = #{customer}
and r.customer like concat('%', #{customer}, '%')
</if>
<if test="oldQuantity != null and oldQuantity != ''">
and r.old_quantity = #{oldQuantity}
and r.old_quantity like concat('%', #{oldQuantity}, '%')
</if>
<if test="newQuantity != null and newQuantity != ''">
and r.new_quantity = #{newQuantity}
and r.new_quantity like concat('%', #{newQuantity}, '%')
</if>
<if test="recordType != null ">
and r.record_type = #{recordType}
and r.record_type like concat('%', #{recordType}, '%')
</if>
<if test="productGuid != null and productGuid != ''">
and r.product_guid = #{productGuid}
and r.product_guid like concat('%', #{productGuid}, '%')
</if>
<if test="status != null and status != ''">
and r.status = #{status}
and r.status like concat('%', #{status}, '%')
</if>
<if test="warehouseId != null and warehouseId != ''">
and r.warehouse_id = #{warehouseId}
and r.warehouse_id like concat('%', #{warehouseId}, '%')
</if>
<if test="params.warehouseDataScope != null and params.warehouseDataScope !=''">
${params.warehouseDataScope}
@@ -200,3 +200,4 @@
</foreach>
</delete>
</mapper>

115
ruoyi-admin/src/main/resources/mapper/check/CheckStockinDetailFinishMapper.xml
View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8" ?>
<?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">
@@ -98,34 +98,34 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectCheckStockinDetailFinishList" parameterType="CheckStockinDetailFinish" resultMap="CheckStockinDetailFinishResult">
<include refid="selectCheckStockinDetailFinishVo"/>
<where>
<if test="stockCheckGuid != null and stockCheckGuid != ''"> and stock_check_guid = #{stockCheckGuid}</if>
<if test="stockCheckId != null and stockCheckId != ''"> and stock_check_id = #{stockCheckId}</if>
<if test="lotNo != null and lotNo != ''"> and lot_no = #{lotNo}</if>
<if test="productGuid != null and productGuid != ''"> and product_guid = #{productGuid}</if>
<if test="productId != null and productId != ''"> and product_id = #{productId}</if>
<if test="quantity != null and quantity != ''"> and quantity = #{quantity}</if>
<if test="quantityX != null and quantityX != ''"> and quantity_x = #{quantityX}</if>
<if test="quantityJ != null and quantityJ != ''"> and quantity_j = #{quantityJ}</if>
<if test="price != null and price != ''"> and price = #{price}</if>
<if test="cargoNo != null and cargoNo != ''"> and cargo_no = #{cargoNo}</if>
<if test="assignNum != null and assignNum != ''"> and assign_num = #{assignNum}</if>
<if test="assignNumX != null and assignNumX != ''"> and assign_num_x = #{assignNumX}</if>
<if test="assignNumJ != null and assignNumJ != ''"> and assign_num_j = #{assignNumJ}</if>
<if test="printDate != null and printDate != ''"> and print_date = #{printDate}</if>
<if test="stockStatus != null and stockStatus != ''"> and stock_status = #{stockStatus}</if>
<if test="supplierId != null and supplierId != ''"> and supplier_id = #{supplierId}</if>
<if test="customerId != null and customerId != ''"> and customer_id = #{customerId}</if>
<if test="unit != null and unit != ''"> and unit = #{unit}</if>
<if test="spec != null and spec != ''"> and spec = #{spec}</if>
<if test="spare1 != null and spare1 != ''"> and spare1 = #{spare1}</if>
<if test="spare2 != null and spare2 != ''"> and spare2 = #{spare2}</if>
<if test="spare3 != null and spare3 != ''"> and spare3 = #{spare3}</if>
<if test="spare4 != null and spare4 != ''"> and spare4 = #{spare4}</if>
<if test="spare5 != null and spare5 != ''"> and spare5 = #{spare5}</if>
<if test="spare6 != null and spare6 != ''"> and spare6 = #{spare6}</if>
<if test="scanNum != null and scanNum != ''"> and scan_num = #{scanNum}</if>
<if test="scanNumX != null and scanNumX != ''"> and scan_num_x = #{scanNumX}</if>
<if test="scanNumJ != null and scanNumJ != ''"> and scan_num_j = #{scanNumJ}</if>
<if test="stockCheckGuid != null and stockCheckGuid != ''"> and stock_check_guid like concat('%', #{stockCheckGuid}, '%')</if>
<if test="stockCheckId != null and stockCheckId != ''"> and stock_check_id like concat('%', #{stockCheckId}, '%')</if>
<if test="lotNo != null and lotNo != ''"> and lot_no like concat('%', #{lotNo}, '%')</if>
<if test="productGuid != null and productGuid != ''"> and product_guid like concat('%', #{productGuid}, '%')</if>
<if test="productId != null and productId != ''"> and product_id like concat('%', #{productId}, '%')</if>
<if test="quantity != null and quantity != ''"> and quantity like concat('%', #{quantity}, '%')</if>
<if test="quantityX != null and quantityX != ''"> and quantity_x like concat('%', #{quantityX}, '%')</if>
<if test="quantityJ != null and quantityJ != ''"> and quantity_j like concat('%', #{quantityJ}, '%')</if>
<if test="price != null and price != ''"> and price like concat('%', #{price}, '%')</if>
<if test="cargoNo != null and cargoNo != ''"> and cargo_no like concat('%', #{cargoNo}, '%')</if>
<if test="assignNum != null and assignNum != ''"> and assign_num like concat('%', #{assignNum}, '%')</if>
<if test="assignNumX != null and assignNumX != ''"> and assign_num_x like concat('%', #{assignNumX}, '%')</if>
<if test="assignNumJ != null and assignNumJ != ''"> and assign_num_j like concat('%', #{assignNumJ}, '%')</if>
<if test="printDate != null and printDate != ''"> and print_date like concat('%', #{printDate}, '%')</if>
<if test="stockStatus != null and stockStatus != ''"> and stock_status like concat('%', #{stockStatus}, '%')</if>
<if test="supplierId != null and supplierId != ''"> and supplier_id like concat('%', #{supplierId}, '%')</if>
<if test="customerId != null and customerId != ''"> and customer_id like concat('%', #{customerId}, '%')</if>
<if test="unit != null and unit != ''"> and unit like concat('%', #{unit}, '%')</if>
<if test="spec != null and spec != ''"> and spec like concat('%', #{spec}, '%')</if>
<if test="spare1 != null and spare1 != ''"> and spare1 like concat('%', #{spare1}, '%')</if>
<if test="spare2 != null and spare2 != ''"> and spare2 like concat('%', #{spare2}, '%')</if>
<if test="spare3 != null and spare3 != ''"> and spare3 like concat('%', #{spare3}, '%')</if>
<if test="spare4 != null and spare4 != ''"> and spare4 like concat('%', #{spare4}, '%')</if>
<if test="spare5 != null and spare5 != ''"> and spare5 like concat('%', #{spare5}, '%')</if>
<if test="spare6 != null and spare6 != ''"> and spare6 like concat('%', #{spare6}, '%')</if>
<if test="scanNum != null and scanNum != ''"> and scan_num like concat('%', #{scanNum}, '%')</if>
<if test="scanNumX != null and scanNumX != ''"> and scan_num_x like concat('%', #{scanNumX}, '%')</if>
<if test="scanNumJ != null and scanNumJ != ''"> and scan_num_j like concat('%', #{scanNumJ}, '%')</if>
</where>
</select>
@@ -137,34 +137,34 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
resultMap="CheckStockinDetailResult">
<include refid="selectCheckStockinDetailVo"/>
<where>
<if test="stockCheckGuid != null and stockCheckGuid != ''"> and csd.stock_check_guid = #{stockCheckGuid}</if>
<if test="stockCheckId != null and stockCheckId != ''"> and csd.stock_check_id = #{stockCheckId}</if>
<if test="lotNo != null and lotNo != ''"> and csd.lot_no = #{lotNo}</if>
<if test="productGuid != null and productGuid != ''"> and csd.product_guid = #{productGuid}</if>
<if test="productId != null and productId != ''"> and csd.product_id = #{productId}</if>
<if test="quantity != null and quantity != ''"> and csd.quantity = #{quantity}</if>
<if test="quantityX != null and quantityX != ''"> and csd.quantity_x = #{quantityX}</if>
<if test="quantityJ != null and quantityJ != ''"> and csd.quantity_j = #{quantityJ}</if>
<if test="price != null and price != ''"> and csd.price = #{price}</if>
<if test="cargoNo != null and cargoNo != ''"> and csd.cargo_no = #{cargoNo}</if>
<if test="assignNum != null and assignNum != ''"> and csd.assign_num = #{assignNum}</if>
<if test="assignNumX != null and assignNumX != ''"> and csd.assign_num_x = #{assignNumX}</if>
<if test="assignNumJ != null and assignNumJ != ''"> and csd.assign_num_j = #{assignNumJ}</if>
<if test="printDate != null and printDate != ''"> and csd.print_date = #{printDate}</if>
<if test="stockStatus != null and stockStatus != ''"> and csd.stock_status = #{stockStatus}</if>
<if test="supplierId != null and supplierId != ''"> and csd.supplier_id = #{supplierId}</if>
<if test="customerId != null and customerId != ''"> and csd.customer_id = #{customerId}</if>
<if test="unit != null and unit != ''"> and csd.unit = #{unit}</if>
<if test="spec != null and spec != ''"> and csd.spec = #{spec}</if>
<if test="scanNum != null and scanNum != ''"> and csd.scan_num = #{scanNum}</if>
<if test="scanNumX != null and scanNumX != ''"> and csd.scan_num_x = #{scanNumX}</if>
<if test="scanNumJ != null and scanNumJ != ''"> and csd.scan_num_j = #{scanNumJ}</if>
<if test="spare1 != null and spare1 != ''"> and csd.spare1 = #{spare1}</if>
<if test="spare2 != null and spare2 != ''"> and csd.spare2 = #{spare2}</if>
<if test="spare3 != null and spare3 != ''"> and csd.spare3 = #{spare3}</if>
<if test="spare4 != null and spare4 != ''"> and csd.spare4 = #{spare4}</if>
<if test="spare5 != null and spare5 != ''"> and csd.spare5 = #{spare5}</if>
<if test="spare6 != null and spare6 != ''"> and csd.spare6 = #{spare6}</if>
<if test="stockCheckGuid != null and stockCheckGuid != ''"> and csd.stock_check_guid like concat('%', #{stockCheckGuid}, '%')</if>
<if test="stockCheckId != null and stockCheckId != ''"> and csd.stock_check_id like concat('%', #{stockCheckId}, '%')</if>
<if test="lotNo != null and lotNo != ''"> and csd.lot_no like concat('%', #{lotNo}, '%')</if>
<if test="productGuid != null and productGuid != ''"> and csd.product_guid like concat('%', #{productGuid}, '%')</if>
<if test="productId != null and productId != ''"> and csd.product_id like concat('%', #{productId}, '%')</if>
<if test="quantity != null and quantity != ''"> and csd.quantity like concat('%', #{quantity}, '%')</if>
<if test="quantityX != null and quantityX != ''"> and csd.quantity_x like concat('%', #{quantityX}, '%')</if>
<if test="quantityJ != null and quantityJ != ''"> and csd.quantity_j like concat('%', #{quantityJ}, '%')</if>
<if test="price != null and price != ''"> and csd.price like concat('%', #{price}, '%')</if>
<if test="cargoNo != null and cargoNo != ''"> and csd.cargo_no like concat('%', #{cargoNo}, '%')</if>
<if test="assignNum != null and assignNum != ''"> and csd.assign_num like concat('%', #{assignNum}, '%')</if>
<if test="assignNumX != null and assignNumX != ''"> and csd.assign_num_x like concat('%', #{assignNumX}, '%')</if>
<if test="assignNumJ != null and assignNumJ != ''"> and csd.assign_num_j like concat('%', #{assignNumJ}, '%')</if>
<if test="printDate != null and printDate != ''"> and csd.print_date like concat('%', #{printDate}, '%')</if>
<if test="stockStatus != null and stockStatus != ''"> and csd.stock_status like concat('%', #{stockStatus}, '%')</if>
<if test="supplierId != null and supplierId != ''"> and csd.supplier_id like concat('%', #{supplierId}, '%')</if>
<if test="customerId != null and customerId != ''"> and csd.customer_id like concat('%', #{customerId}, '%')</if>
<if test="unit != null and unit != ''"> and csd.unit like concat('%', #{unit}, '%')</if>
<if test="spec != null and spec != ''"> and csd.spec like concat('%', #{spec}, '%')</if>
<if test="scanNum != null and scanNum != ''"> and csd.scan_num like concat('%', #{scanNum}, '%')</if>
<if test="scanNumX != null and scanNumX != ''"> and csd.scan_num_x like concat('%', #{scanNumX}, '%')</if>
<if test="scanNumJ != null and scanNumJ != ''"> and csd.scan_num_j like concat('%', #{scanNumJ}, '%')</if>
<if test="spare1 != null and spare1 != ''"> and csd.spare1 like concat('%', #{spare1}, '%')</if>
<if test="spare2 != null and spare2 != ''"> and csd.spare2 like concat('%', #{spare2}, '%')</if>
<if test="spare3 != null and spare3 != ''"> and csd.spare3 like concat('%', #{spare3}, '%')</if>
<if test="spare4 != null and spare4 != ''"> and csd.spare4 like concat('%', #{spare4}, '%')</if>
<if test="spare5 != null and spare5 != ''"> and csd.spare5 like concat('%', #{spare5}, '%')</if>
<if test="spare6 != null and spare6 != ''"> and csd.spare6 like concat('%', #{spare6}, '%')</if>
</where>
</select>
@@ -283,3 +283,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</foreach>
</delete>
</mapper>

59
ruoyi-admin/src/main/resources/mapper/check/CheckStockinDetailMapper.xml
View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8" ?>
<?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">
@@ -63,34 +63,34 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectCheckStockinDetailList" parameterType="CheckStockinDetail" resultMap="CheckStockinDetailResult">
<include refid="selectCheckStockinDetailVo"/>
<where>
<if test="stockCheckGuid != null and stockCheckGuid != ''"> and csd.stock_check_guid = #{stockCheckGuid}</if>
<if test="stockCheckId != null and stockCheckId != ''"> and csd.stock_check_id = #{stockCheckId}</if>
<if test="lotNo != null and lotNo != ''"> and csd.lot_no = #{lotNo}</if>
<if test="productGuid != null and productGuid != ''"> and csd.product_guid = #{productGuid}</if>
<if test="productId != null and productId != ''"> and csd.product_id = #{productId}</if>
<if test="quantity != null and quantity != ''"> and csd.quantity = #{quantity}</if>
<if test="quantityX != null and quantityX != ''"> and csd.quantity_x = #{quantityX}</if>
<if test="quantityJ != null and quantityJ != ''"> and csd.quantity_j = #{quantityJ}</if>
<if test="price != null and price != ''"> and csd.price = #{price}</if>
<if test="cargoNo != null and cargoNo != ''"> and csd.cargo_no = #{cargoNo}</if>
<if test="assignNum != null and assignNum != ''"> and csd.assign_num = #{assignNum}</if>
<if test="assignNumX != null and assignNumX != ''"> and csd.assign_num_x = #{assignNumX}</if>
<if test="assignNumJ != null and assignNumJ != ''"> and csd.assign_num_j = #{assignNumJ}</if>
<if test="printDate != null and printDate != ''"> and csd.print_date = #{printDate}</if>
<if test="stockStatus != null and stockStatus != ''"> and csd.stock_status = #{stockStatus}</if>
<if test="supplierId != null and supplierId != ''"> and csd.supplier_id = #{supplierId}</if>
<if test="customerId != null and customerId != ''"> and csd.customer_id = #{customerId}</if>
<if test="unit != null and unit != ''"> and csd.unit = #{unit}</if>
<if test="spec != null and spec != ''"> and csd.spec = #{spec}</if>
<if test="scanNum != null and scanNum != ''"> and csd.scan_num = #{scanNum}</if>
<if test="scanNumX != null and scanNumX != ''"> and csd.scan_num_x = #{scanNumX}</if>
<if test="scanNumJ != null and scanNumJ != ''"> and csd.scan_num_j = #{scanNumJ}</if>
<if test="spare1 != null and spare1 != ''"> and csd.spare1 = #{spare1}</if>
<if test="spare2 != null and spare2 != ''"> and csd.spare2 = #{spare2}</if>
<if test="spare3 != null and spare3 != ''"> and csd.spare3 = #{spare3}</if>
<if test="spare4 != null and spare4 != ''"> and csd.spare4 = #{spare4}</if>
<if test="spare5 != null and spare5 != ''"> and csd.spare5 = #{spare5}</if>
<if test="spare6 != null and spare6 != ''"> and csd.spare6 = #{spare6}</if>
<if test="stockCheckGuid != null and stockCheckGuid != ''"> and csd.stock_check_guid like concat('%', #{stockCheckGuid}, '%')</if>
<if test="stockCheckId != null and stockCheckId != ''"> and csd.stock_check_id like concat('%', #{stockCheckId}, '%')</if>
<if test="lotNo != null and lotNo != ''"> and csd.lot_no like concat('%', #{lotNo}, '%')</if>
<if test="productGuid != null and productGuid != ''"> and csd.product_guid like concat('%', #{productGuid}, '%')</if>
<if test="productId != null and productId != ''"> and csd.product_id like concat('%', #{productId}, '%')</if>
<if test="quantity != null and quantity != ''"> and csd.quantity like concat('%', #{quantity}, '%')</if>
<if test="quantityX != null and quantityX != ''"> and csd.quantity_x like concat('%', #{quantityX}, '%')</if>
<if test="quantityJ != null and quantityJ != ''"> and csd.quantity_j like concat('%', #{quantityJ}, '%')</if>
<if test="price != null and price != ''"> and csd.price like concat('%', #{price}, '%')</if>
<if test="cargoNo != null and cargoNo != ''"> and csd.cargo_no like concat('%', #{cargoNo}, '%')</if>
<if test="assignNum != null and assignNum != ''"> and csd.assign_num like concat('%', #{assignNum}, '%')</if>
<if test="assignNumX != null and assignNumX != ''"> and csd.assign_num_x like concat('%', #{assignNumX}, '%')</if>
<if test="assignNumJ != null and assignNumJ != ''"> and csd.assign_num_j like concat('%', #{assignNumJ}, '%')</if>
<if test="printDate != null and printDate != ''"> and csd.print_date like concat('%', #{printDate}, '%')</if>
<if test="stockStatus != null and stockStatus != ''"> and csd.stock_status like concat('%', #{stockStatus}, '%')</if>
<if test="supplierId != null and supplierId != ''"> and csd.supplier_id like concat('%', #{supplierId}, '%')</if>
<if test="customerId != null and customerId != ''"> and csd.customer_id like concat('%', #{customerId}, '%')</if>
<if test="unit != null and unit != ''"> and csd.unit like concat('%', #{unit}, '%')</if>
<if test="spec != null and spec != ''"> and csd.spec like concat('%', #{spec}, '%')</if>
<if test="scanNum != null and scanNum != ''"> and csd.scan_num like concat('%', #{scanNum}, '%')</if>
<if test="scanNumX != null and scanNumX != ''"> and csd.scan_num_x like concat('%', #{scanNumX}, '%')</if>
<if test="scanNumJ != null and scanNumJ != ''"> and csd.scan_num_j like concat('%', #{scanNumJ}, '%')</if>
<if test="spare1 != null and spare1 != ''"> and csd.spare1 like concat('%', #{spare1}, '%')</if>
<if test="spare2 != null and spare2 != ''"> and csd.spare2 like concat('%', #{spare2}, '%')</if>
<if test="spare3 != null and spare3 != ''"> and csd.spare3 like concat('%', #{spare3}, '%')</if>
<if test="spare4 != null and spare4 != ''"> and csd.spare4 like concat('%', #{spare4}, '%')</if>
<if test="spare5 != null and spare5 != ''"> and csd.spare5 like concat('%', #{spare5}, '%')</if>
<if test="spare6 != null and spare6 != ''"> and csd.spare6 like concat('%', #{spare6}, '%')</if>
</where>
</select>
@@ -235,3 +235,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
select * from check_stockin_detail where stock_check_id = #{stockCheckId}
</select>
</mapper>

75
ruoyi-admin/src/main/resources/mapper/check/CheckStockinFinishMapper.xml
View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8" ?>
<?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">
@@ -59,24 +59,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectCheckStockinFinishList" parameterType="CheckStockinFinish" resultMap="CheckStockinFinishResult">
<include refid="selectCheckStockinFinishVo"/>
<where>
<if test="stockCheckId != null and stockCheckId != ''"> and stock_check_id = #{stockCheckId}</if>
<if test="checkType != null and checkType != ''"> and check_type = #{checkType}</if>
<if test="createDate != null and createDate != ''"> and create_date = #{createDate}</if>
<if test="createManId != null and createManId != ''"> and create_man_id = #{createManId}</if>
<if test="status != null and status != ''"> and status = #{status}</if>
<if test="warehouseId != null and warehouseId != ''"> and warehouse_id = #{warehouseId}</if>
<if test="spare5 != null and spare5 != ''"> and spare5 = #{spare5}</if>
<if test="spare4 != null and spare4 != ''"> and spare4 = #{spare4}</if>
<if test="spare3 != null and spare3 != ''"> and spare3 = #{spare3}</if>
<if test="finishDate != null and finishDate != ''"> and finish_date = #{finishDate}</if>
<if test="spare2 != null and spare2 != ''"> and spare2 = #{spare2}</if>
<if test="spare1 != null and spare1 != ''"> and spare1 = #{spare1}</if>
<if test="erpBill != null and erpBill != ''"> and erp_bill = #{erpBill}</if>
<if test="stockSource != null and stockSource != ''"> and stock_source = #{stockSource}</if>
<if test="departmentNo != null and departmentNo != ''"> and department_no = #{departmentNo}</if>
<if test="customerNo != null and customerNo != ''"> and customer_no = #{customerNo}</if>
<if test="classNo != null and classNo != ''"> and class_no = #{classNo}</if>
<if test="supplierNo != null and supplierNo != ''"> and supplier_no = #{supplierNo}</if>
<if test="stockCheckId != null and stockCheckId != ''"> and stock_check_id like concat('%', #{stockCheckId}, '%')</if>
<if test="checkType != null and checkType != ''"> and check_type like concat('%', #{checkType}, '%')</if>
<if test="createDate != null and createDate != ''"> and create_date like concat('%', #{createDate}, '%')</if>
<if test="createManId != null and createManId != ''"> and create_man_id like concat('%', #{createManId}, '%')</if>
<if test="status != null and status != ''"> and status like concat('%', #{status}, '%')</if>
<if test="warehouseId != null and warehouseId != ''"> and warehouse_id like concat('%', #{warehouseId}, '%')</if>
<if test="spare5 != null and spare5 != ''"> and spare5 like concat('%', #{spare5}, '%')</if>
<if test="spare4 != null and spare4 != ''"> and spare4 like concat('%', #{spare4}, '%')</if>
<if test="spare3 != null and spare3 != ''"> and spare3 like concat('%', #{spare3}, '%')</if>
<if test="finishDate != null and finishDate != ''"> and finish_date like concat('%', #{finishDate}, '%')</if>
<if test="spare2 != null and spare2 != ''"> and spare2 like concat('%', #{spare2}, '%')</if>
<if test="spare1 != null and spare1 != ''"> and spare1 like concat('%', #{spare1}, '%')</if>
<if test="erpBill != null and erpBill != ''"> and erp_bill like concat('%', #{erpBill}, '%')</if>
<if test="stockSource != null and stockSource != ''"> and stock_source like concat('%', #{stockSource}, '%')</if>
<if test="departmentNo != null and departmentNo != ''"> and department_no like concat('%', #{departmentNo}, '%')</if>
<if test="customerNo != null and customerNo != ''"> and customer_no like concat('%', #{customerNo}, '%')</if>
<if test="classNo != null and classNo != ''"> and class_no like concat('%', #{classNo}, '%')</if>
<if test="supplierNo != null and supplierNo != ''"> and supplier_no like concat('%', #{supplierNo}, '%')</if>
</where>
</select>
@@ -87,24 +87,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectCheckStockinList" resultMap="CheckStockinResult">
<include refid="selectCheckStockinVo"/>
<where>
<if test="stockCheckId != null and stockCheckId != ''"> and stock_check_id = #{stockCheckId}</if>
<if test="checkType != null and checkType != ''"> and check_type = #{checkType}</if>
<if test="createDate != null and createDate != ''"> and create_date = #{createDate}</if>
<if test="createManId != null and createManId != ''"> and create_man_id = #{createManId}</if>
<if test="status != null and status != ''"> and status = #{status}</if>
<if test="warehouseId != null and warehouseId != ''"> and csf.warehouse_id = #{warehouseId}</if>
<if test="finishDate != null and finishDate != ''"> and finish_date = #{finishDate}</if>
<if test="erpBill != null and erpBill != ''"> and erp_bill = #{erpBill}</if>
<if test="stockSource != null and stockSource != ''"> and stock_source = #{stockSource}</if>
<if test="departmentNo != null and departmentNo != ''"> and department_no = #{departmentNo}</if>
<if test="customerNo != null and customerNo != ''"> and customer_no = #{customerNo}</if>
<if test="classNo != null and classNo != ''"> and class_no = #{classNo}</if>
<if test="supplierNo != null and supplierNo != ''"> and supplier_no = #{supplierNo}</if>
<if test="spare1 != null and spare1 != ''"> and spare1 = #{spare1}</if>
<if test="spare2 != null and spare2 != ''"> and spare2 = #{spare2}</if>
<if test="spare3 != null and spare3 != ''"> and spare3 = #{spare3}</if>
<if test="spare4 != null and spare4 != ''"> and spare4 = #{spare4}</if>
<if test="spare5 != null and spare5 != ''"> and spare5 = #{spare5}</if>
<if test="stockCheckId != null and stockCheckId != ''"> and stock_check_id like concat('%', #{stockCheckId}, '%')</if>
<if test="checkType != null and checkType != ''"> and check_type like concat('%', #{checkType}, '%')</if>
<if test="createDate != null and createDate != ''"> and create_date like concat('%', #{createDate}, '%')</if>
<if test="createManId != null and createManId != ''"> and create_man_id like concat('%', #{createManId}, '%')</if>
<if test="status != null and status != ''"> and status like concat('%', #{status}, '%')</if>
<if test="warehouseId != null and warehouseId != ''"> and csf.warehouse_id like concat('%', #{warehouseId}, '%')</if>
<if test="finishDate != null and finishDate != ''"> and finish_date like concat('%', #{finishDate}, '%')</if>
<if test="erpBill != null and erpBill != ''"> and erp_bill like concat('%', #{erpBill}, '%')</if>
<if test="stockSource != null and stockSource != ''"> and stock_source like concat('%', #{stockSource}, '%')</if>
<if test="departmentNo != null and departmentNo != ''"> and department_no like concat('%', #{departmentNo}, '%')</if>
<if test="customerNo != null and customerNo != ''"> and customer_no like concat('%', #{customerNo}, '%')</if>
<if test="classNo != null and classNo != ''"> and class_no like concat('%', #{classNo}, '%')</if>
<if test="supplierNo != null and supplierNo != ''"> and supplier_no like concat('%', #{supplierNo}, '%')</if>
<if test="spare1 != null and spare1 != ''"> and spare1 like concat('%', #{spare1}, '%')</if>
<if test="spare2 != null and spare2 != ''"> and spare2 like concat('%', #{spare2}, '%')</if>
<if test="spare3 != null and spare3 != ''"> and spare3 like concat('%', #{spare3}, '%')</if>
<if test="spare4 != null and spare4 != ''"> and spare4 like concat('%', #{spare4}, '%')</if>
<if test="spare5 != null and spare5 != ''"> and spare5 like concat('%', #{spare5}, '%')</if>
<if test="params.warehouseDataScope != null and params.warehouseDataScope !=''">
${params.warehouseDataScope}
</if>
@@ -194,3 +194,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</foreach>
</delete>
</mapper>

39
ruoyi-admin/src/main/resources/mapper/check/CheckStockinMapper.xml
View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8" ?>
<?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">
@@ -58,24 +58,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectCheckStockinList" parameterType="CheckStockin" resultMap="CheckStockinResult">
<include refid="selectCheckStockinVo"/>
<where>
<if test="stockCheckId != null and stockCheckId != ''"> and cs.stock_check_id = #{stockCheckId}</if>
<if test="checkType != null and checkType != ''"> and cs.check_type = #{checkType}</if>
<if test="createDate != null and createDate != ''"> and cs.create_date = #{createDate}</if>
<if test="createManId != null and createManId != ''"> and cs.create_man_id = #{createManId}</if>
<if test="status != null and status != ''"> and cs.status = #{status}</if>
<if test="warehouseId != null and warehouseId != ''"> and cs.warehouse_id = #{warehouseId}</if>
<if test="finishDate != null and finishDate != ''"> and cs.finish_date = #{finishDate}</if>
<if test="erpBill != null and erpBill != ''"> and cs.erp_bill = #{erpBill}</if>
<if test="stockSource != null and stockSource != ''"> and cs.stock_source = #{stockSource}</if>
<if test="departmentNo != null and departmentNo != ''"> and cs.department_no = #{departmentNo}</if>
<if test="customerNo != null and customerNo != ''"> and cs.customer_no = #{customerNo}</if>
<if test="classNo != null and classNo != ''"> and cs.class_no = #{classNo}</if>
<if test="supplierNo != null and supplierNo != ''"> and cs.supplier_no = #{supplierNo}</if>
<if test="spare1 != null and spare1 != ''"> and cs.spare1 = #{spare1}</if>
<if test="spare2 != null and spare2 != ''"> and cs.spare2 = #{spare2}</if>
<if test="spare3 != null and spare3 != ''"> and cs.spare3 = #{spare3}</if>
<if test="spare4 != null and spare4 != ''"> and cs.spare4 = #{spare4}</if>
<if test="spare5 != null and spare5 != ''"> and cs.spare5 = #{spare5}</if>
<if test="stockCheckId != null and stockCheckId != ''"> and cs.stock_check_id like concat('%', #{stockCheckId}, '%')</if>
<if test="checkType != null and checkType != ''"> and cs.check_type like concat('%', #{checkType}, '%')</if>
<if test="createDate != null and createDate != ''"> and cs.create_date like concat('%', #{createDate}, '%')</if>
<if test="createManId != null and createManId != ''"> and cs.create_man_id like concat('%', #{createManId}, '%')</if>
<if test="status != null and status != ''"> and cs.status like concat('%', #{status}, '%')</if>
<if test="warehouseId != null and warehouseId != ''"> and cs.warehouse_id like concat('%', #{warehouseId}, '%')</if>
<if test="finishDate != null and finishDate != ''"> and cs.finish_date like concat('%', #{finishDate}, '%')</if>
<if test="erpBill != null and erpBill != ''"> and cs.erp_bill like concat('%', #{erpBill}, '%')</if>
<if test="stockSource != null and stockSource != ''"> and cs.stock_source like concat('%', #{stockSource}, '%')</if>
<if test="departmentNo != null and departmentNo != ''"> and cs.department_no like concat('%', #{departmentNo}, '%')</if>
<if test="customerNo != null and customerNo != ''"> and cs.customer_no like concat('%', #{customerNo}, '%')</if>
<if test="classNo != null and classNo != ''"> and cs.class_no like concat('%', #{classNo}, '%')</if>
<if test="supplierNo != null and supplierNo != ''"> and cs.supplier_no like concat('%', #{supplierNo}, '%')</if>
<if test="spare1 != null and spare1 != ''"> and cs.spare1 like concat('%', #{spare1}, '%')</if>
<if test="spare2 != null and spare2 != ''"> and cs.spare2 like concat('%', #{spare2}, '%')</if>
<if test="spare3 != null and spare3 != ''"> and cs.spare3 like concat('%', #{spare3}, '%')</if>
<if test="spare4 != null and spare4 != ''"> and cs.spare4 like concat('%', #{spare4}, '%')</if>
<if test="spare5 != null and spare5 != ''"> and cs.spare5 like concat('%', #{spare5}, '%')</if>
<if test="params.warehouseDataScope != null and params.warehouseDataScope !=''">
${params.warehouseDataScope}
</if>
@@ -183,3 +183,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</foreach>
</delete>
</mapper>

54
ruoyi-admin/src/main/resources/mapper/in/InStockinBackMapper.xml
View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8" ?>
<?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">
@@ -27,40 +27,40 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="sendStatus" column="send_status"/>
<result property="sendTime" column="send_time"/>
<result property="msg" column="msg"/>
<result property="msg" column="msg"/>
<result property="msg" column="msg"/>
<result property="companyShortName" column="company_short_name"/>
<result property="accountSetNo" column="account_set_no"/>
</resultMap>
<sql id="selectInStockinBackVo">
select stockin_guid, stockin_id, in_type, create_date, create_man_id, status, warehouse_id,
spare5, spare4, spare3, finish_date, spare2, spare1, erp_bill, stock_source, department_no,
customer_no, class_no, supplier_no,send_status,send_time,msg from in_stockin_back
customer_no, class_no, supplier_no,send_status,send_time,msg,company_short_name,account_set_no from in_stockin_back
</sql>
<select id="selectInStockinBackList" parameterType="InStockinBack" resultMap="InStockinBackResult">
<include refid="selectInStockinBackVo"/>
<where>
<if test="stockinId != null and stockinId != ''"> and stockin_id = #{stockinId}</if>
<if test="inType != null and inType != ''"> and in_type = #{inType}</if>
<if test="createDate != null and createDate != ''"> and create_date = #{createDate}</if>
<if test="createManId != null and createManId != ''"> and create_man_id = #{createManId}</if>
<if test="status != null and status != ''"> and status = #{status}</if>
<if test="warehouseId != null and warehouseId != ''"> and warehouse_id = #{warehouseId}</if>
<if test="spare5 != null and spare5 != ''"> and spare5 = #{spare5}</if>
<if test="spare4 != null and spare4 != ''"> and spare4 = #{spare4}</if>
<if test="spare3 != null and spare3 != ''"> and spare3 = #{spare3}</if>
<if test="finishDate != null and finishDate != ''"> and finish_date = #{finishDate}</if>
<if test="spare2 != null and spare2 != ''"> and spare2 = #{spare2}</if>
<if test="spare1 != null and spare1 != ''"> and spare1 = #{spare1}</if>
<if test="erpBill != null and erpBill != ''"> and erp_bill = #{erpBill}</if>
<if test="stockSource != null and stockSource != ''"> and stock_source = #{stockSource}</if>
<if test="departmentNo != null and departmentNo != ''"> and department_no = #{departmentNo}</if>
<if test="customerNo != null and customerNo != ''"> and customer_no = #{customerNo}</if>
<if test="classNo != null and classNo != ''"> and class_no = #{classNo}</if>
<if test="supplierNo != null and supplierNo != ''"> and supplier_no = #{supplierNo}</if>
<if test="sendStatus != null and sendStatus != ''"> and send_status = #{sendStatus}</if>
<if test="sendTime != null and sendTime != ''"> and send_time = #{sendTime}</if>
<if test="msg != null and msg != ''"> and msg = #{msg}</if>
<if test="stockinId != null and stockinId != ''"> and stockin_id like concat('%', #{stockinId}, '%')</if>
<if test="inType != null and inType != ''"> and in_type like concat('%', #{inType}, '%')</if>
<if test="createDate != null and createDate != ''"> and create_date like concat('%', #{createDate}, '%')</if>
<if test="createManId != null and createManId != ''"> and create_man_id like concat('%', #{createManId}, '%')</if>
<if test="status != null and status != ''"> and status like concat('%', #{status}, '%')</if>
<if test="warehouseId != null and warehouseId != ''"> and warehouse_id like concat('%', #{warehouseId}, '%')</if>
<if test="spare5 != null and spare5 != ''"> and spare5 like concat('%', #{spare5}, '%')</if>
<if test="spare4 != null and spare4 != ''"> and spare4 like concat('%', #{spare4}, '%')</if>
<if test="spare3 != null and spare3 != ''"> and spare3 like concat('%', #{spare3}, '%')</if>
<if test="finishDate != null and finishDate != ''"> and finish_date like concat('%', #{finishDate}, '%')</if>
<if test="spare2 != null and spare2 != ''"> and spare2 like concat('%', #{spare2}, '%')</if>
<if test="spare1 != null and spare1 != ''"> and spare1 like concat('%', #{spare1}, '%')</if>
<if test="erpBill != null and erpBill != ''"> and erp_bill like concat('%', #{erpBill}, '%')</if>
<if test="stockSource != null and stockSource != ''"> and stock_source like concat('%', #{stockSource}, '%')</if>
<if test="departmentNo != null and departmentNo != ''"> and department_no like concat('%', #{departmentNo}, '%')</if>
<if test="customerNo != null and customerNo != ''"> and customer_no like concat('%', #{customerNo}, '%')</if>
<if test="classNo != null and classNo != ''"> and class_no like concat('%', #{classNo}, '%')</if>
<if test="supplierNo != null and supplierNo != ''"> and supplier_no like concat('%', #{supplierNo}, '%')</if>
<if test="sendStatus != null and sendStatus != ''"> and send_status like concat('%', #{sendStatus}, '%')</if>
<if test="sendTime != null and sendTime != ''"> and send_time like concat('%', #{sendTime}, '%')</if>
<if test="msg != null and msg != ''"> and msg like concat('%', #{msg}, '%')</if>
</where>
</select>
@@ -167,7 +167,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectTopInStockin" resultMap="InStockinBackResult">
select top(1) *
from in_stockin_back where send_status= 0
from in_stockin_back where send_status= 0 and stock_source =1
</select>
</mapper>
</mapper>

95
ruoyi-admin/src/main/resources/mapper/in/InStockinDetailBackMapper.xml
View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8" ?>
<?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">
@@ -96,41 +96,41 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectInStockinDetailBackList" parameterType="InStockinDetailBack" resultMap="InStockinDetailBackResult">
<include refid="selectInStockinDetailBackVo"/>
<where>
<if test="stockinGuid != null and stockinGuid != ''"> and stockin_guid = #{stockinGuid}</if>
<if test="stockinId != null and stockinId != ''"> and stockin_id = #{stockinId}</if>
<if test="lotNo != null and lotNo != ''"> and lot_no = #{lotNo}</if>
<if test="productGuid != null and productGuid != ''"> and product_guid = #{productGuid}</if>
<if test="productId != null and productId != ''"> and product_id = #{productId}</if>
<if test="quantity != null and quantity != ''"> and quantity = #{quantity}</if>
<if test="quantityX != null and quantityX != ''"> and quantity_x = #{quantityX}</if>
<if test="quantityJ != null and quantityJ != ''"> and quantity_j = #{quantityJ}</if>
<if test="price != null and price != ''"> and price = #{price}</if>
<if test="cargoNo != null and cargoNo != ''"> and cargo_no = #{cargoNo}</if>
<if test="assignNum != null and assignNum != ''"> and assign_num = #{assignNum}</if>
<if test="assignNumX != null and assignNumX != ''"> and assign_num_x = #{assignNumX}</if>
<if test="assignNumJ != null and assignNumJ != ''"> and assign_num_j = #{assignNumJ}</if>
<if test="printDate != null and printDate != ''"> and print_date = #{printDate}</if>
<if test="stockStatus != null and stockStatus != ''"> and stock_status = #{stockStatus}</if>
<if test="supplierId != null and supplierId != ''"> and supplier_id = #{supplierId}</if>
<if test="customerId != null and customerId != ''"> and customer_id = #{customerId}</if>
<if test="unit != null and unit != ''"> and unit = #{unit}</if>
<if test="spec != null and spec != ''"> and spec = #{spec}</if>
<if test="spare1 != null and spare1 != ''"> and spare1 = #{spare1}</if>
<if test="spare2 != null and spare2 != ''"> and spare2 = #{spare2}</if>
<if test="spare3 != null and spare3 != ''"> and spare3 = #{spare3}</if>
<if test="spare4 != null and spare4 != ''"> and spare4 = #{spare4}</if>
<if test="spare5 != null and spare5 != ''"> and spare5 = #{spare5}</if>
<if test="spare6 != null and spare6 != ''"> and spare6 = #{spare6}</if>
<if test="scanNum != null and scanNum != ''"> and scan_num = #{scanNum}</if>
<if test="scanNumX != null and scanNumX != ''"> and scan_num_x = #{scanNumX}</if>
<if test="scanNumJ != null and scanNumJ != ''"> and scan_num_j = #{scanNumJ}</if>
<if test="spare7 != null and spare7 != ''"> and spare7 = #{spare7}</if>
<if test="spare8 != null and spare8 != ''"> and spare8 = #{spare8}</if>
<if test="spare9 != null and spare9 != ''"> and spare9 = #{spare9}</if>
<if test="stockinGuid != null and stockinGuid != ''"> and stockin_guid like concat('%', #{stockinGuid}, '%')</if>
<if test="stockinId != null and stockinId != ''"> and stockin_id like concat('%', #{stockinId}, '%')</if>
<if test="lotNo != null and lotNo != ''"> and lot_no like concat('%', #{lotNo}, '%')</if>
<if test="productGuid != null and productGuid != ''"> and product_guid like concat('%', #{productGuid}, '%')</if>
<if test="productId != null and productId != ''"> and product_id like concat('%', #{productId}, '%')</if>
<if test="quantity != null and quantity != ''"> and quantity like concat('%', #{quantity}, '%')</if>
<if test="quantityX != null and quantityX != ''"> and quantity_x like concat('%', #{quantityX}, '%')</if>
<if test="quantityJ != null and quantityJ != ''"> and quantity_j like concat('%', #{quantityJ}, '%')</if>
<if test="price != null and price != ''"> and price like concat('%', #{price}, '%')</if>
<if test="cargoNo != null and cargoNo != ''"> and cargo_no like concat('%', #{cargoNo}, '%')</if>
<if test="assignNum != null and assignNum != ''"> and assign_num like concat('%', #{assignNum}, '%')</if>
<if test="assignNumX != null and assignNumX != ''"> and assign_num_x like concat('%', #{assignNumX}, '%')</if>
<if test="assignNumJ != null and assignNumJ != ''"> and assign_num_j like concat('%', #{assignNumJ}, '%')</if>
<if test="printDate != null and printDate != ''"> and print_date like concat('%', #{printDate}, '%')</if>
<if test="stockStatus != null and stockStatus != ''"> and stock_status like concat('%', #{stockStatus}, '%')</if>
<if test="supplierId != null and supplierId != ''"> and supplier_id like concat('%', #{supplierId}, '%')</if>
<if test="customerId != null and customerId != ''"> and customer_id like concat('%', #{customerId}, '%')</if>
<if test="unit != null and unit != ''"> and unit like concat('%', #{unit}, '%')</if>
<if test="spec != null and spec != ''"> and spec like concat('%', #{spec}, '%')</if>
<if test="spare1 != null and spare1 != ''"> and spare1 like concat('%', #{spare1}, '%')</if>
<if test="spare2 != null and spare2 != ''"> and spare2 like concat('%', #{spare2}, '%')</if>
<if test="spare3 != null and spare3 != ''"> and spare3 like concat('%', #{spare3}, '%')</if>
<if test="spare4 != null and spare4 != ''"> and spare4 like concat('%', #{spare4}, '%')</if>
<if test="spare5 != null and spare5 != ''"> and spare5 like concat('%', #{spare5}, '%')</if>
<if test="spare6 != null and spare6 != ''"> and spare6 like concat('%', #{spare6}, '%')</if>
<if test="scanNum != null and scanNum != ''"> and scan_num like concat('%', #{scanNum}, '%')</if>
<if test="scanNumX != null and scanNumX != ''"> and scan_num_x like concat('%', #{scanNumX}, '%')</if>
<if test="scanNumJ != null and scanNumJ != ''"> and scan_num_j like concat('%', #{scanNumJ}, '%')</if>
<if test="spare7 != null and spare7 != ''"> and spare7 like concat('%', #{spare7}, '%')</if>
<if test="spare8 != null and spare8 != ''"> and spare8 like concat('%', #{spare8}, '%')</if>
<if test="spare9 != null and spare9 != ''"> and spare9 like concat('%', #{spare9}, '%')</if>
<if test="productName != null and productName != ''"> and product_name like concat('%', #{productName}, '%')</if>
<if test="sendStatus != null and sendStatus != ''"> and send_status = #{sendStatus}</if>
<if test="sendTime != null and sendTime != ''"> and send_time = #{sendTime}</if>
<if test="msg != null and msg != ''"> and msg = #{msg}</if>
<if test="sendStatus != null and sendStatus != ''"> and send_status like concat('%', #{sendStatus}, '%')</if>
<if test="sendTime != null and sendTime != ''"> and send_time like concat('%', #{sendTime}, '%')</if>
<if test="msg != null and msg != ''"> and msg like concat('%', #{msg}, '%')</if>
</where>
</select>
@@ -274,6 +274,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
delete from in_stockin_detail_back where stockin_detail_id = #{stockinDetailId}
</delete>
<delete id="deleteInStockinDetailBackByStockinDetailIds" parameterType="String">
delete from in_stockin_detail_back where stockin_detail_id in
<foreach item="stockinDetailId" collection="array" open="(" separator="," close=")">
#{stockinDetailId}
</foreach>
</delete>
<insert id="insertInStockInDetailBackFinish" parameterType="java.util.List">
INSERT INTO in_stockin_detail_back_finish
<foreach collection="list" item="item" separator="UNION ALL">
@@ -282,22 +289,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</foreach>
</insert>
<delete id="deleteInStockinDetailBackByStockinDetailIds" parameterType="String">
delete from in_stockin_detail_back where stockin_detail_id in
<foreach item="stockinDetailId" collection="array" open="(" separator="," close=")">
#{stockinDetailId}
</foreach>
</delete>
<delete id="deleteInStockInDetailList">
DELETE FROM in_stockin_detail
DELETE FROM in_stockin_detail_back
WHERE stockin_detail_id IN
<foreach collection="idList" item="id" open="(" separator="," close=")">
#{id}
<foreach collection="idList" item="item" open="(" separator="," close=")">
#{item.stockinDetailId}
</foreach>
</delete>
</mapper>
</mapper>

115
ruoyi-admin/src/main/resources/mapper/in/InStockinDetailFinishMapper.xml
View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8" ?>
<?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">
@@ -103,34 +103,34 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectInStockinDetailFinishList" parameterType="InStockinDetailFinish" resultMap="InStockinDetailFinishResult">
<include refid="selectInStockinDetailFinishVo"/>
<where>
<if test="stockinGuid != null and stockinGuid != ''"> and isd.stockin_guid = #{stockinGuid}</if>
<if test="stockinId != null and stockinId != ''"> and isd.stockin_id = #{stockinId}</if>
<if test="lotNo != null and lotNo != ''"> and isd.lot_no = #{lotNo}</if>
<if test="productGuid != null and productGuid != ''"> and isd.product_guid = #{productGuid}</if>
<if test="productId != null and productId != ''"> and isd.product_id = #{productId}</if>
<if test="quantity != null and quantity != ''"> and isd.quantity = #{quantity}</if>
<if test="quantityX != null and quantityX != ''"> and isd.quantity_x = #{quantityX}</if>
<if test="quantityJ != null and quantityJ != ''"> and isd.quantity_j = #{quantityJ}</if>
<if test="price != null and price != ''"> and isd.price = #{price}</if>
<if test="cargoNo != null and cargoNo != ''"> and isd.cargo_no = #{cargoNo}</if>
<if test="assignNum != null and assignNum != ''"> and isd.assign_num = #{assignNum}</if>
<if test="assignNumX != null and assignNumX != ''"> and isd.assign_num_x = #{assignNumX}</if>
<if test="assignNumJ != null and assignNumJ != ''"> and isd.assign_num_j = #{assignNumJ}</if>
<if test="printDate != null and printDate != ''"> and isd.print_date = #{printDate}</if>
<if test="stockStatus != null and stockStatus != ''"> and isd.stock_status = #{stockStatus}</if>
<if test="supplierId != null and supplierId != ''"> and isd.supplier_id = #{supplierId}</if>
<if test="customerId != null and customerId != ''"> and isd.customer_id = #{customerId}</if>
<if test="unit != null and unit != ''"> and isd.unit = #{unit}</if>
<if test="spec != null and spec != ''"> and isd.spec = #{spec}</if>
<if test="spare1 != null and spare1 != ''"> and isd.spare1 = #{spare1}</if>
<if test="spare2 != null and spare2 != ''"> and isd.spare2 = #{spare2}</if>
<if test="spare3 != null and spare3 != ''"> and isd.spare3 = #{spare3}</if>
<if test="spare4 != null and spare4 != ''"> and isd.spare4 = #{spare4}</if>
<if test="spare5 != null and spare5 != ''"> and isd.spare5 = #{spare5}</if>
<if test="spare6 != null and spare6 != ''"> and isd.spare6 = #{spare6}</if>
<if test="scanNum != null and scanNum != ''"> and isd.scan_num = #{scanNum}</if>
<if test="scanNumX != null and scanNumX != ''"> and isd.scan_num_x = #{scanNumX}</if>
<if test="scanNumJ != null and scanNumJ != ''"> and isd.scan_num_j = #{scanNumJ}</if>
<if test="stockinGuid != null and stockinGuid != ''"> and isd.stockin_guid like concat('%', #{stockinGuid}, '%')</if>
<if test="stockinId != null and stockinId != ''"> and isd.stockin_id like concat('%', #{stockinId}, '%')</if>
<if test="lotNo != null and lotNo != ''"> and isd.lot_no like concat('%', #{lotNo}, '%')</if>
<if test="productGuid != null and productGuid != ''"> and isd.product_guid like concat('%', #{productGuid}, '%')</if>
<if test="productId != null and productId != ''"> and isd.product_id like concat('%', #{productId}, '%')</if>
<if test="quantity != null and quantity != ''"> and isd.quantity like concat('%', #{quantity}, '%')</if>
<if test="quantityX != null and quantityX != ''"> and isd.quantity_x like concat('%', #{quantityX}, '%')</if>
<if test="quantityJ != null and quantityJ != ''"> and isd.quantity_j like concat('%', #{quantityJ}, '%')</if>
<if test="price != null and price != ''"> and isd.price like concat('%', #{price}, '%')</if>
<if test="cargoNo != null and cargoNo != ''"> and isd.cargo_no like concat('%', #{cargoNo}, '%')</if>
<if test="assignNum != null and assignNum != ''"> and isd.assign_num like concat('%', #{assignNum}, '%')</if>
<if test="assignNumX != null and assignNumX != ''"> and isd.assign_num_x like concat('%', #{assignNumX}, '%')</if>
<if test="assignNumJ != null and assignNumJ != ''"> and isd.assign_num_j like concat('%', #{assignNumJ}, '%')</if>
<if test="printDate != null and printDate != ''"> and isd.print_date like concat('%', #{printDate}, '%')</if>
<if test="stockStatus != null and stockStatus != ''"> and isd.stock_status like concat('%', #{stockStatus}, '%')</if>
<if test="supplierId != null and supplierId != ''"> and isd.supplier_id like concat('%', #{supplierId}, '%')</if>
<if test="customerId != null and customerId != ''"> and isd.customer_id like concat('%', #{customerId}, '%')</if>
<if test="unit != null and unit != ''"> and isd.unit like concat('%', #{unit}, '%')</if>
<if test="spec != null and spec != ''"> and isd.spec like concat('%', #{spec}, '%')</if>
<if test="spare1 != null and spare1 != ''"> and isd.spare1 like concat('%', #{spare1}, '%')</if>
<if test="spare2 != null and spare2 != ''"> and isd.spare2 like concat('%', #{spare2}, '%')</if>
<if test="spare3 != null and spare3 != ''"> and isd.spare3 like concat('%', #{spare3}, '%')</if>
<if test="spare4 != null and spare4 != ''"> and isd.spare4 like concat('%', #{spare4}, '%')</if>
<if test="spare5 != null and spare5 != ''"> and isd.spare5 like concat('%', #{spare5}, '%')</if>
<if test="spare6 != null and spare6 != ''"> and isd.spare6 like concat('%', #{spare6}, '%')</if>
<if test="scanNum != null and scanNum != ''"> and isd.scan_num like concat('%', #{scanNum}, '%')</if>
<if test="scanNumX != null and scanNumX != ''"> and isd.scan_num_x like concat('%', #{scanNumX}, '%')</if>
<if test="scanNumJ != null and scanNumJ != ''"> and isd.scan_num_j like concat('%', #{scanNumJ}, '%')</if>
</where>
</select>
@@ -142,34 +142,34 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
resultMap="InStockinDetailResult">
<include refid="selectInStockinDetailFinishVo"/>
<where>
<if test="stockinGuid != null and stockinGuid != ''"> and isd.stockin_guid = #{stockinGuid}</if>
<if test="stockinId != null and stockinId != ''"> and isd.stockin_id = #{stockinId}</if>
<if test="lotNo != null and lotNo != ''"> and isd.lot_no = #{lotNo}</if>
<if test="productGuid != null and productGuid != ''"> and isd.product_guid = #{productGuid}</if>
<if test="productId != null and productId != ''"> and isd.product_id = #{productId}</if>
<if test="quantity != null and quantity != ''"> and isd.quantity = #{quantity}</if>
<if test="quantityX != null and quantityX != ''"> and isd.quantity_x = #{quantityX}</if>
<if test="quantityJ != null and quantityJ != ''"> and isd.quantity_j = #{quantityJ}</if>
<if test="price != null and price != ''"> and isd.price = #{price}</if>
<if test="cargoNo != null and cargoNo != ''"> and isd.cargo_no = #{cargoNo}</if>
<if test="assignNum != null and assignNum != ''"> and isd.assign_num = #{assignNum}</if>
<if test="assignNumX != null and assignNumX != ''"> and isd.assign_num_x = #{assignNumX}</if>
<if test="assignNumJ != null and assignNumJ != ''"> and isd.assign_num_j = #{assignNumJ}</if>
<if test="printDate != null and printDate != ''"> and isd.print_date = #{printDate}</if>
<if test="stockStatus != null and stockStatus != ''"> and isd.stock_status = #{stockStatus}</if>
<if test="supplierId != null and supplierId != ''"> and isd.supplier_id = #{supplierId}</if>
<if test="customerId != null and customerId != ''"> and isd.customer_id = #{customerId}</if>
<if test="unit != null and unit != ''"> and isd.unit = #{unit}</if>
<if test="spec != null and spec != ''"> and isd.spec = #{spec}</if>
<if test="spare1 != null and spare1 != ''"> and isd.spare1 = #{spare1}</if>
<if test="spare2 != null and spare2 != ''"> and isd.spare2 = #{spare2}</if>
<if test="spare3 != null and spare3 != ''"> and isd.spare3 = #{spare3}</if>
<if test="spare4 != null and spare4 != ''"> and isd.spare4 = #{spare4}</if>
<if test="spare5 != null and spare5 != ''"> and isd.spare5 = #{spare5}</if>
<if test="spare6 != null and spare6 != ''"> and isd.spare6 = #{spare6}</if>
<if test="scanNum != null and scanNum != ''"> and isd.scan_num = #{scanNum}</if>
<if test="scanNumX != null and scanNumX != ''"> and isd.scan_num_x = #{scanNumX}</if>
<if test="scanNumJ != null and scanNumJ != ''"> and isd.scan_num_j = #{scanNumJ}</if>
<if test="stockinGuid != null and stockinGuid != ''"> and isd.stockin_guid like concat('%', #{stockinGuid}, '%')</if>
<if test="stockinId != null and stockinId != ''"> and isd.stockin_id like concat('%', #{stockinId}, '%')</if>
<if test="lotNo != null and lotNo != ''"> and isd.lot_no like concat('%', #{lotNo}, '%')</if>
<if test="productGuid != null and productGuid != ''"> and isd.product_guid like concat('%', #{productGuid}, '%')</if>
<if test="productId != null and productId != ''"> and isd.product_id like concat('%', #{productId}, '%')</if>
<if test="quantity != null and quantity != ''"> and isd.quantity like concat('%', #{quantity}, '%')</if>
<if test="quantityX != null and quantityX != ''"> and isd.quantity_x like concat('%', #{quantityX}, '%')</if>
<if test="quantityJ != null and quantityJ != ''"> and isd.quantity_j like concat('%', #{quantityJ}, '%')</if>
<if test="price != null and price != ''"> and isd.price like concat('%', #{price}, '%')</if>
<if test="cargoNo != null and cargoNo != ''"> and isd.cargo_no like concat('%', #{cargoNo}, '%')</if>
<if test="assignNum != null and assignNum != ''"> and isd.assign_num like concat('%', #{assignNum}, '%')</if>
<if test="assignNumX != null and assignNumX != ''"> and isd.assign_num_x like concat('%', #{assignNumX}, '%')</if>
<if test="assignNumJ != null and assignNumJ != ''"> and isd.assign_num_j like concat('%', #{assignNumJ}, '%')</if>
<if test="printDate != null and printDate != ''"> and isd.print_date like concat('%', #{printDate}, '%')</if>
<if test="stockStatus != null and stockStatus != ''"> and isd.stock_status like concat('%', #{stockStatus}, '%')</if>
<if test="supplierId != null and supplierId != ''"> and isd.supplier_id like concat('%', #{supplierId}, '%')</if>
<if test="customerId != null and customerId != ''"> and isd.customer_id like concat('%', #{customerId}, '%')</if>
<if test="unit != null and unit != ''"> and isd.unit like concat('%', #{unit}, '%')</if>
<if test="spec != null and spec != ''"> and isd.spec like concat('%', #{spec}, '%')</if>
<if test="spare1 != null and spare1 != ''"> and isd.spare1 like concat('%', #{spare1}, '%')</if>
<if test="spare2 != null and spare2 != ''"> and isd.spare2 like concat('%', #{spare2}, '%')</if>
<if test="spare3 != null and spare3 != ''"> and isd.spare3 like concat('%', #{spare3}, '%')</if>
<if test="spare4 != null and spare4 != ''"> and isd.spare4 like concat('%', #{spare4}, '%')</if>
<if test="spare5 != null and spare5 != ''"> and isd.spare5 like concat('%', #{spare5}, '%')</if>
<if test="spare6 != null and spare6 != ''"> and isd.spare6 like concat('%', #{spare6}, '%')</if>
<if test="scanNum != null and scanNum != ''"> and isd.scan_num like concat('%', #{scanNum}, '%')</if>
<if test="scanNumX != null and scanNumX != ''"> and isd.scan_num_x like concat('%', #{scanNumX}, '%')</if>
<if test="scanNumJ != null and scanNumJ != ''"> and isd.scan_num_j like concat('%', #{scanNumJ}, '%')</if>
</where>
</select>
@@ -288,3 +288,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</foreach>
</delete>
</mapper>

68
ruoyi-admin/src/main/resources/mapper/in/InStockinDetailMapper.xml
View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8" ?>
<?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">
@@ -69,34 +69,34 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectInStockinDetailList" parameterType="InStockinDetail" resultMap="InStockinDetailResult">
<include refid="selectInStockinDetailVo"/>
<where>
<if test="stockinGuid != null and stockinGuid != ''"> and isd.stockin_guid = #{stockinGuid}</if>
<if test="stockinId != null and stockinId != ''"> and isd.stockin_id = #{stockinId}</if>
<if test="lotNo != null and lotNo != ''"> and isd.lot_no = #{lotNo}</if>
<if test="productGuid != null and productGuid != ''"> and isd.product_guid = #{productGuid}</if>
<if test="productId != null and productId != ''"> and isd.product_id = #{productId}</if>
<if test="quantity != null and quantity != ''"> and isd.quantity = #{quantity}</if>
<if test="quantityX != null and quantityX != ''"> and isd.quantity_x = #{quantityX}</if>
<if test="quantityJ != null and quantityJ != ''"> and isd.quantity_j = #{quantityJ}</if>
<if test="price != null and price != ''"> and isd.price = #{price}</if>
<if test="cargoNo != null and cargoNo != ''"> and isd.cargo_no = #{cargoNo}</if>
<if test="assignNum != null and assignNum != ''"> and isd.assign_num = #{assignNum}</if>
<if test="assignNumX != null and assignNumX != ''"> and isd.assign_num_x = #{assignNumX}</if>
<if test="assignNumJ != null and assignNumJ != ''"> and isd.assign_num_j = #{assignNumJ}</if>
<if test="printDate != null and printDate != ''"> and isd.print_date = #{printDate}</if>
<if test="stockStatus != null and stockStatus != ''"> and isd.stock_status = #{stockStatus}</if>
<if test="supplierId != null and supplierId != ''"> and isd.supplier_id = #{supplierId}</if>
<if test="customerId != null and customerId != ''"> and isd.customer_id = #{customerId}</if>
<if test="unit != null and unit != ''"> and isd.unit = #{unit}</if>
<if test="spec != null and spec != ''"> and isd.spec = #{spec}</if>
<if test="spare1 != null and spare1 != ''"> and isd.spare1 = #{spare1}</if>
<if test="spare2 != null and spare2 != ''"> and isd.spare2 = #{spare2}</if>
<if test="spare3 != null and spare3 != ''"> and isd.spare3 = #{spare3}</if>
<if test="spare4 != null and spare4 != ''"> and isd.spare4 = #{spare4}</if>
<if test="spare5 != null and spare5 != ''"> and isd.spare5 = #{spare5}</if>
<if test="spare6 != null and spare6 != ''"> and isd.spare6 = #{spare6}</if>
<if test="scanNum != null and scanNum != ''"> and isd.scan_num = #{scanNum}</if>
<if test="scanNumX != null and scanNumX != ''"> and isd.scan_num_x = #{scanNumX}</if>
<if test="scanNumJ != null and scanNumJ != ''"> and isd.scan_num_j = #{scanNumJ}</if>
<if test="stockinGuid != null and stockinGuid != ''"> and isd.stockin_guid like concat('%', #{stockinGuid}, '%')</if>
<if test="stockinId != null and stockinId != ''"> and isd.stockin_id like concat('%', #{stockinId}, '%')</if>
<if test="lotNo != null and lotNo != ''"> and isd.lot_no like concat('%', #{lotNo}, '%')</if>
<if test="productGuid != null and productGuid != ''"> and isd.product_guid like concat('%', #{productGuid}, '%')</if>
<if test="productId != null and productId != ''"> and isd.product_id like concat('%', #{productId}, '%')</if>
<if test="quantity != null and quantity != ''"> and isd.quantity like concat('%', #{quantity}, '%')</if>
<if test="quantityX != null and quantityX != ''"> and isd.quantity_x like concat('%', #{quantityX}, '%')</if>
<if test="quantityJ != null and quantityJ != ''"> and isd.quantity_j like concat('%', #{quantityJ}, '%')</if>
<if test="price != null and price != ''"> and isd.price like concat('%', #{price}, '%')</if>
<if test="cargoNo != null and cargoNo != ''"> and isd.cargo_no like concat('%', #{cargoNo}, '%')</if>
<if test="assignNum != null and assignNum != ''"> and isd.assign_num like concat('%', #{assignNum}, '%')</if>
<if test="assignNumX != null and assignNumX != ''"> and isd.assign_num_x like concat('%', #{assignNumX}, '%')</if>
<if test="assignNumJ != null and assignNumJ != ''"> and isd.assign_num_j like concat('%', #{assignNumJ}, '%')</if>
<if test="printDate != null and printDate != ''"> and isd.print_date like concat('%', #{printDate}, '%')</if>
<if test="stockStatus != null and stockStatus != ''"> and isd.stock_status like concat('%', #{stockStatus}, '%')</if>
<if test="supplierId != null and supplierId != ''"> and isd.supplier_id like concat('%', #{supplierId}, '%')</if>
<if test="customerId != null and customerId != ''"> and isd.customer_id like concat('%', #{customerId}, '%')</if>
<if test="unit != null and unit != ''"> and isd.unit like concat('%', #{unit}, '%')</if>
<if test="spec != null and spec != ''"> and isd.spec like concat('%', #{spec}, '%')</if>
<if test="spare1 != null and spare1 != ''"> and isd.spare1 like concat('%', #{spare1}, '%')</if>
<if test="spare2 != null and spare2 != ''"> and isd.spare2 like concat('%', #{spare2}, '%')</if>
<if test="spare3 != null and spare3 != ''"> and isd.spare3 like concat('%', #{spare3}, '%')</if>
<if test="spare4 != null and spare4 != ''"> and isd.spare4 like concat('%', #{spare4}, '%')</if>
<if test="spare5 != null and spare5 != ''"> and isd.spare5 like concat('%', #{spare5}, '%')</if>
<if test="spare6 != null and spare6 != ''"> and isd.spare6 like concat('%', #{spare6}, '%')</if>
<if test="scanNum != null and scanNum != ''"> and isd.scan_num like concat('%', #{scanNum}, '%')</if>
<if test="scanNumX != null and scanNumX != ''"> and isd.scan_num_x like concat('%', #{scanNumX}, '%')</if>
<if test="scanNumJ != null and scanNumJ != ''"> and isd.scan_num_j like concat('%', #{scanNumJ}, '%')</if>
</where>
</select>
@@ -147,7 +147,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="barCode != null">bar_code,</if>
<if test="isBatchManage != null">is_batch_manage,</if>
<if test="oldProjectNo != null">old_project_no,</if>
</trim>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="stockinDetailId != null">#{stockinDetailId},</if>
<if test="stockinGuid != null and stockinGuid != ''">#{stockinGuid},</if>
@@ -190,7 +190,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="isBatchManage != null">#{isBatchManage},</if>
<if test="oldProjectNo != null">#{oldProjectNo},</if>
</trim>
</trim>
</insert>
<insert id="insertInStockinDetailList">
INSERT INTO in_stockin_detail
@@ -343,9 +343,5 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</where>
order by ist.create_date desc
</select>
</mapper>

75
ruoyi-admin/src/main/resources/mapper/in/InStockinFinishMapper.xml
View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8" ?>
<?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">
@@ -86,24 +86,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectInStockinFinishList" parameterType="InStockinFinish" resultMap="InStockinFinishResult">
<include refid="selectInStockinFinishVo"/>
<where>
<if test="stockinId != null and stockinId != ''"> and is2.stockin_id = #{stockinId}</if>
<if test="inType != null and inType != ''"> and is2.in_type = #{inType}</if>
<if test="createDate != null and createDate != ''"> and is2.create_date = #{createDate}</if>
<if test="createManId != null and createManId != ''"> and is2.create_man_id = #{createManId}</if>
<if test="status != null and status != ''"> and is2.status = #{status}</if>
<if test="warehouseId != null and warehouseId != ''"> and is2.warehouse_id = #{warehouseId}</if>
<if test="finishDate != null and finishDate != ''"> and is2.finish_date = #{finishDate}</if>
<if test="erpBill != null and erpBill != ''"> and is2.erp_bill = #{erpBill}</if>
<if test="stockSource != null and stockSource != ''"> and is2.stock_source = #{stockSource}</if>
<if test="departmentNo != null and departmentNo != ''"> and is2.department_no = #{departmentNo}</if>
<if test="customerNo != null and customerNo != ''"> and is2.customer_no = #{customerNo}</if>
<if test="classNo != null and classNo != ''"> and is2.class_no = #{classNo}</if>
<if test="supplierNo != null and supplierNo != ''"> and is2.supplier_no = #{supplierNo}</if>
<if test="spare1 != null and spare1 != ''"> and is2.spare1 = #{spare1}</if>
<if test="spare2 != null and spare2 != ''"> and is2.spare2 = #{spare2}</if>
<if test="spare3 != null and spare3 != ''"> and is2.spare3 = #{spare3}</if>
<if test="spare4 != null and spare4 != ''"> and is2.spare4 = #{spare4}</if>
<if test="spare5 != null and spare5 != ''"> and is2.spare5 = #{spare5}</if>
<if test="stockinId != null and stockinId != ''"> and is2.stockin_id like concat('%', #{stockinId}, '%')</if>
<if test="inType != null and inType != ''"> and is2.in_type like concat('%', #{inType}, '%')</if>
<if test="createDate != null and createDate != ''"> and is2.create_date like concat('%', #{createDate}, '%')</if>
<if test="createManId != null and createManId != ''"> and is2.create_man_id like concat('%', #{createManId}, '%')</if>
<if test="status != null and status != ''"> and is2.status like concat('%', #{status}, '%')</if>
<if test="warehouseId != null and warehouseId != ''"> and is2.warehouse_id like concat('%', #{warehouseId}, '%')</if>
<if test="finishDate != null and finishDate != ''"> and is2.finish_date like concat('%', #{finishDate}, '%')</if>
<if test="erpBill != null and erpBill != ''"> and is2.erp_bill like concat('%', #{erpBill}, '%')</if>
<if test="stockSource != null and stockSource != ''"> and is2.stock_source like concat('%', #{stockSource}, '%')</if>
<if test="departmentNo != null and departmentNo != ''"> and is2.department_no like concat('%', #{departmentNo}, '%')</if>
<if test="customerNo != null and customerNo != ''"> and is2.customer_no like concat('%', #{customerNo}, '%')</if>
<if test="classNo != null and classNo != ''"> and is2.class_no like concat('%', #{classNo}, '%')</if>
<if test="supplierNo != null and supplierNo != ''"> and is2.supplier_no like concat('%', #{supplierNo}, '%')</if>
<if test="spare1 != null and spare1 != ''"> and is2.spare1 like concat('%', #{spare1}, '%')</if>
<if test="spare2 != null and spare2 != ''"> and is2.spare2 like concat('%', #{spare2}, '%')</if>
<if test="spare3 != null and spare3 != ''"> and is2.spare3 like concat('%', #{spare3}, '%')</if>
<if test="spare4 != null and spare4 != ''"> and is2.spare4 like concat('%', #{spare4}, '%')</if>
<if test="spare5 != null and spare5 != ''"> and is2.spare5 like concat('%', #{spare5}, '%')</if>
</where>
</select>
@@ -121,24 +121,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectInStockinFinishListByInStockin" resultMap="InStockinResult">
<include refid="selectInStockinFinishVo"/>
<where>
<if test="stockinId != null and stockinId != ''"> and is2.stockin_id = #{stockinId}</if>
<if test="inType != null and inType != ''"> and is2.in_type = #{inType}</if>
<if test="createDate != null and createDate != ''"> and is2.create_date = #{createDate}</if>
<if test="createManId != null and createManId != ''"> and is2.create_man_id = #{createManId}</if>
<if test="status != null and status != ''"> and is2.status = #{status}</if>
<if test="warehouseId != null and warehouseId != ''"> and is2.warehouse_id = #{warehouseId}</if>
<if test="finishDate != null and finishDate != ''"> and is2.finish_date = #{finishDate}</if>
<if test="erpBill != null and erpBill != ''"> and is2.erp_bill = #{erpBill}</if>
<if test="stockSource != null and stockSource != ''"> and is2.stock_source = #{stockSource}</if>
<if test="departmentNo != null and departmentNo != ''"> and is2.department_no = #{departmentNo}</if>
<if test="customerNo != null and customerNo != ''"> and is2.customer_no = #{customerNo}</if>
<if test="classNo != null and classNo != ''"> and is2.class_no = #{classNo}</if>
<if test="supplierNo != null and supplierNo != ''"> and is2.supplier_no = #{supplierNo}</if>
<if test="spare1 != null and spare1 != ''"> and is2.spare1 = #{spare1}</if>
<if test="spare2 != null and spare2 != ''"> and is2.spare2 = #{spare2}</if>
<if test="spare3 != null and spare3 != ''"> and is2.spare3 = #{spare3}</if>
<if test="spare4 != null and spare4 != ''"> and is2.spare4 = #{spare4}</if>
<if test="spare5 != null and spare5 != ''"> and is2.spare5 = #{spare5}</if>
<if test="stockinId != null and stockinId != ''"> and is2.stockin_id like concat('%', #{stockinId}, '%')</if>
<if test="inType != null and inType != ''"> and is2.in_type like concat('%', #{inType}, '%')</if>
<if test="createDate != null and createDate != ''"> and is2.create_date like concat('%', #{createDate}, '%')</if>
<if test="createManId != null and createManId != ''"> and is2.create_man_id like concat('%', #{createManId}, '%')</if>
<if test="status != null and status != ''"> and is2.status like concat('%', #{status}, '%')</if>
<if test="warehouseId != null and warehouseId != ''"> and is2.warehouse_id like concat('%', #{warehouseId}, '%')</if>
<if test="finishDate != null and finishDate != ''"> and is2.finish_date like concat('%', #{finishDate}, '%')</if>
<if test="erpBill != null and erpBill != ''"> and is2.erp_bill like concat('%', #{erpBill}, '%')</if>
<if test="stockSource != null and stockSource != ''"> and is2.stock_source like concat('%', #{stockSource}, '%')</if>
<if test="departmentNo != null and departmentNo != ''"> and is2.department_no like concat('%', #{departmentNo}, '%')</if>
<if test="customerNo != null and customerNo != ''"> and is2.customer_no like concat('%', #{customerNo}, '%')</if>
<if test="classNo != null and classNo != ''"> and is2.class_no like concat('%', #{classNo}, '%')</if>
<if test="supplierNo != null and supplierNo != ''"> and is2.supplier_no like concat('%', #{supplierNo}, '%')</if>
<if test="spare1 != null and spare1 != ''"> and is2.spare1 like concat('%', #{spare1}, '%')</if>
<if test="spare2 != null and spare2 != ''"> and is2.spare2 like concat('%', #{spare2}, '%')</if>
<if test="spare3 != null and spare3 != ''"> and is2.spare3 like concat('%', #{spare3}, '%')</if>
<if test="spare4 != null and spare4 != ''"> and is2.spare4 like concat('%', #{spare4}, '%')</if>
<if test="spare5 != null and spare5 != ''"> and is2.spare5 like concat('%', #{spare5}, '%')</if>
<if test="materialDesc !=null and materialDesc!=''">
and is2.stockin_id in (
select distinct stockin_id from in_stockin_detail_finish isd
@@ -241,3 +241,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</foreach>
</delete>
</mapper>

41
ruoyi-admin/src/main/resources/mapper/in/InStockinMapper.xml
View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8" ?>
<?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">
@@ -28,8 +28,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="spare4" column="spare4" />
<result property="spare3" column="spare3" />
<result property="spare5" column="spare5" />
<result property="companyShortName" column="company_short_name" />
<result property="accountSetNo" column="account_set_no" />
</resultMap>
<sql id="selectInStockinVo">
@@ -63,25 +61,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectInStockinList" parameterType="InStockin" resultMap="InStockinResult">
<include refid="selectInStockinVo"/>
<where>
<if test="stockinId != null and stockinId != ''"> and is2.stockin_id = #{stockinId}</if>
<if test="inType != null and inType != ''"> and is2.in_type = #{inType}</if>
<if test="createDate != null and createDate != ''"> and is2.create_date = #{createDate}</if>
<if test="createManId != null and createManId != ''"> and is2.create_man_id = #{createManId}</if>
<if test="status != null and status != ''"> and is2.status = #{status}</if>
<if test="warehouseId != null and warehouseId != ''"> and is2.warehouse_id = #{warehouseId}</if>
<if test="stockinId != null and stockinId != ''"> and is2.stockin_id like concat('%', #{stockinId}, '%')</if>
<if test="inType != null and inType != ''"> and is2.in_type like concat('%', #{inType}, '%')</if>
<if test="createDate != null and createDate != ''"> and is2.create_date like concat('%', #{createDate}, '%')</if>
<if test="createManId != null and createManId != ''"> and is2.create_man_id like concat('%', #{createManId}, '%')</if>
<if test="status != null and status != ''"> and is2.status like concat('%', #{status}, '%')</if>
<if test="warehouseId != null and warehouseId != ''"> and is2.warehouse_id like concat('%', #{warehouseId}, '%')</if>
<if test="startDate != null and startDate != ''"> and is2.create_date &gt;= #{startDate}</if>
<if test="finishDate != null and finishDate != ''"> and is2.create_date &lt;= #{finishDate}</if>
<if test="erpBill != null and erpBill != ''"> and is2.erp_bill = #{erpBill}</if>
<if test="stockSource != null and stockSource != ''"> and is2.stock_source = #{stockSource}</if>
<if test="erpBill != null and erpBill != ''"> and is2.erp_bill like concat('%', #{erpBill}, '%')</if>
<if test="stockSource != null and stockSource != ''"> and is2.stock_source like concat('%', #{stockSource}, '%')</if>
<if test="departmentNo != null and departmentNo != ''"> and is2.department_no like concat('%', #{departmentNo},'%')</if>
<if test="customerNo != null and customerNo != ''"> and is2.customer_no = #{customerNo}</if>
<if test="classNo != null and classNo != ''"> and is2.class_no = #{classNo}</if>
<if test="supplierNo != null and supplierNo != ''"> and is2.supplier_no = #{supplierNo}</if>
<if test="customerNo != null and customerNo != ''"> and is2.customer_no like concat('%', #{customerNo}, '%')</if>
<if test="classNo != null and classNo != ''"> and is2.class_no like concat('%', #{classNo}, '%')</if>
<if test="supplierNo != null and supplierNo != ''"> and is2.supplier_no like concat('%', #{supplierNo}, '%')</if>
<if test="spare1 != null and spare1 != ''"> and is2.spare1 like concat('%', #{spare1},'%')</if>
<if test="spare2 != null and spare2 != ''"> and is2.spare2 like concat('%', #{spare2},'%')</if>
<if test="spare4 != null and spare4 != ''"> and is2.spare4 = #{spare4}</if>
<if test="spare3 != null and spare3 != ''"> and is2.spare3 = #{spare3}</if>
<if test="spare5 != null and spare5 != ''"> and is2.spare5 = #{spare5}</if>
<if test="spare4 != null and spare4 != ''"> and is2.spare4 like concat('%', #{spare4}, '%')</if>
<if test="spare3 != null and spare3 != ''"> and is2.spare3 like concat('%', #{spare3}, '%')</if>
<if test="spare5 != null and spare5 != ''"> and is2.spare5 like concat('%', #{spare5}, '%')</if>
<if test="materialDesc !=null and materialDesc!=''">
and is2.stockin_id in (
select distinct stockin_id from in_stockin_detail isd
@@ -142,7 +140,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="spare5 != null">spare5,</if>
<if test="companyShortName != null">company_short_name,</if>
<if test="accountSetNo != null">account_set_no,</if>
</trim>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="stockinGuid != null">#{stockinGuid},</if>
<if test="stockinId != null and stockinId != ''">#{stockinId},</if>
@@ -163,9 +161,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="spare4 != null">#{spare4},</if>
<if test="spare3 != null">#{spare3},</if>
<if test="spare5 != null">#{spare5},</if>
<if test="company_short_name != null">#{companyShortName},</if>
<if test="account_set_no != null">#{accountSetNo},</if>
</trim>
<if test="companyShortName != null">#{companyShortName},</if>
<if test="accountSetNo != null">#{accountSetNo},</if>
</trim>
</insert>
<insert id="insertInStockinHistory">
insert into in_stockin_finish
@@ -245,3 +243,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</where>
</select>
</mapper>

20
ruoyi-admin/src/main/resources/mapper/in/TransferBillCallbackMapper.xml
View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8" ?>
<?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">
@@ -24,14 +24,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectTransferBillCallbackList" parameterType="TransferBillCallback" resultMap="TransferBillCallbackResult">
<include refid="selectTransferBillCallbackVo"/>
<where>
<if test="jobId != null and jobId != ''"> and job_id = #{jobId}</if>
<if test="erpBill != null and erpBill != ''"> and erp_bill = #{erpBill}</if>
<if test="type != null and type != ''"> and type = #{type}</if>
<if test="status != null and status != ''"> and status = #{status}</if>
<if test="finishTime != null and finishTime != ''"> and finish_time = #{finishTime}</if>
<if test="spare1 != null and spare1 != ''"> and spare1 = #{spare1}</if>
<if test="spare2 != null and spare2 != ''"> and spare2 = #{spare2}</if>
<if test="spare3 != null and spare3 != ''"> and spare3 = #{spare3}</if>
<if test="jobId != null and jobId != ''"> and job_id like concat('%', #{jobId}, '%')</if>
<if test="erpBill != null and erpBill != ''"> and erp_bill like concat('%', #{erpBill}, '%')</if>
<if test="type != null and type != ''"> and type like concat('%', #{type}, '%')</if>
<if test="status != null and status != ''"> and status like concat('%', #{status}, '%')</if>
<if test="finishTime != null and finishTime != ''"> and finish_time like concat('%', #{finishTime}, '%')</if>
<if test="spare1 != null and spare1 != ''"> and spare1 like concat('%', #{spare1}, '%')</if>
<if test="spare2 != null and spare2 != ''"> and spare2 like concat('%', #{spare2}, '%')</if>
<if test="spare3 != null and spare3 != ''"> and spare3 like concat('%', #{spare3}, '%')</if>
</where>
</select>
@@ -92,4 +92,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{id}
</foreach>
</delete>
</mapper>
</mapper>

55
ruoyi-admin/src/main/resources/mapper/job/MydoJobDetailFinishMapper.xml
View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8" ?>
<?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">
@@ -84,32 +84,32 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
from mydo_job_detail_finish mjd
left join bas_product bp on mjd.product_id = bp.product_id
<where>
<if test="jobDetailId != null and jobDetailId != ''"> and mjd.job_detail_id = #{jobDetailId}</if>
<if test="jobId != null and jobId != ''"> and mjd.job_id = #{jobId}</if>
<if test="stockId != null and stockId != ''"> and mjd.stock_id = #{stockId}</if>
<if test="lotNo != null and lotNo != ''"> and mjd.lot_no = #{lotNo}</if>
<if test="inDate != null and inDate != ''"> and mjd.in_date = #{inDate}</if>
<if test="inOrOutId != null and inOrOutId != ''"> and mjd.in_or_out_id = #{inOrOutId}</if>
<if test="inOrOutDId != null and inOrOutDId != ''"> and mjd.in_or_out_d_id = #{inOrOutDId}</if>
<if test="productGuid != null and productGuid != ''"> and mjd.product_guid = #{productGuid}</if>
<if test="productId != null and productId != ''"> and mjd.product_id = #{productId}</if>
<if test="stockStatus != null and stockStatus != ''"> and mjd.stock_status = #{stockStatus}</if>
<if test="inQuantity != null and inQuantity != ''"> and mjd.in_quantity = #{inQuantity}</if>
<if test="stockQuantity != null and stockQuantity != ''"> and mjd.stock_quantity = #{stockQuantity}</if>
<if test="outQuantity != null and outQuantity != ''"> and mjd.out_quantity = #{outQuantity}</if>
<if test="layerQuantity != null and layerQuantity != ''"> and mjd.layer_quantity = #{layerQuantity}</if>
<if test="outLayerQuantity != null and outLayerQuantity != ''"> and mjd.out_layer_quantity = #{outLayerQuantity}</if>
<if test="giveNum != null and giveNum != ''"> and mjd.give_num = #{giveNum}</if>
<if test="stockinId != null and stockinId != ''"> and mjd.stockin_id = #{stockinId}</if>
<if test="stackingId != null and stackingId != ''"> and mjd.stacking_id = #{stackingId}</if>
<if test="exitId != null and exitId != ''"> and mjd.exit_id = #{exitId}</if>
<if test="printDate != null and printDate != ''"> and mjd.print_date = #{printDate}</if>
<if test="customerId != null and customerId != ''"> and mjd.customer_id = #{customerId}</if>
<if test="supplierId != null and supplierId != ''"> and mjd.supplier_id = #{supplierId}</if>
<if test="spare1 != null and spare1 != ''"> and mjd.spare1 = #{spare1}</if>
<if test="spare2 != null and spare2 != ''"> and mjd.spare2 = #{spare2}</if>
<if test="spare3 != null and spare3 != ''"> and mjd.spare3 = #{spare3}</if>
<if test="spare4 != null and spare4 != ''"> and mjd.spare4 = #{spare4}</if>
<if test="jobDetailId != null and jobDetailId != ''"> and mjd.job_detail_id like concat('%', #{jobDetailId}, '%')</if>
<if test="jobId != null and jobId != ''"> and mjd.job_id like concat('%', #{jobId}, '%')</if>
<if test="stockId != null and stockId != ''"> and mjd.stock_id like concat('%', #{stockId}, '%')</if>
<if test="lotNo != null and lotNo != ''"> and mjd.lot_no like concat('%', #{lotNo}, '%')</if>
<if test="inDate != null and inDate != ''"> and mjd.in_date like concat('%', #{inDate}, '%')</if>
<if test="inOrOutId != null and inOrOutId != ''"> and mjd.in_or_out_id like concat('%', #{inOrOutId}, '%')</if>
<if test="inOrOutDId != null and inOrOutDId != ''"> and mjd.in_or_out_d_id like concat('%', #{inOrOutDId}, '%')</if>
<if test="productGuid != null and productGuid != ''"> and mjd.product_guid like concat('%', #{productGuid}, '%')</if>
<if test="productId != null and productId != ''"> and mjd.product_id like concat('%', #{productId}, '%')</if>
<if test="stockStatus != null and stockStatus != ''"> and mjd.stock_status like concat('%', #{stockStatus}, '%')</if>
<if test="inQuantity != null and inQuantity != ''"> and mjd.in_quantity like concat('%', #{inQuantity}, '%')</if>
<if test="stockQuantity != null and stockQuantity != ''"> and mjd.stock_quantity like concat('%', #{stockQuantity}, '%')</if>
<if test="outQuantity != null and outQuantity != ''"> and mjd.out_quantity like concat('%', #{outQuantity}, '%')</if>
<if test="layerQuantity != null and layerQuantity != ''"> and mjd.layer_quantity like concat('%', #{layerQuantity}, '%')</if>
<if test="outLayerQuantity != null and outLayerQuantity != ''"> and mjd.out_layer_quantity like concat('%', #{outLayerQuantity}, '%')</if>
<if test="giveNum != null and giveNum != ''"> and mjd.give_num like concat('%', #{giveNum}, '%')</if>
<if test="stockinId != null and stockinId != ''"> and mjd.stockin_id like concat('%', #{stockinId}, '%')</if>
<if test="stackingId != null and stackingId != ''"> and mjd.stacking_id like concat('%', #{stackingId}, '%')</if>
<if test="exitId != null and exitId != ''"> and mjd.exit_id like concat('%', #{exitId}, '%')</if>
<if test="printDate != null and printDate != ''"> and mjd.print_date like concat('%', #{printDate}, '%')</if>
<if test="customerId != null and customerId != ''"> and mjd.customer_id like concat('%', #{customerId}, '%')</if>
<if test="supplierId != null and supplierId != ''"> and mjd.supplier_id like concat('%', #{supplierId}, '%')</if>
<if test="spare1 != null and spare1 != ''"> and mjd.spare1 like concat('%', #{spare1}, '%')</if>
<if test="spare2 != null and spare2 != ''"> and mjd.spare2 like concat('%', #{spare2}, '%')</if>
<if test="spare3 != null and spare3 != ''"> and mjd.spare3 like concat('%', #{spare3}, '%')</if>
<if test="spare4 != null and spare4 != ''"> and mjd.spare4 like concat('%', #{spare4}, '%')</if>
</where>
</select>
@@ -299,3 +299,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</foreach>
</delete>
</mapper>

65
ruoyi-admin/src/main/resources/mapper/job/MydoJobDetailMapper.xml
View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8" ?>
<?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">
@@ -87,32 +87,32 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
from mydo_job_detail mjd
left join bas_product bp on mjd.product_id = bp.product_id
<where>
<if test="jobDetailId != null and jobDetailId != ''"> and mjd.job_detail_id = #{jobDetailId}</if>
<if test="jobId != null and jobId != ''"> and mjd.job_id = #{jobId}</if>
<if test="stockId != null and stockId != ''"> and mjd.stock_id = #{stockId}</if>
<if test="lotNo != null and lotNo != ''"> and mjd.lot_no = #{lotNo}</if>
<if test="inDate != null and inDate != ''"> and mjd.in_date = #{inDate}</if>
<if test="inOrOutId != null and inOrOutId != ''"> and mjd.in_or_out_id = #{inOrOutId}</if>
<if test="inOrOutDId != null and inOrOutDId != ''"> and mjd.in_or_out_d_id = #{inOrOutDId}</if>
<if test="productGuid != null and productGuid != ''"> and mjd.product_guid = #{productGuid}</if>
<if test="productId != null and productId != ''"> and mjd.product_id = #{productId}</if>
<if test="stockStatus != null and stockStatus != ''"> and mjd.stock_status = #{stockStatus}</if>
<if test="inQuantity != null and inQuantity != ''"> and mjd.in_quantity = #{inQuantity}</if>
<if test="stockQuantity != null and stockQuantity != ''"> and mjd.stock_quantity = #{stockQuantity}</if>
<if test="outQuantity != null and outQuantity != ''"> and mjd.out_quantity = #{outQuantity}</if>
<if test="layerQuantity != null and layerQuantity != ''"> and mjd.layer_quantity = #{layerQuantity}</if>
<if test="outLayerQuantity != null and outLayerQuantity != ''"> and mjd.out_layer_quantity = #{outLayerQuantity}</if>
<if test="giveNum != null and giveNum != ''"> and mjd.give_num = #{giveNum}</if>
<if test="stockinId != null and stockinId != ''"> and mjd.stockin_id = #{stockinId}</if>
<if test="stackingId != null and stackingId != ''"> and mjd.stacking_id = #{stackingId}</if>
<if test="exitId != null and exitId != ''"> and mjd.exit_id = #{exitId}</if>
<if test="printDate != null and printDate != ''"> and mjd.print_date = #{printDate}</if>
<if test="customerId != null and customerId != ''"> and mjd.customer_id = #{customerId}</if>
<if test="supplierId != null and supplierId != ''"> and mjd.supplier_id = #{supplierId}</if>
<if test="spare1 != null and spare1 != ''"> and mjd.spare1 = #{spare1}</if>
<if test="spare2 != null and spare2 != ''"> and mjd.spare2 = #{spare2}</if>
<if test="spare3 != null and spare3 != ''"> and mjd.spare3 = #{spare3}</if>
<if test="spare4 != null and spare4 != ''"> and mjd.spare4 = #{spare4}</if>
<if test="jobDetailId != null and jobDetailId != ''"> and mjd.job_detail_id like concat('%', #{jobDetailId}, '%')</if>
<if test="jobId != null and jobId != ''"> and mjd.job_id like concat('%', #{jobId}, '%')</if>
<if test="stockId != null and stockId != ''"> and mjd.stock_id like concat('%', #{stockId}, '%')</if>
<if test="lotNo != null and lotNo != ''"> and mjd.lot_no like concat('%', #{lotNo}, '%')</if>
<if test="inDate != null and inDate != ''"> and mjd.in_date like concat('%', #{inDate}, '%')</if>
<if test="inOrOutId != null and inOrOutId != ''"> and mjd.in_or_out_id like concat('%', #{inOrOutId}, '%')</if>
<if test="inOrOutDId != null and inOrOutDId != ''"> and mjd.in_or_out_d_id like concat('%', #{inOrOutDId}, '%')</if>
<if test="productGuid != null and productGuid != ''"> and mjd.product_guid like concat('%', #{productGuid}, '%')</if>
<if test="productId != null and productId != ''"> and mjd.product_id like concat('%', #{productId}, '%')</if>
<if test="stockStatus != null and stockStatus != ''"> and mjd.stock_status like concat('%', #{stockStatus}, '%')</if>
<if test="inQuantity != null and inQuantity != ''"> and mjd.in_quantity like concat('%', #{inQuantity}, '%')</if>
<if test="stockQuantity != null and stockQuantity != ''"> and mjd.stock_quantity like concat('%', #{stockQuantity}, '%')</if>
<if test="outQuantity != null and outQuantity != ''"> and mjd.out_quantity like concat('%', #{outQuantity}, '%')</if>
<if test="layerQuantity != null and layerQuantity != ''"> and mjd.layer_quantity like concat('%', #{layerQuantity}, '%')</if>
<if test="outLayerQuantity != null and outLayerQuantity != ''"> and mjd.out_layer_quantity like concat('%', #{outLayerQuantity}, '%')</if>
<if test="giveNum != null and giveNum != ''"> and mjd.give_num like concat('%', #{giveNum}, '%')</if>
<if test="stockinId != null and stockinId != ''"> and mjd.stockin_id like concat('%', #{stockinId}, '%')</if>
<if test="stackingId != null and stackingId != ''"> and mjd.stacking_id like concat('%', #{stackingId}, '%')</if>
<if test="exitId != null and exitId != ''"> and mjd.exit_id like concat('%', #{exitId}, '%')</if>
<if test="printDate != null and printDate != ''"> and mjd.print_date like concat('%', #{printDate}, '%')</if>
<if test="customerId != null and customerId != ''"> and mjd.customer_id like concat('%', #{customerId}, '%')</if>
<if test="supplierId != null and supplierId != ''"> and mjd.supplier_id like concat('%', #{supplierId}, '%')</if>
<if test="spare1 != null and spare1 != ''"> and mjd.spare1 like concat('%', #{spare1}, '%')</if>
<if test="spare2 != null and spare2 != ''"> and mjd.spare2 like concat('%', #{spare2}, '%')</if>
<if test="spare3 != null and spare3 != ''"> and mjd.spare3 like concat('%', #{spare3}, '%')</if>
<if test="spare4 != null and spare4 != ''"> and mjd.spare4 like concat('%', #{spare4}, '%')</if>
</where>
</select>
@@ -404,7 +404,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
mjd.spare4,
mjd.pick_quantity,
mjd.out_quantity-mjd.pick_quantity as pick_quantity_real,
mjd.product_name,
bp.product_name,
mjd.spare5,
mjd.spare6,
mjd.spare7,
@@ -415,11 +415,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
mj.tray_code
from mydo_job_detail mjd
left join bas_product bp on mjd.product_id = bp.product_id
left join mydo_job mj on mjd.job_id = mj.job_id
where tray_code=#{trayCode}
where mj.exit_id=#{exitId}
and mj.status='3'
and mj.in_or_out = #{inOrOut}
and mj.execution_phase=2
and mj.in_or_out like concat('%', #{inOrOut}, '%')
</select>
</mapper>

87
ruoyi-admin/src/main/resources/mapper/job/MydoJobFinishMapper.xml
View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8" ?>
<?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">
@@ -60,30 +60,30 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectMydoJobFinishList" parameterType="MydoJobFinish" resultMap="MydoJobFinishResult">
<include refid="selectMydoJobFinishVo"/>
<where>
<if test="jobId != null and jobId != ''"> and mj.job_id = #{jobId}</if>
<if test="status != null and status != ''"> and mj.status = #{status}</if>
<if test="onLineType != null and onLineType != ''"> and mj.on_line_type = #{onLineType}</if>
<if test="taskNo != null and taskNo != ''"> and mj.task_no = #{taskNo}</if>
<if test="supplierId != null and supplierId != ''"> and mj.supplier_id = #{supplierId}</if>
<if test="customerId != null and customerId != ''"> and mj.customer_id = #{customerId}</if>
<if test="departmentId != null and departmentId != ''"> and mj.department_id = #{departmentId}</if>
<if test="trayCode != null and trayCode != ''"> and mj.tray_code = #{trayCode}</if>
<if test="roadwayId != null and roadwayId != ''"> and mj.roadway_id = #{roadwayId}</if>
<if test="cargoSpaceId != null and cargoSpaceId != ''"> and mj.cargo_space_id = #{cargoSpaceId}</if>
<if test="targetRoadwayId != null and targetRoadwayId != ''"> and mj.target_roadway_id = #{targetRoadwayId}</if>
<if test="targetCargoSpaceId != null and targetCargoSpaceId != ''"> and mj.target_cargo_space_id = #{targetCargoSpaceId}</if>
<if test="lineId != null and lineId != ''"> and mj.line_id = #{lineId}</if>
<if test="workshopId != null and workshopId != ''"> and mj.workshop_id = #{workshopId}</if>
<if test="priority != null "> and mj.priority = #{priority}</if>
<if test="executionPhase != null and executionPhase != ''"> and mj.execution_phase = #{executionPhase}</if>
<if test="inOrOut != null and inOrOut != ''"> and mj.in_or_out = #{inOrOut}</if>
<if test="jobId != null and jobId != ''"> and mj.job_id like concat('%', #{jobId}, '%')</if>
<if test="status != null and status != ''"> and mj.status like concat('%', #{status}, '%')</if>
<if test="onLineType != null and onLineType != ''"> and mj.on_line_type like concat('%', #{onLineType}, '%')</if>
<if test="taskNo != null and taskNo != ''"> and mj.task_no like concat('%', #{taskNo}, '%')</if>
<if test="supplierId != null and supplierId != ''"> and mj.supplier_id like concat('%', #{supplierId}, '%')</if>
<if test="customerId != null and customerId != ''"> and mj.customer_id like concat('%', #{customerId}, '%')</if>
<if test="departmentId != null and departmentId != ''"> and mj.department_id like concat('%', #{departmentId}, '%')</if>
<if test="trayCode != null and trayCode != ''"> and mj.tray_code like concat('%', #{trayCode}, '%')</if>
<if test="roadwayId != null and roadwayId != ''"> and mj.roadway_id like concat('%', #{roadwayId}, '%')</if>
<if test="cargoSpaceId != null and cargoSpaceId != ''"> and mj.cargo_space_id like concat('%', #{cargoSpaceId}, '%')</if>
<if test="targetRoadwayId != null and targetRoadwayId != ''"> and mj.target_roadway_id like concat('%', #{targetRoadwayId}, '%')</if>
<if test="targetCargoSpaceId != null and targetCargoSpaceId != ''"> and mj.target_cargo_space_id like concat('%', #{targetCargoSpaceId}, '%')</if>
<if test="lineId != null and lineId != ''"> and mj.line_id like concat('%', #{lineId}, '%')</if>
<if test="workshopId != null and workshopId != ''"> and mj.workshop_id like concat('%', #{workshopId}, '%')</if>
<if test="priority != null "> and mj.priority like concat('%', #{priority}, '%')</if>
<if test="executionPhase != null and executionPhase != ''"> and mj.execution_phase like concat('%', #{executionPhase}, '%')</if>
<if test="inOrOut != null and inOrOut != ''"> and mj.in_or_out like concat('%', #{inOrOut}, '%')</if>
<if test="startTime != null and startTime != ''"> and mj.start_time like concat('%', #{startTime}, '%')</if>
<if test="finishTime != null and finishTime != ''"> and mj.finish_time like concat('%', #{finishTime}, '%')</if>
<if test="entranceId != null and entranceId != ''"> and mj.entrance_id = #{entranceId}</if>
<if test="exitId != null and exitId != ''"> and mj.exit_id = #{exitId}</if>
<if test="classId != null and classId != ''"> and mj.class_id = #{classId}</if>
<if test="warehouseId != null and warehouseId != ''"> and mj.warehouse_id = #{warehouseId}</if>
<if test="faultFlag != null and faultFlag != ''"> and mj.fault_flag = #{faultFlag}</if>
<if test="entranceId != null and entranceId != ''"> and mj.entrance_id like concat('%', #{entranceId}, '%')</if>
<if test="exitId != null and exitId != ''"> and mj.exit_id like concat('%', #{exitId}, '%')</if>
<if test="classId != null and classId != ''"> and mj.class_id like concat('%', #{classId}, '%')</if>
<if test="warehouseId != null and warehouseId != ''"> and mj.warehouse_id like concat('%', #{warehouseId}, '%')</if>
<if test="faultFlag != null and faultFlag != ''"> and mj.fault_flag like concat('%', #{faultFlag}, '%')</if>
<if test="inOut != null and inOut != '' and inOut =='2'.toString "> and mj.in_or_out >=20</if>
<if test="inOut != null and inOut != '' and inOut =='1'.toString "> and mj.in_or_out &lt; 20</if>
<if test="inOut != null and inOut != '' and inOut =='3'.toString "> and mj.in_or_out in (5,6)</if>
@@ -121,30 +121,30 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
left join mydo_job_detail mjd on mj.job_id = mjd.job_id
<where>
<if test="jobId != null and jobId != ''"> and mj.job_id = #{jobId}</if>
<if test="status != null and status != ''"> and mj.status = #{status}</if>
<if test="onLineType != null and onLineType != ''"> and mj.on_line_type = #{onLineType}</if>
<if test="taskNo != null and taskNo != ''"> and mj.task_no = #{taskNo}</if>
<if test="supplierId != null and supplierId != ''"> and mj.supplier_id = #{supplierId}</if>
<if test="customerId != null and customerId != ''"> and mj.customer_id = #{customerId}</if>
<if test="departmentId != null and departmentId != ''"> and mj.department_id = #{departmentId}</if>
<if test="jobId != null and jobId != ''"> and mj.job_id like concat('%', #{jobId}, '%')</if>
<if test="status != null and status != ''"> and mj.status like concat('%', #{status}, '%')</if>
<if test="onLineType != null and onLineType != ''"> and mj.on_line_type like concat('%', #{onLineType}, '%')</if>
<if test="taskNo != null and taskNo != ''"> and mj.task_no like concat('%', #{taskNo}, '%')</if>
<if test="supplierId != null and supplierId != ''"> and mj.supplier_id like concat('%', #{supplierId}, '%')</if>
<if test="customerId != null and customerId != ''"> and mj.customer_id like concat('%', #{customerId}, '%')</if>
<if test="departmentId != null and departmentId != ''"> and mj.department_id like concat('%', #{departmentId}, '%')</if>
<if test="trayCode != null and trayCode != ''"> and mj.tray_code like concat('%', #{trayCode}, '%')</if>
<if test="roadwayId != null and roadwayId != ''"> and mj.roadway_id = #{roadwayId}</if>
<if test="cargoSpaceId != null and cargoSpaceId != ''"> and mj.cargo_space_id = #{cargoSpaceId}</if>
<if test="targetRoadwayId != null and targetRoadwayId != ''"> and mj.target_roadway_id = #{targetRoadwayId}</if>
<if test="targetCargoSpaceId != null and targetCargoSpaceId != ''"> and mj.target_cargo_space_id = #{targetCargoSpaceId}</if>
<if test="roadwayId != null and roadwayId != ''"> and mj.roadway_id like concat('%', #{roadwayId}, '%')</if>
<if test="cargoSpaceId != null and cargoSpaceId != ''"> and mj.cargo_space_id like concat('%', #{cargoSpaceId}, '%')</if>
<if test="targetRoadwayId != null and targetRoadwayId != ''"> and mj.target_roadway_id like concat('%', #{targetRoadwayId}, '%')</if>
<if test="targetCargoSpaceId != null and targetCargoSpaceId != ''"> and mj.target_cargo_space_id like concat('%', #{targetCargoSpaceId}, '%')</if>
<if test="lineId != null and lineId != ''"> and mj.line_id like concat('%', #{lineId}, '%') </if>
<if test="workshopId != null and workshopId != ''"> and mj.workshop_id = #{workshopId}</if>
<if test="priority != null "> and mj.priority = #{priority}</if>
<if test="executionPhase != null and executionPhase != ''"> and mj.execution_phase = #{executionPhase}</if>
<if test="inOrOut != null and inOrOut != ''"> and mj.in_or_out = #{inOrOut}</if>
<if test="workshopId != null and workshopId != ''"> and mj.workshop_id like concat('%', #{workshopId}, '%')</if>
<if test="priority != null "> and mj.priority like concat('%', #{priority}, '%')</if>
<if test="executionPhase != null and executionPhase != ''"> and mj.execution_phase like concat('%', #{executionPhase}, '%')</if>
<if test="inOrOut != null and inOrOut != ''"> and mj.in_or_out like concat('%', #{inOrOut}, '%')</if>
<if test="startTime != null and startTime != ''"> and mj.create_time &gt;= #{startTime}</if>
<if test="finishTime != null and finishTime != ''"> and mj.create_time &lt;= #{finishTime}</if>
<if test="entranceId != null and entranceId != ''"> and mj.entrance_id = #{entranceId}</if>
<if test="exitId != null and exitId != ''"> and mj.exit_id = #{exitId}</if>
<if test="classId != null and classId != ''"> and mj.class_id = #{classId}</if>
<if test="warehouseId != null and warehouseId != ''"> and mj.warehouse_id = #{warehouseId}</if>
<if test="faultFlag != null and faultFlag != ''"> and mj.fault_flag = #{faultFlag}</if>
<if test="entranceId != null and entranceId != ''"> and mj.entrance_id like concat('%', #{entranceId}, '%')</if>
<if test="exitId != null and exitId != ''"> and mj.exit_id like concat('%', #{exitId}, '%')</if>
<if test="classId != null and classId != ''"> and mj.class_id like concat('%', #{classId}, '%')</if>
<if test="warehouseId != null and warehouseId != ''"> and mj.warehouse_id like concat('%', #{warehouseId}, '%')</if>
<if test="faultFlag != null and faultFlag != ''"> and mj.fault_flag like concat('%', #{faultFlag}, '%')</if>
<if test="inOut != null and inOut != '' and inOut =='2'.toString "> and mj.in_or_out >=20 and mj.in_or_out not in(28)</if>
<if test="inOut != null and inOut != '' and inOut =='1'.toString "> and mj.in_or_out &lt; 20 and mj.in_or_out not in(5,6)</if>
<if test="inOut != null and inOut != '' and inOut =='3'.toString "> and mj.in_or_out in (5,6)</if>
@@ -260,3 +260,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</foreach>
</delete>
</mapper>

47
ruoyi-admin/src/main/resources/mapper/job/MydoJobMapper.xml
View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8" ?>
<?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">
@@ -75,30 +75,30 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
left join mydo_job_detail mjd on mj.job_id = mjd.job_id
<where>
<if test="jobId != null and jobId != ''"> and mj.job_id = #{jobId}</if>
<if test="status != null and status != ''"> and mj.status = #{status}</if>
<if test="onLineType != null and onLineType != ''"> and mj.on_line_type = #{onLineType}</if>
<if test="taskNo != null and taskNo != ''"> and mj.task_no = #{taskNo}</if>
<if test="supplierId != null and supplierId != ''"> and mj.supplier_id = #{supplierId}</if>
<if test="customerId != null and customerId != ''"> and mj.customer_id = #{customerId}</if>
<if test="departmentId != null and departmentId != ''"> and mj.department_id = #{departmentId}</if>
<if test="jobId != null and jobId != ''"> and mj.job_id like concat('%', #{jobId}, '%')</if>
<if test="status != null and status != ''"> and mj.status like concat('%', #{status}, '%')</if>
<if test="onLineType != null and onLineType != ''"> and mj.on_line_type like concat('%', #{onLineType}, '%')</if>
<if test="taskNo != null and taskNo != ''"> and mj.task_no like concat('%', #{taskNo}, '%')</if>
<if test="supplierId != null and supplierId != ''"> and mj.supplier_id like concat('%', #{supplierId}, '%')</if>
<if test="customerId != null and customerId != ''"> and mj.customer_id like concat('%', #{customerId}, '%')</if>
<if test="departmentId != null and departmentId != ''"> and mj.department_id like concat('%', #{departmentId}, '%')</if>
<if test="trayCode != null and trayCode != ''"> and mj.tray_code like concat('%',#{trayCode},'%')</if>
<if test="roadwayId != null and roadwayId != ''"> and mj.roadway_id = #{roadwayId}</if>
<if test="cargoSpaceId != null and cargoSpaceId != ''"> and mj.cargo_space_id = #{cargoSpaceId}</if>
<if test="targetRoadwayId != null and targetRoadwayId != ''"> and mj.target_roadway_id = #{targetRoadwayId}</if>
<if test="targetCargoSpaceId != null and targetCargoSpaceId != ''"> and mj.target_cargo_space_id = #{targetCargoSpaceId}</if>
<if test="roadwayId != null and roadwayId != ''"> and mj.roadway_id like concat('%', #{roadwayId}, '%')</if>
<if test="cargoSpaceId != null and cargoSpaceId != ''"> and mj.cargo_space_id like concat('%', #{cargoSpaceId}, '%')</if>
<if test="targetRoadwayId != null and targetRoadwayId != ''"> and mj.target_roadway_id like concat('%', #{targetRoadwayId}, '%')</if>
<if test="targetCargoSpaceId != null and targetCargoSpaceId != ''"> and mj.target_cargo_space_id like concat('%', #{targetCargoSpaceId}, '%')</if>
<if test="lineId != null and lineId != ''"> and mj.line_id like concat('%', #{lineId}, '%') </if>
<if test="workshopId != null and workshopId != ''"> and mj.workshop_id = #{workshopId}</if>
<if test="priority != null "> and mj.priority = #{priority}</if>
<if test="executionPhase != null and executionPhase != ''"> and mj.execution_phase = #{executionPhase}</if>
<if test="inOrOut != null and inOrOut != ''"> and mj.in_or_out = #{inOrOut}</if>
<if test="workshopId != null and workshopId != ''"> and mj.workshop_id like concat('%', #{workshopId}, '%')</if>
<if test="priority != null "> and mj.priority like concat('%', #{priority}, '%')</if>
<if test="executionPhase != null and executionPhase != ''"> and mj.execution_phase like concat('%', #{executionPhase}, '%')</if>
<if test="inOrOut != null and inOrOut != ''"> and mj.in_or_out like concat('%', #{inOrOut}, '%')</if>
<if test="startTime != null and startTime != ''"> and mj.create_time &gt;= #{startTime}</if>
<if test="finishTime != null and finishTime != ''"> and mj.create_time &lt;= #{finishTime}</if>
<if test="entranceId != null and entranceId != ''"> and mj.entrance_id like concat('%',#{entranceId},'%')</if>
<if test="exitId != null and exitId != ''"> and mj.exit_id like concat('%', #{exitId}, '%')</if>
<if test="classId != null and classId != ''"> and mj.class_id = #{classId}</if>
<if test="warehouseId != null and warehouseId != ''"> and mj.warehouse_id = #{warehouseId}</if>
<if test="faultFlag != null and faultFlag != ''"> and mj.fault_flag = #{faultFlag}</if>
<if test="classId != null and classId != ''"> and mj.class_id like concat('%', #{classId}, '%')</if>
<if test="warehouseId != null and warehouseId != ''"> and mj.warehouse_id like concat('%', #{warehouseId}, '%')</if>
<if test="faultFlag != null and faultFlag != ''"> and mj.fault_flag like concat('%', #{faultFlag}, '%')</if>
<if test="inOut != null and inOut != '' and inOut =='2'.toString "> and mj.in_or_out >=20 </if>
<if test="inOut != null and inOut != '' and inOut =='1'.toString "> and mj.in_or_out &lt; 20 </if>
<if test="inOut != null and inOut != '' and inOut =='3'.toString "> and mj.in_or_out in (5,6)</if>
@@ -243,10 +243,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectMydoJobByEntranceId" parameterType="MydoJob" resultMap="MydoJobResult">
select top(1)* from mydo_job mj
where in_or_out&lt;20
and mj.tray_code = #{trayCode}
<!-- <if test="lineId != null and lineId != ''"> and mj.line_id = #{lineId}</if>-->
<!-- <if test="workshopId != null and workshopId != ''"> and mj.workshop_id = #{workshopId}</if>-->
where in_or_out&lt;20 and mj.entrance_id like concat('%', #{entranceId}, '%')
and mj.status like concat('%', #{status}, '%')
<if test="lineId != null and lineId != ''"> and mj.line_id like concat('%', #{lineId}, '%')</if>
<if test="workshopId != null and workshopId != ''"> and mj.workshop_id like concat('%', #{workshopId}, '%')</if>
order by mj.create_time
</select>
@@ -279,3 +279,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
)}
</select>
</mapper>

105
ruoyi-admin/src/main/resources/mapper/mapper/agv/AgvContainerTaskMapper.xml Normal file
View File

@@ -0,0 +1,105 @@
<?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.device.agv.mapper.AgvContainerTaskMapper">
<resultMap type="AgvContainerTask" id="AgvContainerTaskResult">
<result property="id" column="id" />
<result property="container" column="container" />
<result property="startPoint" column="start_point" />
<result property="endPoint" column="end_point" />
<result property="createTime" column="create_time" />
<result property="startTime" column="start_time" />
<result property="finishTime" column="finish_time" />
<result property="taskNo" column="task_no" />
<result property="status" column="status" />
<result property="spare1" column="spare1" />
<result property="spare2" column="spare2" />
</resultMap>
<sql id="selectAgvContainerTaskVo">
select id, container, start_point, end_point, create_time, start_time, finish_time, task_no, status, spare1, spare2 from agv_container_task
</sql>
<select id="selectAgvContainerTaskList" parameterType="AgvContainerTask" resultMap="AgvContainerTaskResult">
<include refid="selectAgvContainerTaskVo"/>
<where>
<if test="container != null and container != ''"> and container like concat("%", #{container}, "%")</if>
<if test="startPoint != null and startPoint != ''"> and start_point like concat("%", #{startPoint}, "%")</if>
<if test="endPoint != null and endPoint != ''"> and end_point like concat("%", #{endPoint}, "%")</if>
<if test="startTime != null and startTime != ''"> and start_time like concat("%", #{startTime}, "%")</if>
<if test="finishTime != null and finishTime != ''"> and finish_time like concat("%", #{finishTime}, "%")</if>
<if test="taskNo != null and taskNo != ''"> and task_no like concat("%", #{taskNo}, "%")</if>
<if test="status != null and status != ''"> and status like concat("%", #{status}, "%")</if>
<if test="spare1 != null and spare1 != ''"> and spare1 like concat("%", #{spare1}, "%")</if>
<if test="spare2 != null and spare2 != ''"> and spare2 like concat("%", #{spare2}, "%")</if>
</where>
</select>
<select id="selectAgvContainerTaskById" parameterType="Long" resultMap="AgvContainerTaskResult">
<include refid="selectAgvContainerTaskVo"/>
where id = #{id}
</select>
<insert id="insertAgvContainerTask" parameterType="AgvContainerTask" useGeneratedKeys="true" keyProperty="id">
insert into agv_container_task
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="container != null">container,</if>
<if test="startPoint != null">start_point,</if>
<if test="endPoint != null">end_point,</if>
<if test="createTime != null">create_time,</if>
<if test="startTime != null">start_time,</if>
<if test="finishTime != null">finish_time,</if>
<if test="taskNo != null">task_no,</if>
<if test="status != null">status,</if>
<if test="spare1 != null">spare1,</if>
<if test="spare2 != null">spare2,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="container != null">#{container},</if>
<if test="startPoint != null">#{startPoint},</if>
<if test="endPoint != null">#{endPoint},</if>
<if test="createTime != null">#{createTime},</if>
<if test="startTime != null">#{startTime},</if>
<if test="finishTime != null">#{finishTime},</if>
<if test="taskNo != null">#{taskNo},</if>
<if test="status != null">#{status},</if>
<if test="spare1 != null">#{spare1},</if>
<if test="spare2 != null">#{spare2},</if>
</trim>
</insert>
<insert id="insertHistory">
insert into agv_container_task_finish
select * from agv_container_task where id = #{id}
</insert>
<update id="updateAgvContainerTask" parameterType="AgvContainerTask">
update agv_container_task
<trim prefix="SET" suffixOverrides=",">
<if test="container != null">container = #{container},</if>
<if test="startPoint != null">start_point = #{startPoint},</if>
<if test="endPoint != null">end_point = #{endPoint},</if>
<if test="createTime != null">create_time = #{createTime},</if>
<if test="startTime != null">start_time = #{startTime},</if>
<if test="finishTime != null">finish_time = #{finishTime},</if>
<if test="taskNo != null">task_no = #{taskNo},</if>
<if test="status != null">status = #{status},</if>
<if test="spare1 != null">spare1 = #{spare1},</if>
<if test="spare2 != null">spare2 = #{spare2},</if>
</trim>
where id = #{id}
</update>
<delete id="deleteAgvContainerTaskById" parameterType="Long">
delete from agv_container_task where id = #{id}
</delete>
<delete id="deleteAgvContainerTaskByIds" parameterType="String">
delete from agv_container_task where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
</delete>
</mapper>

118
ruoyi-admin/src/main/resources/mapper/mapper/ai/ChatMessageMapper.xml Normal file
View File

@@ -0,0 +1,118 @@
<?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.ai.message.mapper.ChatMessageMapper">
<resultMap type="ChatMessage" id="ChatMessageResult">
<result property="id" column="id" />
<result property="sessionId" column="session_id" />
<result property="conversationId" column="conversation_id" />
<result property="content" column="content" />
<result property="role" column="role" />
<result property="deductCost" column="deduct_cost" />
<result property="totalTokens" column="total_tokens" />
<result property="modelName" column="model_name" />
<result property="createDept" column="create_dept" />
<result property="createBy" column="create_by" />
<result property="createTime" column="create_time" />
<result property="updateBy" column="update_by" />
<result property="updateTime" column="update_time" />
<result property="remark" column="remark" />
</resultMap>
<sql id="selectChatMessageVo">
select id, session_id, conversation_id, content, role, deduct_cost, total_tokens, model_name, create_dept, create_by, create_time, update_by, update_time, remark from chat_message
</sql>
<select id="selectChatMessageList" parameterType="ChatMessage" resultMap="ChatMessageResult">
<include refid="selectChatMessageVo"/>
<where>
<if test="sessionId != null "> and session_id like concat("%", #{sessionId}, "%")</if>
<if test="conversationId != null "> and conversation_id like concat("%", #{conversationId}, "%")</if>
<if test="content != null and content != ''"> and content like concat("%", #{content}, "%")</if>
<if test="role != null and role != ''"> and role like concat("%", #{role}, "%")</if>
<if test="deductCost != null "> and deduct_cost like concat("%", #{deductCost}, "%")</if>
<if test="totalTokens != null "> and total_tokens like concat("%", #{totalTokens}, "%")</if>
<if test="modelName != null and modelName != ''"> and model_name like concat('%', #{modelName}, '%')</if>
<if test="createDept != null "> and create_dept like concat("%", #{createDept}, "%")</if>
</where>
order by create_time asc
</select>
<select id="selectChatMessageById" parameterType="Long" resultMap="ChatMessageResult">
<include refid="selectChatMessageVo"/>
where id = #{id}
</select>
<insert id="insertChatMessage" parameterType="ChatMessage">
insert into chat_message
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">id,</if>
<if test="sessionId != null">session_id,</if>
<if test="conversationId != null">conversation_id,</if>
<if test="content != null">content,</if>
<if test="role != null">role,</if>
<if test="deductCost != null">deduct_cost,</if>
<if test="totalTokens != null">total_tokens,</if>
<if test="modelName != null">model_name,</if>
<if test="createDept != null">create_dept,</if>
<if test="createBy != null">create_by,</if>
<if test="createTime != null">create_time,</if>
<if test="updateBy != null">update_by,</if>
<if test="updateTime != null">update_time,</if>
<if test="remark != null">remark,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">#{id},</if>
<if test="sessionId != null">#{sessionId},</if>
<if test="conversationId != null">#{conversationId},</if>
<if test="content != null">#{content},</if>
<if test="role != null">#{role},</if>
<if test="deductCost != null">#{deductCost},</if>
<if test="totalTokens != null">#{totalTokens},</if>
<if test="modelName != null">#{modelName},</if>
<if test="createDept != null">#{createDept},</if>
<if test="createBy != null">#{createBy},</if>
<if test="createTime != null">#{createTime},</if>
<if test="updateBy != null">#{updateBy},</if>
<if test="updateTime != null">#{updateTime},</if>
<if test="remark != null">#{remark},</if>
</trim>
</insert>
<update id="updateChatMessage" parameterType="ChatMessage">
update chat_message
<trim prefix="SET" suffixOverrides=",">
<if test="sessionId != null">session_id = #{sessionId},</if>
<if test="conversationId != null">conversation_id = #{conversationId},</if>
<if test="content != null">content = #{content},</if>
<if test="role != null">role = #{role},</if>
<if test="deductCost != null">deduct_cost = #{deductCost},</if>
<if test="totalTokens != null">total_tokens = #{totalTokens},</if>
<if test="modelName != null">model_name = #{modelName},</if>
<if test="createDept != null">create_dept = #{createDept},</if>
<if test="createBy != null">create_by = #{createBy},</if>
<if test="createTime != null">create_time = #{createTime},</if>
<if test="updateBy != null">update_by = #{updateBy},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>
<if test="remark != null">remark = #{remark},</if>
</trim>
where id = #{id}
</update>
<delete id="deleteChatMessageById" parameterType="Long">
delete from chat_message where id = #{id}
</delete>
<delete id="deleteChatMessageByIds" parameterType="String">
delete from chat_message where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
</delete>
<delete id="deleteChatMessageByConversationId">
delete from chat_message where conversation_id = #{conversationId}
</delete>
</mapper>

108
ruoyi-admin/src/main/resources/mapper/mapper/ai/ConversationsMapper.xml Normal file
View File

@@ -0,0 +1,108 @@
<?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.ai.conversation.mapper.ConversationsMapper">
<resultMap type="Conversations" id="ConversationsResult">
<result property="id" column="id" />
<result property="sessionId" column="session_id" />
<result property="userId" column="user_id" />
<result property="title" column="title" />
<result property="status" column="status" />
<result property="metadata" column="metadata" />
<result property="firstQuery" column="first_query" />
<result property="messageCount" column="message_count" />
<result property="tokenUsage" column="token_usage" />
<result property="createdAt" column="created_at" />
<result property="updatedAt" column="updated_at" />
<result property="lastInteractionAt" column="last_interaction_at" />
</resultMap>
<sql id="selectConversationsVo">
select id, session_id, user_id, title, status, metadata, first_query, message_count, token_usage, created_at, updated_at, last_interaction_at from conversations
</sql>
<select id="selectConversationsList" parameterType="Conversations" resultMap="ConversationsResult">
<include refid="selectConversationsVo"/>
<where>
<if test="sessionId != null and sessionId != ''"> and session_id like concat("%", #{sessionId}, "%")</if>
<if test="userId != null and userId != ''"> and user_id like concat("%", #{userId}, "%")</if>
<if test="title != null and title != ''"> and title like concat("%", #{title}, "%")</if>
<if test="status != null and status != ''"> and status like concat("%", #{status}, "%")</if>
<if test="metadata != null and metadata != ''"> and metadata like concat("%", #{metadata}, "%")</if>
<if test="firstQuery != null and firstQuery != ''"> and first_query like concat("%", #{firstQuery}, "%")</if>
<if test="messageCount != null "> and message_count like concat("%", #{messageCount}, "%")</if>
<if test="tokenUsage != null "> and token_usage like concat("%", #{tokenUsage}, "%")</if>
<if test="createdAt != null "> and created_at like concat("%", #{createdAt}, "%")</if>
<if test="updatedAt != null "> and updated_at like concat("%", #{updatedAt}, "%")</if>
<if test="lastInteractionAt != null "> and last_interaction_at like concat("%", #{lastInteractionAt}, "%")</if>
order by id desc
</where>
</select>
<select id="selectConversationsById" parameterType="Long" resultMap="ConversationsResult">
<include refid="selectConversationsVo"/>
where id = #{id}
</select>
<insert id="insertConversations" parameterType="Conversations" useGeneratedKeys="true" keyProperty="id">
insert into conversations
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="sessionId != null and sessionId != ''">session_id,</if>
<if test="userId != null and userId != ''">user_id,</if>
<if test="title != null">title,</if>
<if test="status != null">status,</if>
<if test="metadata != null">metadata,</if>
<if test="firstQuery != null">first_query,</if>
<if test="messageCount != null">message_count,</if>
<if test="tokenUsage != null">token_usage,</if>
<if test="createdAt != null">created_at,</if>
<if test="updatedAt != null">updated_at,</if>
<if test="lastInteractionAt != null">last_interaction_at,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="sessionId != null and sessionId != ''">#{sessionId},</if>
<if test="userId != null and userId != ''">#{userId},</if>
<if test="title != null">#{title},</if>
<if test="status != null">#{status},</if>
<if test="metadata != null">#{metadata},</if>
<if test="firstQuery != null">#{firstQuery},</if>
<if test="messageCount != null">#{messageCount},</if>
<if test="tokenUsage != null">#{tokenUsage},</if>
<if test="createdAt != null">#{createdAt},</if>
<if test="updatedAt != null">#{updatedAt},</if>
<if test="lastInteractionAt != null">#{lastInteractionAt},</if>
</trim>
</insert>
<update id="updateConversations" parameterType="Conversations">
update conversations
<trim prefix="SET" suffixOverrides=",">
<if test="sessionId != null and sessionId != ''">session_id = #{sessionId},</if>
<if test="userId != null and userId != ''">user_id = #{userId},</if>
<if test="title != null">title = #{title},</if>
<if test="status != null">status = #{status},</if>
<if test="metadata != null">metadata = #{metadata},</if>
<if test="firstQuery != null">first_query = #{firstQuery},</if>
<if test="messageCount != null">message_count = #{messageCount},</if>
<if test="tokenUsage != null">token_usage = #{tokenUsage},</if>
<if test="createdAt != null">created_at = #{createdAt},</if>
<if test="updatedAt != null">updated_at = #{updatedAt},</if>
<if test="lastInteractionAt != null">last_interaction_at = #{lastInteractionAt},</if>
</trim>
where id = #{id}
</update>
<delete id="deleteConversationsById" parameterType="Long">
delete from conversations where id = #{id}
</delete>
<delete id="deleteConversationsByIds" parameterType="String">
delete from conversations where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
</delete>
</mapper>

36
ruoyi-admin/src/main/resources/mapper/mapper/api/JobStatisticsMapper.xml Normal file
View File

@@ -0,0 +1,36 @@
<?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.api.mapper.JobStatisticsMapper">
<!-- 查询当日入库数量 -->
<select id="selectDailyInCount" parameterType="String" resultType="Integer">
SELECT COUNT(1)
FROM mydo_job_finish
WHERE CONVERT(varchar(10), create_time, 120) = #{createTime}
AND in_or_out &lt; 20
</select>
<!-- 查询当日出库数量 -->
<select id="selectDailyOutCount" parameterType="String" resultType="Integer">
SELECT COUNT(1)
FROM mydo_job_finish
WHERE CONVERT(varchar(10), create_time, 120) = #{createTime}
AND in_or_out >= 20
</select>
<!-- 查询当月每日入库出库统计 -->
<select id="selectMonthlyStatistics" resultType="java.util.Map">
SELECT
DAY(create_time) as date,
SUM(CASE WHEN in_or_out &lt; 20 THEN 1 ELSE 0 END) as '入库',
SUM(CASE WHEN in_or_out >= 20 THEN 1 ELSE 0 END) as '出库'
FROM mydo_job_finish
WHERE YEAR(create_time) = #{year}
AND MONTH(create_time) = #{month}
GROUP BY DAY(create_time)
ORDER BY date
</select>
</mapper>

106
ruoyi-admin/src/main/resources/mapper/mapper/api/KnowledgeFileMapper.xml Normal file
View File

@@ -0,0 +1,106 @@
<?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.ai.vector.mapper.KnowledgeFileMapper">
<resultMap type="KnowledgeFile" id="KnowledgeFileResult">
<result property="id" column="id" />
<result property="knowledgeBaseId" column="knowledge_base_id" />
<result property="fileName" column="file_name" />
<result property="filePath" column="file_path" />
<result property="fileSize" column="file_size" />
<result property="fileType" column="file_type" />
<result property="description" column="description" />
<result property="isVectorized" column="is_vectorized" />
<result property="vectorizedTime" column="vectorized_time" />
<result property="uploadTime" column="upload_time" />
<result property="updatedAt" column="updated_at" />
<result property="isDeleted" column="is_deleted" />
</resultMap>
<sql id="selectKnowledgeFileVo">
select id, knowledge_base_id, file_name, file_path, file_size, file_type, description, is_vectorized, vectorized_time, upload_time, updated_at, is_deleted from knowledge_file
</sql>
<select id="selectKnowledgeFileList" parameterType="KnowledgeFile" resultMap="KnowledgeFileResult">
<include refid="selectKnowledgeFileVo"/>
<where>
<if test="knowledgeBaseId != null "> and knowledge_base_id like concat("%", #{knowledgeBaseId}, "%")</if>
<if test="fileName != null and fileName != ''"> and file_name like concat('%', #{fileName}, '%')</if>
<if test="filePath != null and filePath != ''"> and file_path like concat("%", #{filePath}, "%")</if>
<if test="fileSize != null "> and file_size like concat("%", #{fileSize}, "%")</if>
<if test="fileType != null and fileType != ''"> and file_type like concat("%", #{fileType}, "%")</if>
<if test="description != null and description != ''"> and description like concat("%", #{description}, "%")</if>
<if test="isVectorized != null "> and is_vectorized like concat("%", #{isVectorized}, "%")</if>
<if test="vectorizedTime != null "> and vectorized_time like concat("%", #{vectorizedTime}, "%")</if>
<if test="uploadTime != null "> and upload_time like concat("%", #{uploadTime}, "%")</if>
<if test="updatedAt != null "> and updated_at like concat("%", #{updatedAt}, "%")</if>
<if test="isDeleted != null "> and is_deleted like concat("%", #{isDeleted}, "%")</if>
</where>
</select>
<select id="selectKnowledgeFileById" parameterType="Long" resultMap="KnowledgeFileResult">
<include refid="selectKnowledgeFileVo"/>
where id = #{id}
</select>
<insert id="insertKnowledgeFile" parameterType="KnowledgeFile" useGeneratedKeys="true" keyProperty="id">
insert into knowledge_file
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="knowledgeBaseId != null">knowledge_base_id,</if>
<if test="fileName != null and fileName != ''">file_name,</if>
<if test="filePath != null and filePath != ''">file_path,</if>
<if test="fileSize != null">file_size,</if>
<if test="fileType != null">file_type,</if>
<if test="description != null">description,</if>
<if test="isVectorized != null">is_vectorized,</if>
<if test="vectorizedTime != null">vectorized_time,</if>
<if test="uploadTime != null">upload_time,</if>
<if test="updatedAt != null">updated_at,</if>
<if test="isDeleted != null">is_deleted,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="knowledgeBaseId != null">#{knowledgeBaseId},</if>
<if test="fileName != null and fileName != ''">#{fileName},</if>
<if test="filePath != null and filePath != ''">#{filePath},</if>
<if test="fileSize != null">#{fileSize},</if>
<if test="fileType != null">#{fileType},</if>
<if test="description != null">#{description},</if>
<if test="isVectorized != null">#{isVectorized},</if>
<if test="vectorizedTime != null">#{vectorizedTime},</if>
<if test="uploadTime != null">#{uploadTime},</if>
<if test="updatedAt != null">#{updatedAt},</if>
<if test="isDeleted != null">#{isDeleted},</if>
</trim>
</insert>
<update id="updateKnowledgeFile" parameterType="KnowledgeFile">
update knowledge_file
<trim prefix="SET" suffixOverrides=",">
<if test="knowledgeBaseId != null">knowledge_base_id = #{knowledgeBaseId},</if>
<if test="fileName != null and fileName != ''">file_name = #{fileName},</if>
<if test="filePath != null and filePath != ''">file_path = #{filePath},</if>
<if test="fileSize != null">file_size = #{fileSize},</if>
<if test="fileType != null">file_type = #{fileType},</if>
<if test="description != null">description = #{description},</if>
<if test="isVectorized != null">is_vectorized = #{isVectorized},</if>
<if test="vectorizedTime != null">vectorized_time = #{vectorizedTime},</if>
<if test="uploadTime != null">upload_time = #{uploadTime},</if>
<if test="updatedAt != null">updated_at = #{updatedAt},</if>
<if test="isDeleted != null">is_deleted = #{isDeleted},</if>
</trim>
where id = #{id}
</update>
<delete id="deleteKnowledgeFileById" parameterType="Long">
delete from knowledge_file where id = #{id}
</delete>
<delete id="deleteKnowledgeFileByIds" parameterType="String">
delete from knowledge_file where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
</delete>
</mapper>

108
ruoyi-admin/src/main/resources/mapper/mapper/api/MoveMsgMapper.xml Normal file
View File

@@ -0,0 +1,108 @@
<?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.api.moveMsg.mapper.MoveMsgMapper">
<resultMap type="MoveMsg" id="MoveMsgResult">
<result property="id" column="id" />
<result property="trayCode" column="tray_code" />
<result property="oldSpace" column="old_space" />
<result property="newSpace" column="new_space" />
<result property="status" column="status" />
<result property="sendTime" column="send_time" />
<result property="msg" column="msg" />
<result property="spare1" column="spare1" />
<result property="spare2" column="spare2" />
<result property="spare3" column="spare3" />
<result property="spare4" column="spare4" />
<result property="spare5" column="spare5" />
</resultMap>
<sql id="selectMoveMsgVo">
select id, tray_code, old_space, new_space, status, send_time, msg, spare1, spare2, spare3, spare4, spare5 from move_msg
</sql>
<select id="selectMoveMsgList" parameterType="MoveMsg" resultMap="MoveMsgResult">
<include refid="selectMoveMsgVo"/>
<where>
<if test="trayCode != null and trayCode != ''"> and tray_code like concat("%", #{trayCode}, "%")</if>
<if test="oldSpace != null and oldSpace != ''"> and old_space like concat("%", #{oldSpace}, "%")</if>
<if test="newSpace != null and newSpace != ''"> and new_space like concat("%", #{newSpace}, "%")</if>
<if test="status != null and status != ''"> and status like concat("%", #{status}, "%")</if>
<if test="sendTime != null and sendTime != ''"> and send_time like concat("%", #{sendTime}, "%")</if>
<if test="msg != null and msg != ''"> and msg like concat("%", #{msg}, "%")</if>
<if test="spare1 != null and spare1 != ''"> and spare1 like concat("%", #{spare1}, "%")</if>
<if test="spare2 != null and spare2 != ''"> and spare2 like concat("%", #{spare2}, "%")</if>
<if test="spare3 != null and spare3 != ''"> and spare3 like concat("%", #{spare3}, "%")</if>
<if test="spare4 != null and spare4 != ''"> and spare4 like concat("%", #{spare4}, "%")</if>
<if test="spare5 != null and spare5 != ''"> and spare5 like concat("%", #{spare5}, "%")</if>
</where>
</select>
<select id="selectMoveMsgById" parameterType="String" resultMap="MoveMsgResult">
<include refid="selectMoveMsgVo"/>
where id = #{id}
</select>
<insert id="insertMoveMsg" parameterType="MoveMsg">
insert into move_msg
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">id,</if>
<if test="trayCode != null">tray_code,</if>
<if test="oldSpace != null">old_space,</if>
<if test="newSpace != null">new_space,</if>
<if test="status != null">status,</if>
<if test="sendTime != null">send_time,</if>
<if test="msg != null">msg,</if>
<if test="spare1 != null">spare1,</if>
<if test="spare2 != null">spare2,</if>
<if test="spare3 != null">spare3,</if>
<if test="spare4 != null">spare4,</if>
<if test="spare5 != null">spare5,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">#{id},</if>
<if test="trayCode != null">#{trayCode},</if>
<if test="oldSpace != null">#{oldSpace},</if>
<if test="newSpace != null">#{newSpace},</if>
<if test="status != null">#{status},</if>
<if test="sendTime != null">#{sendTime},</if>
<if test="msg != null">#{msg},</if>
<if test="spare1 != null">#{spare1},</if>
<if test="spare2 != null">#{spare2},</if>
<if test="spare3 != null">#{spare3},</if>
<if test="spare4 != null">#{spare4},</if>
<if test="spare5 != null">#{spare5},</if>
</trim>
</insert>
<update id="updateMoveMsg" parameterType="MoveMsg">
update move_msg
<trim prefix="SET" suffixOverrides=",">
<if test="trayCode != null">tray_code = #{trayCode},</if>
<if test="oldSpace != null">old_space = #{oldSpace},</if>
<if test="newSpace != null">new_space = #{newSpace},</if>
<if test="status != null">status = #{status},</if>
<if test="sendTime != null">send_time = #{sendTime},</if>
<if test="msg != null">msg = #{msg},</if>
<if test="spare1 != null">spare1 = #{spare1},</if>
<if test="spare2 != null">spare2 = #{spare2},</if>
<if test="spare3 != null">spare3 = #{spare3},</if>
<if test="spare4 != null">spare4 = #{spare4},</if>
<if test="spare5 != null">spare5 = #{spare5},</if>
</trim>
where id = #{id}
</update>
<delete id="deleteMoveMsgById" parameterType="String">
delete from move_msg where id = #{id}
</delete>
<delete id="deleteMoveMsgByIds" parameterType="String">
delete from move_msg where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
</delete>
</mapper>

93
ruoyi-admin/src/main/resources/mapper/mapper/bas/BasContainerDetailsMapper.xml Normal file
View File

@@ -0,0 +1,93 @@
<?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.bas.containerDetails.mapper.BasContainerDetailsMapper">
<resultMap type="BasContainerDetails" id="BasContainerDetailsResult">
<result property="id" column="id" />
<result property="containerId" column="container_id" />
<result property="productId" column="product_id" />
<result property="productName" column="product_name" />
<result property="quantity" column="quantity" />
<result property="unit" column="unit" />
<result property="spare1" column="spare1" />
<result property="spare2" column="spare2" />
<result property="spare3" column="spare3" />
</resultMap>
<sql id="selectBasContainerDetailsVo">
select id, container_id, product_id, product_name, quantity, unit, spare1, spare2, spare3 from bas_container_details
</sql>
<select id="selectBasContainerDetailsList" parameterType="BasContainerDetails" resultMap="BasContainerDetailsResult">
<include refid="selectBasContainerDetailsVo"/>
<where>
<if test="containerId != null and containerId != ''"> and container_id like concat("%", #{containerId}, "%")</if>
<if test="productId != null and productId != ''"> and product_id like concat("%", #{productId}, "%")</if>
<if test="productName != null and productName != ''"> and product_name like concat('%', #{productName}, '%')</if>
<if test="quantity != null "> and quantity like concat("%", #{quantity}, "%")</if>
<if test="unit != null and unit != ''"> and unit like concat("%", #{unit}, "%")</if>
<if test="spare1 != null and spare1 != ''"> and spare1 like concat("%", #{spare1}, "%")</if>
<if test="spare2 != null and spare2 != ''"> and spare2 like concat("%", #{spare2}, "%")</if>
<if test="spare3 != null and spare3 != ''"> and spare3 like concat("%", #{spare3}, "%")</if>
</where>
</select>
<select id="selectBasContainerDetailsById" parameterType="Long" resultMap="BasContainerDetailsResult">
<include refid="selectBasContainerDetailsVo"/>
where id = #{id}
</select>
<insert id="insertBasContainerDetails" parameterType="BasContainerDetails">
insert into bas_container_details
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">id,</if>
<if test="containerId != null">container_id,</if>
<if test="productId != null">product_id,</if>
<if test="productName != null">product_name,</if>
<if test="quantity != null">quantity,</if>
<if test="unit != null">unit,</if>
<if test="spare1 != null">spare1,</if>
<if test="spare2 != null">spare2,</if>
<if test="spare3 != null">spare3,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">#{id},</if>
<if test="containerId != null">#{containerId},</if>
<if test="productId != null">#{productId},</if>
<if test="productName != null">#{productName},</if>
<if test="quantity != null">#{quantity},</if>
<if test="unit != null">#{unit},</if>
<if test="spare1 != null">#{spare1},</if>
<if test="spare2 != null">#{spare2},</if>
<if test="spare3 != null">#{spare3},</if>
</trim>
</insert>
<update id="updateBasContainerDetails" parameterType="BasContainerDetails">
update bas_container_details
<trim prefix="SET" suffixOverrides=",">
<if test="containerId != null">container_id = #{containerId},</if>
<if test="productId != null">product_id = #{productId},</if>
<if test="productName != null">product_name = #{productName},</if>
<if test="quantity != null">quantity = #{quantity},</if>
<if test="unit != null">unit = #{unit},</if>
<if test="spare1 != null">spare1 = #{spare1},</if>
<if test="spare2 != null">spare2 = #{spare2},</if>
<if test="spare3 != null">spare3 = #{spare3},</if>
</trim>
where id = #{id}
</update>
<delete id="deleteBasContainerDetailsById" parameterType="Long">
delete from bas_container_details where id = #{id}
</delete>
<delete id="deleteBasContainerDetailsByIds" parameterType="String">
delete from bas_container_details where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
</delete>
</mapper>

105
ruoyi-admin/src/main/resources/mapper/mapper/bas/BasContainerMapper.xml Normal file
View File

@@ -0,0 +1,105 @@
<?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.bas.container.mapper.BasContainerMapper">
<resultMap type="BasContainer" id="BasContainerResult">
<result property="containerId" column="container_id" />
<result property="portName" column="port_name" />
<result property="status" column="status" />
<result property="productTypeQuantity" column="product_type_quantity" />
<result property="capacity" column="capacity" />
<result property="createTime" column="create_time" />
<result property="updateTime" column="update_time" />
<result property="operationMan" column="operation_man" />
<result property="spare1" column="spare1" />
<result property="spare2" column="spare2" />
<result property="spare3" column="spare3" />
</resultMap>
<sql id="selectBasContainerVo">
select container_id, port_name, status, product_type_quantity, capacity, create_time, update_time, operation_man, spare1, spare2, spare3 from bas_container
</sql>
<select id="selectBasContainerList" parameterType="BasContainer" resultMap="BasContainerResult">
<include refid="selectBasContainerVo"/>
<where>
<if test="containerId != null and containerId != ''"> and container_id like concat('%', #{containerId}, '%')</if>
<if test="portName != null and portName != ''"> and port_name like concat("%", #{portName}, "%")</if>
<if test="status != null "> and status like concat("%", #{status}, "%")</if>
<if test="productTypeQuantity != null "> and product_type_quantity like concat("%", #{productTypeQuantity}, "%")</if>
<if test="updateTime != null and updateTime != ''"> and update_time like concat("%", #{updateTime}, "%")</if>
<if test="operationMan != null and operationMan != ''"> and operation_man like concat("%", #{operationMan}, "%")</if>
</where>
</select>
<select id="selectBasContainerByContainerId" parameterType="String" resultMap="BasContainerResult">
<include refid="selectBasContainerVo"/>
where container_id = #{containerId}
</select>
<insert id="insertBasContainer" parameterType="BasContainer">
insert into bas_container
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="containerId != null">container_id,</if>
<if test="portName != null">port_name,</if>
<if test="status != null">status,</if>
<if test="productTypeQuantity != null">product_type_quantity,</if>
<if test="capacity != null">capacity,</if>
<if test="createTime != null">create_time,</if>
<!-- <if test="updateTime != null">update_time,</if>-->
update_time,
<if test="operationMan != null">operation_man,</if>
<if test="spare1 != null">spare1,</if>
<if test="spare2 != null">spare2,</if>
<if test="spare3 != null">spare3,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="containerId != null">#{containerId},</if>
<if test="portName != null">#{portName},</if>
<if test="status != null">#{status},</if>
<if test="productTypeQuantity != null">#{productTypeQuantity},</if>
<if test="capacity != null">#{capacity},</if>
<if test="createTime != null">#{createTime},</if>
<!-- <if test="updateTime != null">#{updateTime},</if>-->
GETDATE(),
<if test="operationMan != null">#{operationMan},</if>
<if test="spare1 != null">#{spare1},</if>
<if test="spare2 != null">#{spare2},</if>
<if test="spare3 != null">#{spare3},</if>
</trim>
</insert>
<update id="updateBasContainer" parameterType="BasContainer">
update bas_container
<trim prefix="SET" suffixOverrides=",">
<if test="portName != null">port_name = #{portName},</if>
<if test="status != null">status = #{status},</if>
<if test="productTypeQuantity != null">product_type_quantity = #{productTypeQuantity},</if>
<if test="capacity != null">capacity = #{capacity},</if>
<if test="createTime != null">create_time = #{createTime},</if>
<if test="updateTime != null">update_time = GETDATE(),</if>
<if test="operationMan != null">operation_man = #{operationMan},</if>
<if test="spare1 != null">spare1 = #{spare1},</if>
<if test="spare2 != null">spare2 = #{spare2},</if>
<if test="spare3 != null">spare3 = #{spare3},</if>
</trim>
where container_id = #{containerId}
</update>
<delete id="deleteBasContainerByContainerId" parameterType="String">
delete from bas_container where container_id = #{containerId}
</delete>
<delete id="deleteBasContainerByContainerIds" parameterType="String">
delete from bas_container where container_id in
<foreach item="containerId" collection="array" open="(" separator="," close=")">
#{containerId}
</foreach>
</delete>
<select id="selectPortNames" resultType="string">
SELECT DISTINCT port_name FROM bas_product_port WHERE port_name != null or port_name != ''
</select>
</mapper>

152
ruoyi-admin/src/main/resources/mapper/mapper/bas/BasCustomerMapper.xml Normal file
View File

@@ -0,0 +1,152 @@
<?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.bas.BasCustomer.mapper.BasCustomerMapper">
<resultMap type="BasCustomer" id="BasCustomerResult">
<result property="id" column="id" />
<result property="customerNo" column="customer_no" />
<result property="customerGroupNo" column="customer_group_no" />
<result property="customerName" column="customer_name" />
<result property="simpleName" column="simple_name" />
<result property="useable" column="useable" />
<result property="remark" column="remark" />
<result property="businessDepartment" column="business_department" />
<result property="salesman" column="salesman" />
<result property="mnemonicCode" column="mnemonic_code" />
<result property="type" column="type" />
<result property="taxpayerRegistrationNumber" column="taxpayer_registration_number" />
<result property="organization" column="organization" />
<result property="supCustomer" column="sup_customer" />
<result property="retailInvestor" column="retail_investor" />
<result property="country" column="country" />
<result property="timeZone" column="time_zone" />
<result property="dataFormat" column="data_format" />
<result property="contactName" column="contact_name" />
<result property="shipment" column="shipment" />
<result property="taxCategory" column="tax_category" />
</resultMap>
<sql id="selectBasCustomerVo">
select id, customer_no, customer_group_no, customer_name, simple_name, useable, remark, business_department, salesman, mnemonic_code, type, taxpayer_registration_number, organization, sup_customer, retail_investor, country, time_zone, data_format, contact_name, shipment, tax_category from bas_customer
</sql>
<select id="selectBasCustomerList" parameterType="BasCustomer" resultMap="BasCustomerResult">
<include refid="selectBasCustomerVo"/>
<where>
<if test="customerNo != null and customerNo != ''"> and customer_no like concat('%', #{customerNo}, '%')</if>
<if test="customerGroupNo != null and customerGroupNo != ''"> and customer_group_no like concat('%', #{customerGroupNo}, '%')</if>
<if test="customerName != null and customerName != ''"> and customer_name like concat('%', #{customerName}, '%')</if>
<if test="simpleName != null and simpleName != ''"> and simple_name like concat('%', #{simpleName}, '%')</if>
<if test="useable != null and useable != ''"> and useable like concat("%", #{useable}, "%")</if>
<if test="businessDepartment != null and businessDepartment != ''"> and business_department like concat('%', #{businessDepartment}, '%')</if>
<if test="salesman != null and salesman != ''"> and salesman like concat('%', #{salesman}, '%')</if>
<if test="mnemonicCode != null and mnemonicCode != ''"> and mnemonic_code like concat('%', #{mnemonicCode}, '%')</if>
<if test="type != null and type != ''"> and type like concat('%', #{type}, '%')</if>
<if test="taxpayerRegistrationNumber != null and taxpayerRegistrationNumber != ''"> and taxpayer_registration_number like concat('%', #{taxpayerRegistrationNumber}, '%')</if>
<if test="organization != null and organization != ''"> and organization like concat('%', #{organization}, '%')</if>
<if test="supCustomer != null and supCustomer != ''"> and sup_customer like concat('%', #{supCustomer}, '%')</if>
<if test="retailInvestor != null and retailInvestor != ''"> and retail_investor like concat('%', #{retailInvestor}, '%')</if>
<if test="country != null and country != ''"> and country like concat('%', #{country}, '%')</if>
<if test="timeZone != null and timeZone != ''"> and time_zone like concat('%', #{timeZone}, '%')</if>
<if test="dataFormat != null and dataFormat != ''"> and data_format like concat('%', #{dataFormat}, '%')</if>
<if test="contactName != null and contactName != ''"> and contact_name like concat('%', #{contactName}, '%')</if>
<if test="shipment != null and shipment != ''"> and shipment like concat('%', #{shipment}, '%')</if>
<if test="taxCategory != null and taxCategory != ''"> and tax_category like concat('%', #{taxCategory}, '%')</if>
</where>
</select>
<select id="selectBasCustomerById" parameterType="String" resultMap="BasCustomerResult">
<include refid="selectBasCustomerVo"/>
where id = #{id}
</select>
<insert id="insertBasCustomer" parameterType="BasCustomer">
insert into bas_customer
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null and id != ''">id,</if>
<if test="customerNo != null and customerNo != ''">customer_no,</if>
<if test="customerGroupNo != null">customer_group_no,</if>
<if test="customerName != null">customer_name,</if>
<if test="simpleName != null">simple_name,</if>
<if test="useable != null">useable,</if>
<if test="remark != null">remark,</if>
<if test="businessDepartment != null">business_department,</if>
<if test="salesman != null">salesman,</if>
<if test="mnemonicCode != null">mnemonic_code,</if>
<if test="type != null">type,</if>
<if test="taxpayerRegistrationNumber != null">taxpayer_registration_number,</if>
<if test="organization != null">organization,</if>
<if test="supCustomer != null">sup_customer,</if>
<if test="retailInvestor != null">retail_investor,</if>
<if test="country != null">country,</if>
<if test="timeZone != null">time_zone,</if>
<if test="dataFormat != null">data_format,</if>
<if test="contactName != null">contact_name,</if>
<if test="shipment != null">shipment,</if>
<if test="taxCategory != null">tax_category,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null and id != ''">#{id},</if>
<if test="customerNo != null and customerNo != ''">#{customerNo},</if>
<if test="customerGroupNo != null">#{customerGroupNo},</if>
<if test="customerName != null">#{customerName},</if>
<if test="simpleName != null">#{simpleName},</if>
<if test="useable != null">#{useable},</if>
<if test="remark != null">#{remark},</if>
<if test="businessDepartment != null">#{businessDepartment},</if>
<if test="salesman != null">#{salesman},</if>
<if test="mnemonicCode != null">#{mnemonicCode},</if>
<if test="type != null">#{type},</if>
<if test="taxpayerRegistrationNumber != null">#{taxpayerRegistrationNumber},</if>
<if test="organization != null">#{organization},</if>
<if test="supCustomer != null">#{supCustomer},</if>
<if test="retailInvestor != null">#{retailInvestor},</if>
<if test="country != null">#{country},</if>
<if test="timeZone != null">#{timeZone},</if>
<if test="dataFormat != null">#{dataFormat},</if>
<if test="contactName != null">#{contactName},</if>
<if test="shipment != null">#{shipment},</if>
<if test="taxCategory != null">#{taxCategory},</if>
</trim>
</insert>
<update id="updateBasCustomer" parameterType="BasCustomer">
update bas_customer
<trim prefix="SET" suffixOverrides=",">
<if test="customerNo != null and customerNo != ''">customer_no = #{customerNo},</if>
<if test="customerGroupNo != null">customer_group_no = #{customerGroupNo},</if>
<if test="customerName != null">customer_name = #{customerName},</if>
<if test="simpleName != null">simple_name = #{simpleName},</if>
<if test="useable != null">useable = #{useable},</if>
<if test="remark != null">remark = #{remark},</if>
<if test="businessDepartment != null">business_department = #{businessDepartment},</if>
<if test="salesman != null">salesman = #{salesman},</if>
<if test="mnemonicCode != null">mnemonic_code = #{mnemonicCode},</if>
<if test="type != null">type = #{type},</if>
<if test="taxpayerRegistrationNumber != null">taxpayer_registration_number = #{taxpayerRegistrationNumber},</if>
<if test="organization != null">organization = #{organization},</if>
<if test="supCustomer != null">sup_customer = #{supCustomer},</if>
<if test="retailInvestor != null">retail_investor = #{retailInvestor},</if>
<if test="country != null">country = #{country},</if>
<if test="timeZone != null">time_zone = #{timeZone},</if>
<if test="dataFormat != null">data_format = #{dataFormat},</if>
<if test="contactName != null">contact_name = #{contactName},</if>
<if test="shipment != null">shipment = #{shipment},</if>
<if test="taxCategory != null">tax_category = #{taxCategory},</if>
</trim>
where id = #{id}
</update>
<delete id="deleteBasCustomerById" parameterType="String">
delete from bas_customer where id = #{id}
</delete>
<delete id="deleteBasCustomerByIds" parameterType="String">
delete from bas_customer where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
</delete>
</mapper>

165
ruoyi-admin/src/main/resources/mapper/mapper/bas/BasJobIdMapper.xml Normal file
View File

@@ -0,0 +1,165 @@
<?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.bas.basJobId.mapper.BasJobIdMapper">
<resultMap type="BasJobId" id="BasJobIdResult">
<result property="id" column="id" />
<result property="type" column="type" />
<result property="jobId" column="job_id" />
<result property="jobDetail" column="job_detail" />
<result property="stockId" column="stock_id" />
<result property="orderId" column="order_id" />
<result property="exorderId" column="Exorder_id" />
<result property="jobIdR" column="job_id_R" />
<result property="jobDetailR" column="job_detail_R" />
<result property="jobIdC" column="job_id_C" />
<result property="jobDetailC" column="job_detail_C" />
<result property="tempOrderId" column="temp_order_id" />
<result property="lotNo" column="lot_no" />
<result property="stockinId" column="stockin_id" />
<result property="stockinDetailId" column="stockin_detail_id" />
<result property="stockoutId" column="stockout_id" />
<result property="stockoutDetailId" column="stockout_detail_id" />
<result property="planId" column="plan_id" />
<result property="jobIdY" column="job_id_y" />
<result property="jobIdS" column="job_id_s" />
</resultMap>
<sql id="selectBasJobIdVo">
select id, type, job_id, job_detail, stock_id, order_id, Exorder_id, job_id_R, job_detail_R, job_id_C, job_detail_C, temp_order_id, lot_no, stockin_id, stockin_detail_id, stockout_id, stockout_detail_id, plan_id, job_id_y, job_id_s from bas_job_id
</sql>
<select id="selectBasJobIdList" parameterType="BasJobId" resultMap="BasJobIdResult">
<include refid="selectBasJobIdVo"/>
<where>
<if test="type != null and type != ''"> and type like concat("%", #{type}, "%")</if>
<if test="jobId != null and jobId != ''"> and job_id like concat("%", #{jobId}, "%")</if>
<if test="jobDetail != null and jobDetail != ''"> and job_detail like concat("%", #{jobDetail}, "%")</if>
<if test="stockId != null and stockId != ''"> and stock_id like concat("%", #{stockId}, "%")</if>
<if test="orderId != null and orderId != ''"> and order_id like concat("%", #{orderId}, "%")</if>
<if test="exorderId != null and exorderId != ''"> and Exorder_id like concat("%", #{exorderId}, "%")</if>
<if test="jobIdR != null and jobIdR != ''"> and job_id_R like concat("%", #{jobIdR}, "%")</if>
<if test="jobDetailR != null and jobDetailR != ''"> and job_detail_R like concat("%", #{jobDetailR}, "%")</if>
<if test="jobIdC != null and jobIdC != ''"> and job_id_C like concat("%", #{jobIdC}, "%")</if>
<if test="jobDetailC != null and jobDetailC != ''"> and job_detail_C like concat("%", #{jobDetailC}, "%")</if>
<if test="tempOrderId != null and tempOrderId != ''"> and temp_order_id like concat("%", #{tempOrderId}, "%")</if>
<if test="lotNo != null and lotNo != ''"> and lot_no like concat("%", #{lotNo}, "%")</if>
<if test="stockinId != null and stockinId != ''"> and stockin_id like concat("%", #{stockinId}, "%")</if>
<if test="stockinDetailId != null and stockinDetailId != ''"> and stockin_detail_id like concat("%", #{stockinDetailId}, "%")</if>
<if test="stockoutId != null and stockoutId != ''"> and stockout_id like concat("%", #{stockoutId}, "%")</if>
<if test="stockoutDetailId != null and stockoutDetailId != ''"> and stockout_detail_id like concat("%", #{stockoutDetailId}, "%")</if>
<if test="planId != null and planId != ''"> and plan_id like concat("%", #{planId}, "%")</if>
<if test="jobIdY != null and jobIdY != ''"> and job_id_y like concat("%", #{jobIdY}, "%")</if>
<if test="jobIdS != null and jobIdS != ''"> and job_id_s like concat("%", #{jobIdS}, "%")</if>
</where>
</select>
<select id="selectBasJobIdById" parameterType="String" resultMap="BasJobIdResult">
<include refid="selectBasJobIdVo"/>
where id = #{id}
</select>
<insert id="insertBasJobId" parameterType="BasJobId">
insert into bas_job_id
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">id,</if>
<if test="type != null">type,</if>
<if test="jobId != null">job_id,</if>
<if test="jobDetail != null">job_detail,</if>
<if test="stockId != null">stock_id,</if>
<if test="orderId != null">order_id,</if>
<if test="exorderId != null">Exorder_id,</if>
<if test="jobIdR != null">job_id_R,</if>
<if test="jobDetailR != null">job_detail_R,</if>
<if test="jobIdC != null">job_id_C,</if>
<if test="jobDetailC != null">job_detail_C,</if>
<if test="tempOrderId != null">temp_order_id,</if>
<if test="lotNo != null">lot_no,</if>
<if test="stockinId != null">stockin_id,</if>
<if test="stockinDetailId != null">stockin_detail_id,</if>
<if test="stockoutId != null">stockout_id,</if>
<if test="stockoutDetailId != null">stockout_detail_id,</if>
<if test="planId != null">plan_id,</if>
<if test="jobIdY != null">job_id_y,</if>
<if test="jobIdS != null">job_id_s,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">#{id},</if>
<if test="type != null">#{type},</if>
<if test="jobId != null">#{jobId},</if>
<if test="jobDetail != null">#{jobDetail},</if>
<if test="stockId != null">#{stockId},</if>
<if test="orderId != null">#{orderId},</if>
<if test="exorderId != null">#{exorderId},</if>
<if test="jobIdR != null">#{jobIdR},</if>
<if test="jobDetailR != null">#{jobDetailR},</if>
<if test="jobIdC != null">#{jobIdC},</if>
<if test="jobDetailC != null">#{jobDetailC},</if>
<if test="tempOrderId != null">#{tempOrderId},</if>
<if test="lotNo != null">#{lotNo},</if>
<if test="stockinId != null">#{stockinId},</if>
<if test="stockinDetailId != null">#{stockinDetailId},</if>
<if test="stockoutId != null">#{stockoutId},</if>
<if test="stockoutDetailId != null">#{stockoutDetailId},</if>
<if test="planId != null">#{planId},</if>
<if test="jobIdY != null">#{jobIdY},</if>
<if test="jobIdS != null">#{jobIdS},</if>
</trim>
</insert>
<update id="updateBasJobId" parameterType="BasJobId">
update bas_job_id
<trim prefix="SET" suffixOverrides=",">
<if test="jobId != null">job_id = #{jobId},</if>
<if test="jobDetail != null">job_detail = #{jobDetail},</if>
<if test="stockId != null">stock_id = #{stockId},</if>
<if test="orderId != null">order_id = #{orderId},</if>
<if test="exorderId != null">Exorder_id = #{exorderId},</if>
<if test="jobIdR != null">job_id_R = #{jobIdR},</if>
<if test="jobDetailR != null">job_detail_R = #{jobDetailR},</if>
<if test="jobIdC != null">job_id_C = #{jobIdC},</if>
<if test="jobDetailC != null">job_detail_C = #{jobDetailC},</if>
<if test="tempOrderId != null">temp_order_id = #{tempOrderId},</if>
<if test="lotNo != null">lot_no = #{lotNo},</if>
<if test="stockinId != null">stockin_id = #{stockinId},</if>
<if test="stockinDetailId != null">stockin_detail_id = #{stockinDetailId},</if>
<if test="stockoutId != null">stockout_id = #{stockoutId},</if>
<if test="stockoutDetailId != null">stockout_detail_id = #{stockoutDetailId},</if>
<if test="planId != null">plan_id = #{planId},</if>
<if test="jobIdY != null">job_id_y = #{jobIdY},</if>
<if test="jobIdS != null">job_id_s = #{jobIdS},</if>
</trim>
where type = #{type}
</update>
<delete id="deleteBasJobIdById" parameterType="String">
delete from bas_job_id where id = #{id}
</delete>
<delete id="deleteBasJobIdByIds" parameterType="String">
delete from bas_job_id where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
</delete>
<select id="getoutStockIdByDate" parameterType="String" resultType="Integer">
select count(*) from bas_job_id where type='CK' and job_id like CONCAT('%', #{date}, '%')
</select>
<select id="getIdByDate" parameterType="BasJobId" resultType="Integer">
select count(*) from bas_job_id where type = #{type} and stock_id like CONCAT('%', #{stockId}, '%')
</select>
<select id="getIdByType" resultType="String" parameterType="String">
select job_id from bas_job_id where type=#{type}
</select>
</mapper>

132
ruoyi-admin/src/main/resources/mapper/mapper/bas/BasProductCodeMapper.xml Normal file
View File

@@ -0,0 +1,132 @@
<?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.bas.BasProductCode.mapper.BasProductCodeMapper">
<resultMap type="BasProductCode" id="BasProductCodeResult">
<result property="id" column="id" />
<result property="model" column="model" />
<result property="color" column="color" />
<result property="serial" column="serial" />
<result property="v" column="v" />
<result property="hz" column="hz" />
<result property="ph" column="ph" />
<result property="nW" column="n_w" />
<result property="gW" column="g_w" />
<result property="type" column="type" />
<result property="spare1" column="spare1" />
<result property="spare2" column="spare2" />
<result property="spare3" column="spare3" />
<result property="createTime" column="create_time" />
<result property="spare4" column="spare4" />
<result property="spare5" column="spare5" />
<result property="spare6" column="spare6" />
</resultMap>
<sql id="selectBasProductCodeVo">
select id, model, color, serial, v, hz, ph, n_w, g_w, type, spare1, spare2, spare3, create_time, spare4, spare5, spare6 from bas_product_code
</sql>
<select id="selectBasProductCodeList" parameterType="BasProductCode" resultMap="BasProductCodeResult">
<include refid="selectBasProductCodeVo"/>
<where>
<if test="model != null and model != ''"> and model like concat("%", #{model}, "%")</if>
<if test="color != null and color != ''"> and color like concat('%', #{color}, '%')</if>
<if test="serial != null and serial != ''"> and serial like concat('%', #{serial}, '%')</if>
<if test="v != null and v != ''"> and v like concat('%', #{v}, '%')</if>
<if test="hz != null and hz != ''"> and hz like concat('%', #{hz}, '%')</if>
<if test="ph != null and ph != ''"> and ph like concat('%', #{ph}, '%')</if>
<if test="nW != null and nW != ''"> and n_w like concat('%', #{nW}, '%')</if>
<if test="gW != null and gW != ''"> and g_w like concat('%', #{gW}, '%')</if>
<if test="type != null and type != ''"> and type like concat("%", #{type}, "%")</if>
<if test="spare1 != null and spare1 != ''"> and spare1 like concat("%", #{spare1}, "%")</if>
<if test="spare2 != null and spare2 != ''"> and spare2 like concat("%", #{spare2}, "%")</if>
<if test="spare3 != null and spare3 != ''"> and spare3 like concat("%", #{spare3}, "%")</if>
<if test="spare4 != null and spare4 != ''"> and spare4 like concat("%", #{spare4}, "%")</if>
<if test="spare5 != null and spare5 != ''"> and spare5 like concat("%", #{spare5}, "%")</if>
<if test="spare6 != null and spare6 != ''"> and spare6 like concat("%", #{spare6}, "%")</if>
</where>
</select>
<select id="selectBasProductCodeById" parameterType="Long" resultMap="BasProductCodeResult">
<include refid="selectBasProductCodeVo"/>
where id = #{id}
</select>
<insert id="insertBasProductCode" parameterType="BasProductCode">
insert into bas_product_code
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">id,</if>
<if test="model != null and model != ''">model,</if>
<if test="color != null and color != ''">color,</if>
<if test="serial != null and serial != ''">serial,</if>
<if test="v != null and v != ''">v,</if>
<if test="hz != null and hz != ''">hz,</if>
<if test="ph != null and ph != ''">ph,</if>
<if test="nW != null and nW != ''">n_w,</if>
<if test="gW != null and gW != ''">g_w,</if>
<if test="type != null">type,</if>
<if test="spare1 != null">spare1,</if>
<if test="spare2 != null">spare2,</if>
<if test="spare3 != null">spare3,</if>
<if test="createTime != null">create_time,</if>
<if test="spare4 != null">spare4,</if>
<if test="spare5 != null">spare5,</if>
<if test="spare6 != null">spare6,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">#{id},</if>
<if test="model != null and model != ''">#{model},</if>
<if test="color != null and color != ''">#{color},</if>
<if test="serial != null and serial != ''">#{serial},</if>
<if test="v != null and v != ''">#{v},</if>
<if test="hz != null and hz != ''">#{hz},</if>
<if test="ph != null and ph != ''">#{ph},</if>
<if test="nW != null and nW != ''">#{nW},</if>
<if test="gW != null and gW != ''">#{gW},</if>
<if test="type != null">#{type},</if>
<if test="spare1 != null">#{spare1},</if>
<if test="spare2 != null">#{spare2},</if>
<if test="spare3 != null">#{spare3},</if>
<if test="createTime != null">#{createTime},</if>
<if test="spare4 != null">#{spare4},</if>
<if test="spare5 != null">#{spare5},</if>
<if test="spare6 != null">#{spare6},</if>
</trim>
</insert>
<update id="updateBasProductCode" parameterType="BasProductCode">
update bas_product_code
<trim prefix="SET" suffixOverrides=",">
<if test="model != null and model != ''">model = #{model},</if>
<if test="color != null and color != ''">color = #{color},</if>
<if test="serial != null and serial != ''">serial = #{serial},</if>
<if test="v != null and v != ''">v = #{v},</if>
<if test="hz != null and hz != ''">hz = #{hz},</if>
<if test="ph != null and ph != ''">ph = #{ph},</if>
<if test="nW != null and nW != ''">n_w = #{nW},</if>
<if test="gW != null and gW != ''">g_w = #{gW},</if>
<if test="type != null">type = #{type},</if>
<if test="spare1 != null">spare1 = #{spare1},</if>
<if test="spare2 != null">spare2 = #{spare2},</if>
<if test="spare3 != null">spare3 = #{spare3},</if>
<if test="createTime != null">create_time = #{createTime},</if>
<if test="spare4 != null">spare4 = #{spare4},</if>
<if test="spare5 != null">spare5 = #{spare5},</if>
<if test="spare6 != null">spare6 = #{spare6},</if>
</trim>
where id = #{id}
</update>
<delete id="deleteBasProductCodeById" parameterType="Long">
delete from bas_product_code where id = #{id}
</delete>
<delete id="deleteBasProductCodeByIds" parameterType="String">
delete from bas_product_code where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
</delete>
</mapper>

290
ruoyi-admin/src/main/resources/mapper/mapper/bas/BasProductMapper.xml Normal file
View File

@@ -0,0 +1,290 @@
<?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.bas.BasProduct.mapper.BasProductMapper">
<resultMap type="BasProduct" id="BasProductResult">
<result property="productGuid" column="product_guid" />
<result property="productId" column="product_id" />
<result property="parentId" column="parent_id" />
<result property="price" column="price" />
<result property="cargoNo" column="cargo_no" />
<result property="unit" column="unit" />
<result property="spec" column="spec" />
<result property="remark" column="remark" />
<result property="spare1" column="spare1" />
<result property="spare2" column="spare2" />
<result property="spare3" column="spare3" />
<result property="spare4" column="spare4" />
<result property="spare5" column="spare5" />
<result property="spare6" column="spare6" />
<result property="productName" column="product_name" />
<result property="spare7" column="spare7" />
<result property="spare8" column="spare8" />
<result property="spare9" column="spare9" />
<result property="spare10" column="spare10" />
<result property="spare11" column="spare11" />
<result property="spare12" column="spare12" />
<result property="spare13" column="spare13" />
<result property="spare14" column="spare14" />
<result property="spare15" column="spare15" />
<result property="spare16" column="spare16" />
<result property="spare17" column="spare17" />
<result property="spare18" column="spare18" />
<result property="spare19" column="spare19" />
<result property="spare20" column="spare20" />
<result property="spare21" column="spare21" />
<result property="spare22" column="spare22" />
<result property="spare23" column="spare23" />
<result property="spare24" column="spare24" />
<result property="spare25" column="spare25" />
<result property="spare26" column="spare26" />
<result property="spare27" column="spare27" />
<result property="spare28" column="spare28" />
<result property="spare29" column="spare29" />
<result property="spare30" column="spare30" />
<result property="spare31" column="spare31" />
<result property="spare32" column="spare32" />
<result property="spare33" column="spare33" />
<result property="spare34" column="spare34" />
<result property="spare35" column="spare35" />
<result property="spare36" column="spare36" />
<result property="spare37" column="spare37" />
<result property="spare38" column="spare38" />
<result property="spare39" column="spare39" />
</resultMap>
<sql id="selectBasProductVo">
select product_guid, product_id, parent_id, price, cargo_no, unit, spec, remark, spare1, spare2, spare3, spare4, spare5, spare6, product_name, spare7, spare8, spare9, spare10, spare11, spare12, spare13, spare14, spare15, spare16, spare17, spare18, spare19, spare20, spare21, spare22, spare23, spare24, spare25, spare26, spare27, spare28, spare29, spare30, spare31, spare32, spare33, spare34, spare35, spare36, spare37, spare38, spare39 from bas_product
</sql>
<select id="selectBasProductList" parameterType="BasProduct" resultMap="BasProductResult">
<include refid="selectBasProductVo"/>
<where>
<if test="productId != null and productId != ''"> and product_id like concat('%', #{productId}, '%')</if>
<if test="parentId != null and parentId != ''"> and parent_id like concat('%', #{parentId}, '%')</if>
<if test="price != null and price != ''"> and price like concat('%', #{price}, '%')</if>
<if test="cargoNo != null and cargoNo != ''"> and cargo_no like concat('%', #{cargoNo}, '%')</if>
<if test="unit != null and unit != ''"> and unit like concat('%', #{unit}, '%')</if>
<if test="spec != null and spec != ''"> and spec like concat('%', #{spec}, '%')</if>
<if test="spare1 != null and spare1 != ''"> and spare1 like concat('%', #{spare1}, '%')</if>
<if test="spare2 != null and spare2 != ''"> and spare2 like concat('%', #{spare2}, '%')</if>
<if test="spare3 != null and spare3 != ''"> and spare3 like concat('%', #{spare3}, '%')</if>
<if test="spare4 != null and spare4 != ''"> and spare4 like concat('%', #{spare4}, '%')</if>
<if test="spare5 != null and spare5 != ''"> and spare5 like concat('%', #{spare5}, '%')</if>
<if test="spare6 != null and spare6 != ''"> and spare6 like concat('%', #{spare6}, '%')</if>
<if test="productName != null and productName != ''"> and product_name like concat('%', #{productName}, '%')</if>
<if test="spare7 != null and spare7 != ''"> and spare7 like concat('%', #{spare7}, '%')</if>
<if test="spare8 != null and spare8 != ''"> and spare8 like concat('%', #{spare8}, '%')</if>
<if test="spare9 != null and spare9 != ''"> and spare9 like concat('%', #{spare9}, '%')</if>
<if test="spare10 != null and spare10 != ''"> and spare10 like concat('%', #{spare10}, '%')</if>
<if test="spare11 != null and spare11 != ''"> and spare11 like concat('%', #{spare11}, '%')</if>
<if test="spare12 != null and spare12 != ''"> and spare12 like concat('%', #{spare12}, '%')</if>
<if test="spare13 != null and spare13 != ''"> and spare13 like concat('%', #{spare13}, '%')</if>
<if test="spare14 != null and spare14 != ''"> and spare14 like concat('%', #{spare14}, '%')</if>
<if test="spare15 != null and spare15 != ''"> and spare15 like concat('%', #{spare15}, '%')</if>
<if test="spare16 != null and spare16 != ''"> and spare16 like concat('%', #{spare16}, '%')</if>
<if test="spare17 != null and spare17 != ''"> and spare17 like concat('%', #{spare17}, '%')</if>
<if test="spare18 != null and spare18 != ''"> and spare18 like concat('%', #{spare18}, '%')</if>
<if test="spare19 != null and spare19 != ''"> and spare19 like concat('%', #{spare19}, '%')</if>
<if test="spare20 != null and spare20 != ''"> and spare20 like concat('%', #{spare20}, '%')</if>
<if test="spare21 != null and spare21 != ''"> and spare21 like concat('%', #{spare21}, '%')</if>
<if test="spare22 != null and spare22 != ''"> and spare22 like concat('%', #{spare22}, '%')</if>
<if test="spare23 != null and spare23 != ''"> and spare23 like concat('%', #{spare23}, '%')</if>
<if test="spare24 != null and spare24 != ''"> and spare24 like concat('%', #{spare24}, '%')</if>
<if test="spare25 != null and spare25 != ''"> and spare25 like concat('%', #{spare25}, '%')</if>
<if test="spare26 != null and spare26 != ''"> and spare26 like concat('%', #{spare26}, '%')</if>
<if test="spare27 != null and spare27 != ''"> and spare27 like concat('%', #{spare27}, '%')</if>
<if test="spare28 != null and spare28 != ''"> and spare28 like concat('%', #{spare28}, '%')</if>
<if test="spare29 != null and spare29 != ''"> and spare29 like concat('%', #{spare29}, '%')</if>
<if test="spare30 != null and spare30 != ''"> and spare30 like concat('%', #{spare30}, '%')</if>
<if test="spare31 != null and spare31 != ''"> and spare31 like concat('%', #{spare31}, '%')</if>
<if test="spare32 != null and spare32 != ''"> and spare32 like concat('%', #{spare32}, '%')</if>
<if test="spare33 != null and spare33 != ''"> and spare33 like concat('%', #{spare33}, '%')</if>
<if test="spare34 != null and spare34 != ''"> and spare34 like concat('%', #{spare34}, '%')</if>
<if test="spare35 != null and spare35 != ''"> and spare35 like concat('%', #{spare35}, '%')</if>
<if test="spare36 != null and spare36 != ''"> and spare36 like concat('%', #{spare36}, '%')</if>
<if test="spare37 != null and spare37 != ''"> and spare37 like concat('%', #{spare37}, '%')</if>
<if test="spare38 != null and spare38 != ''"> and spare38 like concat('%', #{spare38}, '%')</if>
<if test="spare39 != null and spare39 != ''"> and spare39 like concat('%', #{spare39}, '%')</if>
</where>
</select>
<select id="selectBasProductByProductGuid" parameterType="String" resultMap="BasProductResult">
<include refid="selectBasProductVo"/>
where product_guid = #{productGuid}
</select>
<select id="selectBasProductByProductId" parameterType="String" resultMap="BasProductResult">
<include refid="selectBasProductVo"/>
where product_id = #{productId}
</select>
<insert id="insertBasProduct" parameterType="BasProduct">
insert into bas_product
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="productGuid != null">product_guid,</if>
<if test="productId != null and productId != ''">product_id,</if>
<if test="parentId != null">parent_id,</if>
<if test="price != null">price,</if>
<if test="cargoNo != null">cargo_no,</if>
<if test="unit != null">unit,</if>
<if test="spec != null">spec,</if>
<if test="remark != null">remark,</if>
<if test="spare1 != null">spare1,</if>
<if test="spare2 != null">spare2,</if>
<if test="spare3 != null">spare3,</if>
<if test="spare4 != null">spare4,</if>
<if test="spare5 != null">spare5,</if>
<if test="spare6 != null">spare6,</if>
<if test="productName != null and productName != ''">product_name,</if>
<if test="spare7 != null">spare7,</if>
<if test="spare8 != null">spare8,</if>
<if test="spare9 != null">spare9,</if>
<if test="spare10 != null">spare10,</if>
<if test="spare11 != null">spare11,</if>
<if test="spare12 != null">spare12,</if>
<if test="spare13 != null">spare13,</if>
<if test="spare14 != null">spare14,</if>
<if test="spare15 != null">spare15,</if>
<if test="spare16 != null">spare16,</if>
<if test="spare17 != null">spare17,</if>
<if test="spare18 != null">spare18,</if>
<if test="spare19 != null">spare19,</if>
<if test="spare20 != null">spare20,</if>
<if test="spare21 != null">spare21,</if>
<if test="spare22 != null">spare22,</if>
<if test="spare23 != null">spare23,</if>
<if test="spare24 != null">spare24,</if>
<if test="spare25 != null">spare25,</if>
<if test="spare26 != null">spare26,</if>
<if test="spare27 != null">spare27,</if>
<if test="spare28 != null">spare28,</if>
<if test="spare29 != null">spare29,</if>
<if test="spare30 != null">spare30,</if>
<if test="spare31 != null">spare31,</if>
<if test="spare32 != null">spare32,</if>
<if test="spare33 != null">spare33,</if>
<if test="spare34 != null">spare34,</if>
<if test="spare35 != null">spare35,</if>
<if test="spare36 != null">spare36,</if>
<if test="spare37 != null">spare37,</if>
<if test="spare38 != null">spare38,</if>
<if test="spare39 != null">spare39,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="productGuid != null">#{productGuid},</if>
<if test="productId != null and productId != ''">#{productId},</if>
<if test="parentId != null">#{parentId},</if>
<if test="price != null">#{price},</if>
<if test="cargoNo != null">#{cargoNo},</if>
<if test="unit != null">#{unit},</if>
<if test="spec != null">#{spec},</if>
<if test="remark != null">#{remark},</if>
<if test="spare1 != null">#{spare1},</if>
<if test="spare2 != null">#{spare2},</if>
<if test="spare3 != null">#{spare3},</if>
<if test="spare4 != null">#{spare4},</if>
<if test="spare5 != null">#{spare5},</if>
<if test="spare6 != null">#{spare6},</if>
<if test="productName != null and productName != ''">#{productName},</if>
<if test="spare7 != null">#{spare7},</if>
<if test="spare8 != null">#{spare8},</if>
<if test="spare9 != null">#{spare9},</if>
<if test="spare10 != null">#{spare10},</if>
<if test="spare11 != null">#{spare11},</if>
<if test="spare12 != null">#{spare12},</if>
<if test="spare13 != null">#{spare13},</if>
<if test="spare14 != null">#{spare14},</if>
<if test="spare15 != null">#{spare15},</if>
<if test="spare16 != null">#{spare16},</if>
<if test="spare17 != null">#{spare17},</if>
<if test="spare18 != null">#{spare18},</if>
<if test="spare19 != null">#{spare19},</if>
<if test="spare20 != null">#{spare20},</if>
<if test="spare21 != null">#{spare21},</if>
<if test="spare22 != null">#{spare22},</if>
<if test="spare23 != null">#{spare23},</if>
<if test="spare24 != null">#{spare24},</if>
<if test="spare25 != null">#{spare25},</if>
<if test="spare26 != null">#{spare26},</if>
<if test="spare27 != null">#{spare27},</if>
<if test="spare28 != null">#{spare28},</if>
<if test="spare29 != null">#{spare29},</if>
<if test="spare30 != null">#{spare30},</if>
<if test="spare31 != null">#{spare31},</if>
<if test="spare32 != null">#{spare32},</if>
<if test="spare33 != null">#{spare33},</if>
<if test="spare34 != null">#{spare34},</if>
<if test="spare35 != null">#{spare35},</if>
<if test="spare36 != null">#{spare36},</if>
<if test="spare37 != null">#{spare37},</if>
<if test="spare38 != null">#{spare38},</if>
<if test="spare39 != null">#{spare39},</if>
</trim>
</insert>
<update id="updateBasProduct" parameterType="BasProduct">
update bas_product
<trim prefix="SET" suffixOverrides=",">
<if test="productId != null and productId != ''">product_id = #{productId},</if>
<if test="parentId != null">parent_id = #{parentId},</if>
<if test="price != null">price = #{price},</if>
<if test="cargoNo != null">cargo_no = #{cargoNo},</if>
<if test="unit != null">unit = #{unit},</if>
<if test="spec != null">spec = #{spec},</if>
<if test="remark != null">remark = #{remark},</if>
<if test="spare1 != null">spare1 = #{spare1},</if>
<if test="spare2 != null">spare2 = #{spare2},</if>
<if test="spare3 != null">spare3 = #{spare3},</if>
<if test="spare4 != null">spare4 = #{spare4},</if>
<if test="spare5 != null">spare5 = #{spare5},</if>
<if test="spare6 != null">spare6 = #{spare6},</if>
<if test="productName != null and productName != ''">product_name = #{productName},</if>
<if test="spare7 != null">spare7 = #{spare7},</if>
<if test="spare8 != null">spare8 = #{spare8},</if>
<if test="spare9 != null">spare9 = #{spare9},</if>
<if test="spare10 != null">spare10 = #{spare10},</if>
<if test="spare11 != null">spare11 = #{spare11},</if>
<if test="spare12 != null">spare12 = #{spare12},</if>
<if test="spare13 != null">spare13 = #{spare13},</if>
<if test="spare14 != null">spare14 = #{spare14},</if>
<if test="spare15 != null">spare15 = #{spare15},</if>
<if test="spare16 != null">spare16 = #{spare16},</if>
<if test="spare17 != null">spare17 = #{spare17},</if>
<if test="spare18 != null">spare18 = #{spare18},</if>
<if test="spare19 != null">spare19 = #{spare19},</if>
<if test="spare20 != null">spare20 = #{spare20},</if>
<if test="spare21 != null">spare21 = #{spare21},</if>
<if test="spare22 != null">spare22 = #{spare22},</if>
<if test="spare23 != null">spare23 = #{spare23},</if>
<if test="spare24 != null">spare24 = #{spare24},</if>
<if test="spare25 != null">spare25 = #{spare25},</if>
<if test="spare26 != null">spare26 = #{spare26},</if>
<if test="spare27 != null">spare27 = #{spare27},</if>
<if test="spare28 != null">spare28 = #{spare28},</if>
<if test="spare29 != null">spare29 = #{spare29},</if>
<if test="spare30 != null">spare30 = #{spare30},</if>
<if test="spare31 != null">spare31 = #{spare31},</if>
<if test="spare32 != null">spare32 = #{spare32},</if>
<if test="spare33 != null">spare33 = #{spare33},</if>
<if test="spare34 != null">spare34 = #{spare34},</if>
<if test="spare35 != null">spare35 = #{spare35},</if>
<if test="spare36 != null">spare36 = #{spare36},</if>
<if test="spare37 != null">spare37 = #{spare37},</if>
<if test="spare38 != null">spare38 = #{spare38},</if>
<if test="spare39 != null">spare39 = #{spare39},</if>
</trim>
where product_guid = #{productGuid}
</update>
<delete id="deleteBasProductByProductGuid" parameterType="String">
delete from bas_product where product_guid = #{productGuid}
</delete>
<delete id="deleteBasProductByProductGuids" parameterType="String">
delete from bas_product where product_guid in
<foreach item="productGuid" collection="array" open="(" separator="," close=")">
#{productGuid}
</foreach>
</delete>
</mapper>

77
ruoyi-admin/src/main/resources/mapper/mapper/bas/BasProductPortMapper.xml Normal file
View File

@@ -0,0 +1,77 @@
<?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.bas.port.mapper.BasProductPortMapper">
<resultMap type="BasProductPort" id="BasProductPortResult">
<result property="id" column="id" />
<result property="portName" column="port_name" />
<result property="portType" column="port_type" />
<result property="portDesc" column="port_desc" />
<result property="createMan" column="create_man" />
<result property="createTime" column="create_time" />
</resultMap>
<sql id="selectBasProductPortVo">
select id, port_name, port_type, port_desc, create_man, create_time from bas_product_port
</sql>
<select id="selectBasProductPortList" parameterType="BasProductPort" resultMap="BasProductPortResult">
<include refid="selectBasProductPortVo"/>
<where>
<if test="portName != null and portName != ''"> and port_name like concat('%', #{portName}, '%')</if>
<if test="portType != null and portType != ''"> and port_type like concat("%", #{portType}, "%")</if>
<if test="portDesc != null and portDesc != ''"> and port_desc like concat("%", #{portDesc}, "%")</if>
<if test="createMan != null and createMan != ''"> and create_man like concat("%", #{createMan}, "%")</if>
</where>
</select>
<select id="selectBasProductPortById" parameterType="String" resultMap="BasProductPortResult">
<include refid="selectBasProductPortVo"/>
where id = #{id}
</select>
<insert id="insertBasProductPort" parameterType="BasProductPort">
insert into bas_product_port
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">id,</if>
<if test="portName != null">port_name,</if>
<if test="portType != null">port_type,</if>
<if test="portDesc != null">port_desc,</if>
<if test="createMan != null">create_man,</if>
<if test="createTime != null">create_time,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">#{id},</if>
<if test="portName != null">#{portName},</if>
<if test="portType != null">#{portType},</if>
<if test="portDesc != null">#{portDesc},</if>
<if test="createMan != null">#{createMan},</if>
<if test="createTime != null">#{createTime},</if>
</trim>
</insert>
<update id="updateBasProductPort" parameterType="BasProductPort">
update bas_product_port
<trim prefix="SET" suffixOverrides=",">
<if test="portName != null">port_name = #{portName},</if>
<if test="portType != null">port_type = #{portType},</if>
<if test="portDesc != null">port_desc = #{portDesc},</if>
<if test="createMan != null">create_man = #{createMan},</if>
<if test="createTime != null">create_time = #{createTime},</if>
</trim>
where id = #{id}
</update>
<delete id="deleteBasProductPortById" parameterType="String">
delete from bas_product_port where id = #{id}
</delete>
<delete id="deleteBasProductPortByIds" parameterType="String">
delete from bas_product_port where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
</delete>
</mapper>

115
ruoyi-admin/src/main/resources/mapper/mapper/bas/BasProductPortRelMapper.xml Normal file
View File

@@ -0,0 +1,115 @@
<?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.bas.portrel.mapper.BasProductPortRelMapper">
<resultMap type="BasProductPortRel" id="BasProductPortRelResult">
<result property="id" column="id" />
<result property="productGuid" column="product_guid" />
<result property="productId" column="product_id" />
<result property="portId" column="port_id" />
</resultMap>
<sql id="selectBasProductPortRelVo">
select id, product_guid, product_id, port_id from bas_product_port_rel
</sql>
<resultMap type="BasProduct" id="BasProductResult">
<result property="productGuid" column="product_guid" />
<result property="productId" column="product_id" />
<result property="parentId" column="parent_id" />
<result property="price" column="price" />
<result property="cargoNo" column="cargo_no" />
<result property="unit" column="unit" />
<result property="spec" column="spec" />
<result property="remark" column="remark" />
<result property="spare1" column="spare1" />
<result property="spare2" column="spare2" />
<result property="spare3" column="spare3" />
<result property="spare4" column="spare4" />
<result property="spare5" column="spare5" />
<result property="spare6" column="spare6" />
<result property="spare7" column="spare7" />
<result property="spare8" column="spare8" />
<result property="spare9" column="spare9" />
<result property="productName" column="product_name" />
</resultMap>
<sql id="selectBasProductVo">
select product_guid, product_id, parent_id, price, cargo_no, unit, spec, remark, spare1, spare2, spare3, spare4, spare5, spare6, product_name from bas_product
</sql>
<select id="selectBasProductPortRelList" parameterType="BasProductPortRel" resultMap="BasProductPortRelResult">
<include refid="selectBasProductPortRelVo"/>
<where>
<if test="productGuid != null and productGuid != ''"> and product_guid like concat("%", #{productGuid}, "%")</if>
<if test="productId != null and productId != ''"> and product_id like concat("%", #{productId}, "%")</if>
<if test="portId != null and portId != ''"> and port_id like concat("%", #{portId}, "%")</if>
</where>
</select>
<select id="selectBasProductPortRelById" parameterType="Long" resultMap="BasProductPortRelResult">
<include refid="selectBasProductPortRelVo"/>
where id = #{id}
</select>
<select id="selectNotBindProduct" resultMap="BasProductResult">
select product_guid, product_id, parent_id, price, cargo_no, unit, spec, remark, spare1, spare2, spare3, spare4, spare5, spare6, product_name, spare7, spare8, spare9
from bas_product bp
<where>
<if test="bindStatus =='1'.toString()">
and product_id in (select product_id from bas_product_port_rel where port_id=#{portId})
</if>
<if test="bindStatus =='0'.toString()">
and product_id not in (select product_id from bas_product_port_rel where port_id=#{portId})
</if>
<if test="productId != null and productId != ''"> and product_id like concat("%", #{productId}, "%")</if>
<if test="productName != null and productName != ''"> and product_name like concat('%', #{productName}, '%')</if>
</where>
</select>
<insert id="insertBasProductPortRel" parameterType="BasProductPortRel">
insert into bas_product_port_rel
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">id,</if>
<if test="productGuid != null">product_guid,</if>
<if test="productId != null">product_id,</if>
<if test="portId != null">port_id,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">#{id},</if>
<if test="productGuid != null">#{productGuid},</if>
<if test="productId != null">#{productId},</if>
<if test="portId != null">#{portId},</if>
</trim>
</insert>
<update id="updateBasProductPortRel" parameterType="BasProductPortRel">
update bas_product_port_rel
<trim prefix="SET" suffixOverrides=",">
<if test="productGuid != null">product_guid = #{productGuid},</if>
<if test="productId != null">product_id = #{productId},</if>
<if test="portId != null">port_id = #{portId},</if>
</trim>
where id = #{id}
</update>
<delete id="deleteBasProductPortRelById" parameterType="Long">
delete from bas_product_port_rel where id = #{id}
</delete>
<delete id="deleteBasProductPortRelByIds" parameterType="String">
delete from bas_product_port_rel where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
</delete>
<delete id="deleteBasProductPortRel">
delete from bas_product_port_rel where port_id=#{portId} and product_id in
<foreach item="productId" collection="productIds" open="(" separator="," close=")">
#{productId}
</foreach>
</delete>
</mapper>

93
ruoyi-admin/src/main/resources/mapper/mapper/bas/BasRoadwayMapper.xml Normal file
View File

@@ -0,0 +1,93 @@
<?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.bas.roadway.mapper.BasRoadwayMapper">
<resultMap type="BasRoadway" id="BasRoadwayResult">
<result property="id" column="id" />
<result property="roadwayId" column="roadway_id" />
<result property="warehouseId" column="warehouse_id" />
<result property="roadwayName" column="roadway_name" />
<result property="deviceId" column="device_id" />
<result property="inLocked" column="in_locked" />
<result property="outLocked" column="out_locked" />
<result property="inLocked2" column="in_locked2" />
<result property="outLocked2" column="out_locked2" />
</resultMap>
<sql id="selectBasRoadwayVo">
select id, roadway_id, warehouse_id, roadway_name, device_id, in_locked, out_locked, in_locked2, out_locked2 from bas_roadway
</sql>
<select id="selectBasRoadwayList" parameterType="BasRoadway" resultMap="BasRoadwayResult">
<include refid="selectBasRoadwayVo"/>
<where>
<if test="roadwayId != null and roadwayId != ''"> and roadway_id like concat("%", #{roadwayId}, "%")</if>
<if test="warehouseId != null and warehouseId != ''"> and warehouse_id like concat("%", #{warehouseId}, "%")</if>
<if test="roadwayName != null and roadwayName != ''"> and roadway_name like concat('%', #{roadwayName}, '%')</if>
<if test="deviceId != null and deviceId != ''"> and device_id like concat("%", #{deviceId}, "%")</if>
<if test="inLocked != null and inLocked != ''"> and in_locked like concat("%", #{inLocked}, "%")</if>
<if test="outLocked != null and outLocked != ''"> and out_locked like concat("%", #{outLocked}, "%")</if>
<if test="inLocked2 != null and inLocked2 != ''"> and in_locked2 like concat("%", #{inLocked2}, "%")</if>
<if test="outLocked2 != null and outLocked2 != ''"> and out_locked2 like concat("%", #{outLocked2}, "%")</if>
</where>
</select>
<select id="selectBasRoadwayById" parameterType="String" resultMap="BasRoadwayResult">
<include refid="selectBasRoadwayVo"/>
where id = #{id}
</select>
<insert id="insertBasRoadway" parameterType="BasRoadway">
insert into bas_roadway
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null and id != ''">id,</if>
<if test="roadwayId != null and roadwayId != ''">roadway_id,</if>
<if test="warehouseId != null and warehouseId != ''">warehouse_id,</if>
<if test="roadwayName != null">roadway_name,</if>
<if test="deviceId != null">device_id,</if>
<if test="inLocked != null and inLocked != ''">in_locked,</if>
<if test="outLocked != null and outLocked != ''">out_locked,</if>
<if test="inLocked2 != null and inLocked2 != ''">in_locked2,</if>
<if test="outLocked2 != null and outLocked2 != ''">out_locked2,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null and id != ''">#{id},</if>
<if test="roadwayId != null and roadwayId != ''">#{roadwayId},</if>
<if test="warehouseId != null and warehouseId != ''">#{warehouseId},</if>
<if test="roadwayName != null">#{roadwayName},</if>
<if test="deviceId != null">#{deviceId},</if>
<if test="inLocked != null and inLocked != ''">#{inLocked},</if>
<if test="outLocked != null and outLocked != ''">#{outLocked},</if>
<if test="inLocked2 != null and inLocked2 != ''">#{inLocked2},</if>
<if test="outLocked2 != null and outLocked2 != ''">#{outLocked2},</if>
</trim>
</insert>
<update id="updateBasRoadway" parameterType="BasRoadway">
update bas_roadway
<trim prefix="SET" suffixOverrides=",">
<if test="roadwayId != null and roadwayId != ''">roadway_id = #{roadwayId},</if>
<if test="warehouseId != null and warehouseId != ''">warehouse_id = #{warehouseId},</if>
<if test="roadwayName != null">roadway_name = #{roadwayName},</if>
<if test="deviceId != null">device_id = #{deviceId},</if>
<if test="inLocked != null and inLocked != ''">in_locked = #{inLocked},</if>
<if test="outLocked != null and outLocked != ''">out_locked = #{outLocked},</if>
<if test="inLocked2 != null and inLocked2 != ''">in_locked2 = #{inLocked2},</if>
<if test="outLocked2 != null and outLocked2 != ''">out_locked2 = #{outLocked2},</if>
</trim>
where id = #{id}
</update>
<delete id="deleteBasRoadwayById" parameterType="String">
delete from bas_roadway where id = #{id}
</delete>
<delete id="deleteBasRoadwayByIds" parameterType="String">
delete from bas_roadway where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
</delete>
</mapper>

142
ruoyi-admin/src/main/resources/mapper/mapper/bas/BasSupplierMapper.xml Normal file
View File

@@ -0,0 +1,142 @@
<?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.bas.BasSupplier.mapper.BasSupplierMapper">
<resultMap type="BasSupplier" id="BasSupplierResult">
<result property="id" column="id" />
<result property="supplierNo" column="supplier_no" />
<result property="supplierGroupNo" column="supplier_group_no" />
<result property="supplierName" column="supplier_name" />
<result property="simpleName" column="simple_name" />
<result property="useable" column="useable" />
<result property="remark" column="remark" />
<result property="supplierArae" column="supplier_arae" />
<result property="taxpayerRegistrationNumber" column="taxpayer_registration_number" />
<result property="country" column="country" />
<result property="timeZone" column="time_zone" />
<result property="dataFormat" column="data_format" />
<result property="receivingCountry" column="receiving_country" />
<result property="taxCategory" column="tax_category" />
<result property="legalPerson" column="legal_person" />
<result property="registeredCapital" column="registered_capital" />
<result property="address" column="address" />
<result property="contactName" column="contact_name" />
<result property="contactNumber" column="contact_number" />
</resultMap>
<sql id="selectBasSupplierVo">
select id, supplier_no, supplier_group_no, supplier_name, simple_name, useable, remark, supplier_arae, taxpayer_registration_number, country, time_zone, data_format, receiving_country, tax_category, legal_person, registered_capital, address, contact_name, contact_number from bas_supplier
</sql>
<select id="selectBasSupplierList" parameterType="BasSupplier" resultMap="BasSupplierResult">
<include refid="selectBasSupplierVo"/>
<where>
<if test="supplierNo != null and supplierNo != ''"> and supplier_no like concat('%', #{supplierNo}, '%')</if>
<if test="supplierGroupNo != null and supplierGroupNo != ''"> and supplier_group_no like concat('%', #{supplierGroupNo}, '%')</if>
<if test="supplierName != null and supplierName != ''"> and supplier_name like concat('%', #{supplierName}, '%')</if>
<if test="simpleName != null and simpleName != ''"> and simple_name like concat('%', #{simpleName}, '%')</if>
<if test="useable != null and useable != ''"> and useable like concat("%", #{useable}, "%")</if>
<if test="supplierArae != null and supplierArae != ''"> and supplier_arae like concat('%', #{supplierArae}, '%')</if>
<if test="taxpayerRegistrationNumber != null and taxpayerRegistrationNumber != ''"> and taxpayer_registration_number like concat('%', #{taxpayerRegistrationNumber}, '%')</if>
<if test="country != null and country != ''"> and country like concat('%', #{country}, '%')</if>
<if test="timeZone != null and timeZone != ''"> and time_zone like concat('%', #{timeZone}, '%')</if>
<if test="dataFormat != null and dataFormat != ''"> and data_format like concat('%', #{dataFormat}, '%')</if>
<if test="receivingCountry != null and receivingCountry != ''"> and receiving_country like concat('%', #{receivingCountry}, '%')</if>
<if test="taxCategory != null and taxCategory != ''"> and tax_category like concat('%', #{taxCategory}, '%')</if>
<if test="legalPerson != null and legalPerson != ''"> and legal_person like concat('%', #{legalPerson}, '%')</if>
<if test="registeredCapital != null and registeredCapital != ''"> and registered_capital like concat('%', #{registeredCapital}, '%')</if>
<if test="address != null and address != ''"> and address like concat('%', #{address}, '%')</if>
<if test="contactName != null and contactName != ''"> and contact_name like concat('%', #{contactName}, '%')</if>
<if test="contactNumber != null and contactNumber != ''"> and contact_number = like concat('%',#{contactNumber}, '%')</if>
</where>
</select>
<select id="selectBasSupplierById" parameterType="String" resultMap="BasSupplierResult">
<include refid="selectBasSupplierVo"/>
where id = #{id}
</select>
<insert id="insertBasSupplier" parameterType="BasSupplier">
insert into bas_supplier
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null and id != ''">id,</if>
<if test="supplierNo != null">supplier_no,</if>
<if test="supplierGroupNo != null">supplier_group_no,</if>
<if test="supplierName != null">supplier_name,</if>
<if test="simpleName != null">simple_name,</if>
<if test="useable != null and useable != ''">useable,</if>
<if test="remark != null">remark,</if>
<if test="supplierArae != null">supplier_arae,</if>
<if test="taxpayerRegistrationNumber != null">taxpayer_registration_number,</if>
<if test="country != null">country,</if>
<if test="timeZone != null">time_zone,</if>
<if test="dataFormat != null">data_format,</if>
<if test="receivingCountry != null">receiving_country,</if>
<if test="taxCategory != null">tax_category,</if>
<if test="legalPerson != null">legal_person,</if>
<if test="registeredCapital != null">registered_capital,</if>
<if test="address != null">address,</if>
<if test="contactName != null">contact_name,</if>
<if test="contactNumber != null">contact_number,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null and id != ''">#{id},</if>
<if test="supplierNo != null">#{supplierNo},</if>
<if test="supplierGroupNo != null">#{supplierGroupNo},</if>
<if test="supplierName != null">#{supplierName},</if>
<if test="simpleName != null">#{simpleName},</if>
<if test="useable != null and useable != ''">#{useable},</if>
<if test="remark != null">#{remark},</if>
<if test="supplierArae != null">#{supplierArae},</if>
<if test="taxpayerRegistrationNumber != null">#{taxpayerRegistrationNumber},</if>
<if test="country != null">#{country},</if>
<if test="timeZone != null">#{timeZone},</if>
<if test="dataFormat != null">#{dataFormat},</if>
<if test="receivingCountry != null">#{receivingCountry},</if>
<if test="taxCategory != null">#{taxCategory},</if>
<if test="legalPerson != null">#{legalPerson},</if>
<if test="registeredCapital != null">#{registeredCapital},</if>
<if test="address != null">#{address},</if>
<if test="contactName != null">#{contactName},</if>
<if test="contactNumber != null">#{contactNumber},</if>
</trim>
</insert>
<update id="updateBasSupplier" parameterType="BasSupplier">
update bas_supplier
<trim prefix="SET" suffixOverrides=",">
<if test="supplierNo != null">supplier_no = #{supplierNo},</if>
<if test="supplierGroupNo != null">supplier_group_no = #{supplierGroupNo},</if>
<if test="supplierName != null">supplier_name = #{supplierName},</if>
<if test="simpleName != null">simple_name = #{simpleName},</if>
<if test="useable != null and useable != ''">useable = #{useable},</if>
<if test="remark != null">remark = #{remark},</if>
<if test="supplierArae != null">supplier_arae = #{supplierArae},</if>
<if test="taxpayerRegistrationNumber != null">taxpayer_registration_number = #{taxpayerRegistrationNumber},</if>
<if test="country != null">country = #{country},</if>
<if test="timeZone != null">time_zone = #{timeZone},</if>
<if test="dataFormat != null">data_format = #{dataFormat},</if>
<if test="receivingCountry != null">receiving_country = #{receivingCountry},</if>
<if test="taxCategory != null">tax_category = #{taxCategory},</if>
<if test="legalPerson != null">legal_person = #{legalPerson},</if>
<if test="registeredCapital != null">registered_capital = #{registeredCapital},</if>
<if test="address != null">address = #{address},</if>
<if test="contactName != null">contact_name = #{contactName},</if>
<if test="contactNumber != null">contact_number = #{contactNumber},</if>
</trim>
where id = #{id}
</update>
<delete id="deleteBasSupplierById" parameterType="String">
delete from bas_supplier where id = #{id}
</delete>
<delete id="deleteBasSupplierByIds" parameterType="String">
delete from bas_supplier where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
</delete>
</mapper>

96
ruoyi-admin/src/main/resources/mapper/mapper/bas/BasTagMapper.xml Normal file
View File

@@ -0,0 +1,96 @@
<?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.bas.tag.mapper.BasTagMapper">
<resultMap type="BasTag" id="BasTagResult">
<result property="id" column="id" />
<result property="ip" column="ip" />
<result property="pickAdd" column="pick_add" />
<result property="trayCode" column="tray_code" />
<result property="curNum" column="cur_num" />
<result property="sendCompleted" column="send_completed" />
<result property="spare1" column="spare1" />
<result property="spare2" column="spare2" />
<result property="spare3" column="spare3" />
</resultMap>
<sql id="selectBasTagVo">
select id, ip, pick_add, tray_code, cur_num, send_completed, spare1, spare2, spare3 from bas_tag
</sql>
<select id="selectBasTagList" parameterType="BasTag" resultMap="BasTagResult">
<include refid="selectBasTagVo"/>
<where>
<if test="ip != null and ip != ''"> and ip like concat("%", #{ip}, "%")</if>
<if test="pickAdd != null and pickAdd != ''"> and pick_add like concat("%", #{pickAdd}, "%")</if>
<if test="trayCode != null and trayCode != ''"> and tray_code like concat("%", #{trayCode}, "%")</if>
<if test="curNum != null and curNum != ''"> and cur_num like concat("%", #{curNum}, "%")</if>
<if test="sendCompleted != null and sendCompleted != ''"> and send_completed like concat("%", #{sendCompleted}, "%")</if>
<if test="spare1 != null and spare1 != ''"> and spare1 like concat("%", #{spare1}, "%")</if>
<if test="spare2 != null and spare2 != ''"> and spare2 like concat("%", #{spare2}, "%")</if>
<if test="spare3 != null and spare3 != ''"> and spare3 like concat("%", #{spare3}, "%")</if>
</where>
</select>
<select id="selectBasTagById" parameterType="Long" resultMap="BasTagResult">
<include refid="selectBasTagVo"/>
where id = #{id}
</select>
<select id="selectBasTagByTrayCode" resultMap="BasTagResult">
<include refid="selectBasTagVo"/>
where tray_code = #{trayCode}
</select>
<insert id="insertBasTag" parameterType="BasTag" useGeneratedKeys="true" keyProperty="id">
insert into bas_tag
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="ip != null">ip,</if>
<if test="pickAdd != null">pick_add,</if>
<if test="trayCode != null">tray_code,</if>
<if test="curNum != null">cur_num,</if>
<if test="sendCompleted != null">send_completed,</if>
<if test="spare1 != null">spare1,</if>
<if test="spare2 != null">spare2,</if>
<if test="spare3 != null">spare3,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="ip != null">#{ip},</if>
<if test="pickAdd != null">#{pickAdd},</if>
<if test="trayCode != null">#{trayCode},</if>
<if test="curNum != null">#{curNum},</if>
<if test="sendCompleted != null">#{sendCompleted},</if>
<if test="spare1 != null">#{spare1},</if>
<if test="spare2 != null">#{spare2},</if>
<if test="spare3 != null">#{spare3},</if>
</trim>
</insert>
<update id="updateBasTag" parameterType="BasTag">
update bas_tag
<trim prefix="SET" suffixOverrides=",">
<if test="ip != null">ip = #{ip},</if>
<if test="pickAdd != null">pick_add = #{pickAdd},</if>
<if test="trayCode != null">tray_code = #{trayCode},</if>
<if test="curNum != null">cur_num = #{curNum},</if>
<if test="sendCompleted != null">send_completed = #{sendCompleted},</if>
<if test="spare1 != null">spare1 = #{spare1},</if>
<if test="spare2 != null">spare2 = #{spare2},</if>
<if test="spare3 != null">spare3 = #{spare3},</if>
</trim>
where id = #{id}
</update>
<delete id="deleteBasTagById" parameterType="Long">
delete from bas_tag where id = #{id}
</delete>
<delete id="deleteBasTagByIds" parameterType="String">
delete from bas_tag where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
</delete>
</mapper>

48
ruoyi-admin/src/main/resources/mapper/mapper/bas/BasTaskNoMapper.xml Normal file
View File

@@ -0,0 +1,48 @@
<?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.bas.taskNo.mapper.BasTaskNoMapper">
<resultMap type="com.ruoyi.bas.taskNo.domain.BasTaskNo" id="BasTaskNoResult">
<result property="id" column="id"/>
<result property="taskType" column="task_type"/>
<result property="typeName" column="type_name"/>
<result property="taskNo" column="task_no"/>
<result property="minNo" column="min_no"/>
<result property="maxNo" column="max_no"/>
</resultMap>
<sql id="selectBasTaskNoVo">
select id, task_type, type_name, task_no, min_no, max_no
from bas_task_no
</sql>
<select id="selectBasTaskNoById" parameterType="String" resultMap="BasTaskNoResult">
<include refid="selectBasTaskNoVo"/>
where id = #{id}
</select>
<update id="updateBasTaskNo" parameterType="com.ruoyi.bas.taskNo.domain.BasTaskNo">
update bas_task_no
<trim prefix="SET" suffixOverrides=",">
<if test="taskType != null">task_type = #{taskType},</if>
<if test="typeName != null">type_name = #{typeName},</if>
<if test="taskNo != null">task_no = #{taskNo},</if>
<if test="minNo != null">min_no = #{minNo},</if>
<if test="maxNo != null">max_no = #{maxNo},</if>
</trim>
where id = #{id}
</update>
<select id="getTaskNo" resultMap="BasTaskNoResult" parameterType="String">
select *
from bas_task_no
where id = #{id}
</select>
<update id="updateTaskNo" parameterType="com.ruoyi.bas.taskNo.domain.BasTaskNo">
update bas_task_no
set task_no=#{taskNo}
where id = #{id}
</update>
</mapper>

106
ruoyi-admin/src/main/resources/mapper/mapper/bas/BasTraycodeFormatMapper.xml Normal file
View File

@@ -0,0 +1,106 @@
<?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.bas.traycodeformat.mapper.BasTraycodeFormatMapper">
<resultMap type="BasTraycodeFormat" id="BasTraycodeFormatResult">
<result property="id" column="id" />
<result property="barcodeFormat" column="barcode_format" />
<result property="serialRule" column="serial_rule" />
<result property="serialExample" column="serial_example" />
<result property="remarks" column="remarks" />
<result property="minNum" column="min_num" />
<result property="maxNum" column="max_num" />
<result property="createTime" column="create_time" />
<result property="updateTime" column="update_time" />
<result property="spare1" column="spare1" />
<result property="spare2" column="spare2" />
<result property="spare3" column="spare3" />
</resultMap>
<sql id="selectBasTraycodeFormatVo">
select id, barcode_format, serial_rule, serial_example, remarks, min_num, max_num, create_time, update_time, spare1, spare2, spare3 from bas_traycode_format
</sql>
<select id="selectBasTraycodeFormatList" parameterType="BasTraycodeFormat" resultMap="BasTraycodeFormatResult">
<include refid="selectBasTraycodeFormatVo"/>
<where>
<if test="barcodeFormat != null and barcodeFormat != ''"> and barcode_format like concat('%', #{barcodeFormat}, '%')</if>
<if test="serialRule != null and serialRule != ''"> and serial_rule like concat('%',#{serialRule}, '%')</if>
<if test="serialExample != null and serialExample != ''"> and serial_example like concat('%',#{serialExample}, '%')</if>
<if test="remarks != null and remarks != ''"> and remarks like concat('%',#{remarks}, '%')</if>
<if test="minNum != null "> and min_num like concat('%',#{minNum}, '%')</if>
<if test="maxNum != null "> and max_num like concat('%',#{maxNum}, '%')</if>
<if test="spare1 != null and spare1 != ''"> and spare1 like concat("%", #{spare1}, "%")</if>
<if test="spare2 != null and spare2 != ''"> and spare2 like concat("%", #{spare2}, "%")</if>
<if test="spare3 != null and spare3 != ''"> and spare3 like concat("%", #{spare3}, "%")</if>
</where>
</select>
<select id="selectBasTraycodeFormatById" parameterType="Long" resultMap="BasTraycodeFormatResult">
<include refid="selectBasTraycodeFormatVo"/>
where id = #{id}
</select>
<insert id="insertBasTraycodeFormat" parameterType="BasTraycodeFormat">
insert into bas_traycode_format
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">id,</if>
<if test="barcodeFormat != null">barcode_format,</if>
<if test="serialRule != null">serial_rule,</if>
<if test="serialExample != null">serial_example,</if>
<if test="remarks != null">remarks,</if>
<if test="minNum != null">min_num,</if>
<if test="maxNum != null">max_num,</if>
<if test="createTime != null">create_time,</if>
<if test="updateTime != null">update_time,</if>
<if test="spare1 != null">spare1,</if>
<if test="spare2 != null">spare2,</if>
<if test="spare3 != null">spare3,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">#{id},</if>
<if test="barcodeFormat != null">#{barcodeFormat},</if>
<if test="serialRule != null">#{serialRule},</if>
<if test="serialExample != null">#{serialExample},</if>
<if test="remarks != null">#{remarks},</if>
<if test="minNum != null">#{minNum},</if>
<if test="maxNum != null">#{maxNum},</if>
<if test="createTime != null">#{createTime},</if>
<if test="updateTime != null">#{updateTime},</if>
<if test="spare1 != null">#{spare1},</if>
<if test="spare2 != null">#{spare2},</if>
<if test="spare3 != null">#{spare3},</if>
</trim>
</insert>
<update id="updateBasTraycodeFormat" parameterType="BasTraycodeFormat">
update bas_traycode_format
<trim prefix="SET" suffixOverrides=",">
<if test="barcodeFormat != null">barcode_format = #{barcodeFormat},</if>
<if test="serialRule != null">serial_rule = #{serialRule},</if>
<if test="serialExample != null">serial_example = #{serialExample},</if>
<if test="remarks != null">remarks = #{remarks},</if>
<if test="minNum != null">min_num = #{minNum},</if>
<if test="maxNum != null">max_num = #{maxNum},</if>
<if test="createTime != null">create_time = #{createTime},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>
<if test="spare1 != null">spare1 = #{spare1},</if>
<if test="spare2 != null">spare2 = #{spare2},</if>
<if test="spare3 != null">spare3 = #{spare3},</if>
</trim>
where id = #{id}
</update>
<delete id="deleteBasTraycodeFormatById" parameterType="Long">
delete from bas_traycode_format where id = #{id}
</delete>
<delete id="deleteBasTraycodeFormatByIds" parameterType="String">
delete from bas_traycode_format where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
</delete>
</mapper>

101
ruoyi-admin/src/main/resources/mapper/mapper/bas/BasTraycodeMapper.xml Normal file
View File

@@ -0,0 +1,101 @@
<?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.bas.traycode.mapper.BasTraycodeMapper">
<resultMap type="BasTraycode" id="BasTraycodeResult">
<result property="id" column="id" />
<result property="formatId" column="format_id" />
<result property="formatName" column="format_name" />
<result property="trayCode" column="tray_code" />
<result property="createTime" column="create_time" />
<result property="updateTime" column="update_time" />
<result property="spare1" column="spare1" />
<result property="spare2" column="spare2" />
<result property="spare3" column="spare3" />
</resultMap>
<sql id="selectBasTraycodeVo">
select bt.id, bt.format_id, bt.tray_code, bt.create_time, bt.update_time, bt.spare1, bt.spare2, bt.spare3,btf.remarks as format_name
from bas_traycode bt
left join bas_traycode_format btf on btf.id = bt.format_id
</sql>
<select id="selectBasTraycodeList" parameterType="BasTraycode" resultMap="BasTraycodeResult">
<include refid="selectBasTraycodeVo"/>
<where>
<if test="formatId != null "> and bt.format_id like concat("%", #{formatId}, "%")</if>
<if test="trayCode != null and trayCode != ''"> and bt.tray_code like concat('%',#{trayCode}, '%')</if>
<if test="spare1 != null and spare1 != ''"> and bt.spare1 like concat("%", #{spare1}, "%")</if>
<if test="spare2 != null and spare2 != ''"> and bt.spare2 like concat("%", #{spare2}, "%")</if>
<if test="spare3 != null and spare3 != ''"> and bt.spare3 like concat("%", #{spare3}, "%")</if>
</where>
</select>
<select id="selectBasTraycodeById" parameterType="Long" resultMap="BasTraycodeResult">
<include refid="selectBasTraycodeVo"/>
where bt.id = #{id}
</select>
<insert id="insertBasTraycode" parameterType="BasTraycode">
insert into bas_traycode
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">id,</if>
<if test="formatId != null">format_id,</if>
<if test="trayCode != null">tray_code,</if>
<if test="createTime != null">create_time,</if>
<if test="updateTime != null">update_time,</if>
<if test="spare1 != null">spare1,</if>
<if test="spare2 != null">spare2,</if>
<if test="spare3 != null">spare3,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">#{id},</if>
<if test="formatId != null">#{formatId},</if>
<if test="trayCode != null">#{trayCode},</if>
<if test="createTime != null">#{createTime},</if>
<if test="updateTime != null">#{updateTime},</if>
<if test="spare1 != null">#{spare1},</if>
<if test="spare2 != null">#{spare2},</if>
<if test="spare3 != null">#{spare3},</if>
</trim>
</insert>
<insert id="insertBasTraycodeList">
insert into bas_traycode( format_id, tray_code) values
<foreach item="item" collection="list" separator=",">
(
<if test="item.formatId != null">#{item.formatId},</if>
<if test="item.trayCode != null">#{item.trayCode}</if>
)
</foreach>
</insert>
<update id="updateBasTraycode" parameterType="BasTraycode">
update bas_traycode
<trim prefix="SET" suffixOverrides=",">
<if test="formatId != null">format_id = #{formatId},</if>
<if test="trayCode != null">tray_code = #{trayCode},</if>
<if test="createTime != null">create_time = #{createTime},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>
<if test="spare1 != null">spare1 = #{spare1},</if>
<if test="spare2 != null">spare2 = #{spare2},</if>
<if test="spare3 != null">spare3 = #{spare3},</if>
</trim>
where id = #{id}
</update>
<delete id="deleteBasTraycodeById" parameterType="Long">
delete from bas_traycode where id = #{id}
</delete>
<delete id="deleteBasTraycodeByIds" parameterType="String">
delete from bas_traycode where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
</delete>
</mapper>

73
ruoyi-admin/src/main/resources/mapper/mapper/bas/BasWarehousePortMapper.xml Normal file
View File

@@ -0,0 +1,73 @@
<?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.bas.warehousePort.mapper.BasWarehousePortMapper">
<resultMap type="BasWarehousePort" id="BasWarehousePortResult">
<result property="id" column="id" />
<result property="warehouseId" column="warehouse_id" />
<result property="portCode" column="port_code" />
<result property="portName" column="port_name" />
<result property="portType" column="port_type" />
</resultMap>
<sql id="selectBasWarehousePortVo">
select id, warehouse_id, port_code, port_name, port_type from bas_warehouse_port
</sql>
<select id="selectBasWarehousePortList" parameterType="BasWarehousePort" resultMap="BasWarehousePortResult">
<include refid="selectBasWarehousePortVo"/>
<where>
<if test="warehouseId != null and warehouseId != ''"> and warehouse_id like concat("%", #{warehouseId}, "%")</if>
<if test="portCode != null and portCode != ''"> and port_code like concat("%", #{portCode}, "%")</if>
<if test="portName != null and portName != ''"> and port_name like concat('%', #{portName}, '%')</if>
<if test="portType != null and portType != ''"> and port_type like concat("%", #{portType}, "%")</if>
</where>
</select>
<select id="selectBasWarehousePortById" parameterType="Long" resultMap="BasWarehousePortResult">
<include refid="selectBasWarehousePortVo"/>
where id = #{id}
</select>
<insert id="insertBasWarehousePort" parameterType="BasWarehousePort">
insert into bas_warehouse_port
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">id,</if>
<if test="warehouseId != null">warehouse_id,</if>
<if test="portCode != null">port_code,</if>
<if test="portName != null">port_name,</if>
<if test="portType != null">port_type,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">#{id},</if>
<if test="warehouseId != null">#{warehouseId},</if>
<if test="portCode != null">#{portCode},</if>
<if test="portName != null">#{portName},</if>
<if test="portType != null">#{portType},</if>
</trim>
</insert>
<update id="updateBasWarehousePort" parameterType="BasWarehousePort">
update bas_warehouse_port
<trim prefix="SET" suffixOverrides=",">
<if test="warehouseId != null">warehouse_id = #{warehouseId},</if>
<if test="portCode != null">port_code = #{portCode},</if>
<if test="portName != null">port_name = #{portName},</if>
<if test="portType != null">port_type = #{portType},</if>
</trim>
where id = #{id}
</update>
<delete id="deleteBasWarehousePortById" parameterType="Long">
delete from bas_warehouse_port where id = #{id}
</delete>
<delete id="deleteBasWarehousePortByIds" parameterType="String">
delete from bas_warehouse_port where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
</delete>
</mapper>

Some files were not shown because too many files have changed in this diff Show More