diff --git a/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToWmsServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToWmsServiceImpl.java
index fa2dd51..3a5d329 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToWmsServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToWmsServiceImpl.java
@@ -160,7 +160,7 @@ public class ToWmsServiceImpl implements IToWmsService {
//超大托盘不处理 直接返回
if (size == 5) {
- return new AjaxResult(5, "超大托盘！");
+ return new AjaxResult(5, "超大托盘或没有长宽高需手动维护");
}
//托盘大小与电气返回不匹配
if (StrUtil.isNotBlank(requestEnter.getSize()) && !"1".equals(requestEnter.getType()) && size != Integer.parseInt(requestEnter.getSize())) {
@@ -304,7 +304,7 @@ public class ToWmsServiceImpl implements IToWmsService {
int size = Convert.toInt(basProduct.getSpare10());
//超大托盘不处理 直接返回
if (size == 5) {
- return new AjaxResult(3, "超大托盘");
+ return new AjaxResult(3, "超大托盘或没有长宽高需手动维护");
}
if(size == 1){
@@ -506,7 +506,7 @@ public class ToWmsServiceImpl implements IToWmsService {
//超大托盘不处理 直接返回
if (size == 5) {
- return new AjaxResult(3, "超大托盘");
+ return new AjaxResult(3, "超大托盘或没有长宽高需手动维护");
}
//托盘大小与电气返回不匹配
if (StrUtil.isNotBlank(requestEnter.getSize()) && !"1".equals(requestEnter.getType()) && size != Integer.parseInt(requestEnter.getSize())) {
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/in/erp/service/IProductionCallbackService.java b/ruoyi-admin/src/main/java/com/ruoyi/in/erp/service/IProductionCallbackService.java
index f2259d0..d1aba7c 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/in/erp/service/IProductionCallbackService.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/in/erp/service/IProductionCallbackService.java
@@ -51,4 +51,6 @@ public interface IProductionCallbackService {
public int deleteProductionCallbackByTrayCode(String trayCode);
int updateProductionCallbackMsg(ProductionCallback productionCallback);
+ ProductionCallback getByTrayCode(String trayCode);
+
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/in/erp/service/impl/ProductionCallbackServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/in/erp/service/impl/ProductionCallbackServiceImpl.java
index c5ea200..77b05d2 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/in/erp/service/impl/ProductionCallbackServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/in/erp/service/impl/ProductionCallbackServiceImpl.java
@@ -89,4 +89,10 @@ public class ProductionCallbackServiceImpl implements IProductionCallbackService
return productionCallbackMapper.updateProductionCallbackMsg(productionCallback);
}
+ @Override
+ public ProductionCallback getByTrayCode(String trayCode) {
+ return productionCallbackMapper.selectProductionCallbackByTrayCode(trayCode);
+ }
+
+
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/service/impl/MydoJobServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/service/impl/MydoJobServiceImpl.java
index 0f9f4eb..2c41182 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/service/impl/MydoJobServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/service/impl/MydoJobServiceImpl.java
@@ -373,19 +373,26 @@ public class MydoJobServiceImpl implements IMydoJobService {
insertHistory(mydoJob.getJobId());
//报工数据插入
if("G1005".equals(mydoJob.getEntranceId())){
- ProductionCallback productionCallback = new ProductionCallback();
- productionCallback.setTrayCode(mydoJob.getTrayCode());
- productionCallback.setBillNo(mydoJob.getLineId());
- productionCallback.setProductId(mydoJobDetails.get(0).getProductId());
- if(basProduct != null) {
- productionCallback.setProductName(basProduct.getProductName());
+ ProductionCallback existCallback = productionCallbackService.getByTrayCode(mydoJob.getTrayCode());
+ if(existCallback == null) {
+ ProductionCallback productionCallback = new ProductionCallback();
+ productionCallback.setTrayCode(mydoJob.getTrayCode());
+ productionCallback.setBillNo(mydoJob.getLineId());
+ productionCallback.setProductId(mydoJobDetails.get(0).getProductId());
+ if (basProduct != null) {
+ productionCallback.setProductName(basProduct.getProductName());
+ }
+ productionCallback.setSpec(mydoJobDetails.get(0).getSpec());
+ productionCallback.setUnit(basProduct.getUnit());
+ productionCallback.setStatus("0");
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ productionCallback.setCreateTime(sdf.format(new Date()));
+ productionCallbackService.insertProductionCallback(productionCallback);
+ }else {
+ // 已存在则跳过插入，执行后续操作
+ // 这里可以添加日志记录或其他逻辑
+ log.info("TrayCode {} 已存在于productionCallback表中，跳过插入", mydoJob.getTrayCode());
}
- productionCallback.setSpec(mydoJobDetails.get(0).getSpec());
- productionCallback.setUnit(basProduct.getUnit());
- productionCallback.setStatus("0");
- SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
- productionCallback.setCreateTime(sdf.format(new Date()));
- productionCallbackService.insertProductionCallback(productionCallback);
}
//其他出入库单据回传
diff --git a/ruoyi-admin/src/main/resources/mapper/out/ViewHandAllotStockMapper.xml b/ruoyi-admin/src/main/resources/mapper/out/ViewHandAllotStockMapper.xml
index 3ddb457..9530e64 100644
--- a/ruoyi-admin/src/main/resources/mapper/out/ViewHandAllotStockMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/out/ViewHandAllotStockMapper.xml
@@ -72,7 +72,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and product_guid = #{productGuid}
and quantity = #{quantity}
and job_id = #{jobId}
- and tray_code = #{trayCode}
+ and tray_code like concat('%', #{trayCode}, '%')
and out_quantity = #{outQuantity}
and stockin_detail_id = #{stockinDetailId}
and stockin_id = #{stockinId}
@@ -80,15 +80,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and in_class_id = #{inClassId}
and warehouse_id = #{warehouseId}
and stacking_id = #{stackingId}
- and spare1 = #{spare1}
+ and spare1 like concat('%', #{spare1}, '%')
and spare2 = #{spare2}
and spare3 = #{spare3}
and spare4 = #{spare4}
- and spare5 = #{spare5}
+ and spare5 like concat('%', #{spare5}, '%')
and spare6 like concat('%', #{spare6}, '%')
- and product_id = #{productId}
+ and product_id like concat('%', #{productId}, '%')
and product_name like concat('%', #{productName}, '%')
- and voltage = #{voltage}
+ and voltage like concat('%', #{voltage}, '%')
and power = #{power}
and phase = #{phase}
and net_weight = #{netWeight}
diff --git a/ruoyi-ui/src/components/Pagination/index.vue b/ruoyi-ui/src/components/Pagination/index.vue
index 08ac487..eecbde0 100644
--- a/ruoyi-ui/src/components/Pagination/index.vue
+++ b/ruoyi-ui/src/components/Pagination/index.vue
@@ -36,7 +36,7 @@ export default {
pageSizes: {
type: Array,
default() {
- return [10, 20, 30, 50]
+ return [10, 20, 30, 50,100,200]
}
},
// 移动端页码按钮的数量端默认值5
diff --git a/ruoyi-ui/src/views/stock/pointOut.vue b/ruoyi-ui/src/views/stock/pointOut.vue
index c69d52c..721ed93 100644
--- a/ruoyi-ui/src/views/stock/pointOut.vue
+++ b/ruoyi-ui/src/views/stock/pointOut.vue
@@ -49,6 +49,22 @@
@keyup.enter.native="handleQuery"
/>
+
+
+
+
+
+