liuxy/HuaDongYiYaoWMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rev：修改

Browse Source
This commit is contained in:
liuxy
2026-04-17 15:03:36 +08:00
parent 82273fd884
commit 9b8e24129d
19 changed files with 73 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/service/impl/PdaNotCarServiceImpl.java
View File

@@ -219,6 +219,11 @@ public class PdaNotCarServiceImpl implements PdaNotCarService {
if (pointIvtList.size() > 3) {
throw new BadRequestException("不能超过3条任务！");
}
// 按照入库顺序进行排序
pointIvtList = pointIvtList.stream()
.sorted(Comparator.comparing(row -> row.getString("out_order_seq")))
.collect(Collectors.toList());
// 查询无人车点位
List<SchBasePoint> pointList = schBasePointMapper.selectList(
new QueryWrapper<SchBasePoint>().lambda()
@@ -243,6 +248,7 @@ public class PdaNotCarServiceImpl implements PdaNotCarService {
jsonTask.put("task_group_id", task_group_id);
jsonTask.put("material_id", jsonIvt.getString("material_id"));
jsonTask.put("material_qty", jsonIvt.getString("material_qty"));
jsonTask.put("priority", pointIvtList.size() - i);
noCarBackCpTask.create(jsonTask);
}
return PdaResponse.requestOk();

34
wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/service/impl/PdaPrintServiceImpl.java
View File

@@ -6,6 +6,7 @@ import cn.hutool.core.util.ObjectUtil;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import org.nl.common.exception.BadRequestException;
import org.nl.common.utils.SecurityUtils;
import org.nl.config.SpringContextHolder;
import org.nl.system.enums.SysParamConstant;
import org.nl.system.service.dict.ISysDictService;
@@ -82,7 +83,9 @@ public class PdaPrintServiceImpl implements PdaPrintService {
String record_no = sysParamService.findByCode("RECORD_NO").getValue();
String record_no1 = sysParamService.findByCode("RECORD_NO1").getValue();
// 物料名称
String material_name = row.getString("material_name") + "-"+row.getString("material_code");
String material_name = row.getString("material_name");
// 物料编码
String material_code = row.getString("material_code");
// 批次
String pcsn = row.getString("pcsn");
// 质量代码
@@ -90,6 +93,8 @@ public class PdaPrintServiceImpl implements PdaPrintService {
if (ObjectUtil.isNotEmpty(quality_code)) {
pcsn = pcsn + "-" + quality_code;
}
// 创建人
String create_name = SecurityUtils.getCurrentNickName();
// 经销商
String supp_name = row.getString("supp_name");
// 生产商
@@ -97,16 +102,16 @@ public class PdaPrintServiceImpl implements PdaPrintService {
// 日期
String data = DateUtil.today();
// 净重
String qty = NumberUtil.round(row.getString("qty"), 3).toString();
String qty = NumberUtil.round(row.getString("qty"), 3).toString() +"KG";
// 皮重
String qty_1 = "";
// 总重
String total_qyt = row.getString("total_qty");
if (ObjectUtil.isNotEmpty(total_qyt)) {
total_qyt = NumberUtil.round(total_qyt, 3).toString();
total_qyt = NumberUtil.round(total_qyt, 3).toString() + "KG";
// 皮重
qty_1 = NumberUtil.round(NumberUtil.sub(total_qyt, qty), 3).toString();
qty_1 = NumberUtil.round(NumberUtil.sub(total_qyt, qty), 3).toString() +"KG";
} else {
total_qyt = "";
}
@@ -214,7 +219,7 @@ public class PdaPrintServiceImpl implements PdaPrintService {
"^FO252,470^GFA,209,252,12,:Z64:eJx9z7EKAjEMBuDIQbqUc81weK8Qt04+S8EX0MU54noPc4+QUtDHsI/gbTeI2oJSXcz08ZOEBOBdDLX+GE1MV9DZjL2g9X6SOHQ3l5CYk0aknediVcWcOCTiINrkhJCJ45cfcHnyWmzpUTg3xW2ZXUT8OBzzzr3YlfW8PYWhm8QeTLhvWp2Xo1K98Meu2nO1S/WZXl7pyziN:E0CE\n" +
"^FO64,511^GFA,301,324,12,:Z64:eJxF0LFqwzAQxvG/MFhLKq8ZRP0KGV0amlfRI3gMpC3K0uc68Bo6d1TIkKWDuhla6p6ioQdCPz5OoDsoFbrc3oBsgpm31SkFthmeYPyaAr0EdhE5vCXsUejExN6rp0gjDW44x/YKJln8eMHpQ7LDpyv+Wb33PMg7/Yd6WHOIJ73VfuBx0XCtdiP2e6ab1e2I22RcyZvEfcisik3Ci559sXAnv/RztVk096VfaH4E/xLV0SwIu6nkkaxeWbWNZeLbgMVW3X3WHhuFV1/3YI+p/rNuRefgvzT/A0TbSR0=:0A13\n" +
"^FO52,474^GFA,217,272,16,:Z64:eJxjYz9gYcDf2HjAjo2xgYGBgU0mwaLA4mDjgcdQvoSBRYVBYuOBg80QPoNBTgVDYnMCI4wvkXODwbA5geFgI4x/Bplv/yPtTP3HNsP/Bw6C+QYSx84kGLYZNkD4fBIGx3sMEtsMDjb+h/HbDBJ7JA42g/XL8SQ2t0kc7JFIhrinjP1gMxt/Y48E1L0IgI8PYqLzmdHUM4LtBwBRqT1Z:F006\n" +
"^FT538,424^A1I,23,25^FH\\^CI28^FD"+qty+"^FS^CI27\n" +
"^FT560,424^A1I,23,25^FH\\^CI28^FD"+qty+"^FS^CI27\n" +
"^FO13,105^GB769,0,4^FS\n" +
"^BY3,3,58^FT571,39^BCI,,Y,N\n" +
"^FH\\^FD>:"+bag_code+"^FS\n" +
@@ -235,6 +240,9 @@ public class PdaPrintServiceImpl implements PdaPrintService {
"^FT499,572^A1I,23,25^FH\\^CI28^FD"+produce_name+"^FS^CI27\n" +
"^FT629,665^A1I,23,25^FH\\^CI28^FD"+validity_period+"^FS^CI27\n" +
"^FT639,207^A1I,23,25^FH\\^CI28^FD"+storage_conditions+"^FS^CI27\n" +
"^FT464,865^A1I,23,25^FH\\^CI28^FD"+material_code+"^FS^CI27\n" +
"^FT370,437^A1I,20,20^FH\\^CI28^FD"+create_name+"^FS^CI27\n" +
"^FT389,413^A1I,20,20^FH\\^CI28^FD"+data+"^FS^CI27\n" +
"^PQ1,0,1,Y\n" +
"^XZ\n";
} else {
@@ -324,6 +332,8 @@ public class PdaPrintServiceImpl implements PdaPrintService {
"^FO259,388^GFA,269,330,15,:Z64:eJyTb2AAgToGCCh4ACIZD0NEGRISwNxGKPcAmCvNCJM9ACIlm6F67cHCEv+gXMbD/Tb2DQbsfDYf/vAf+Md4mE0iEcjlkUg4w3OwjZ+ZTeIAQ4INj0Rim0Qy0BAwNw3KNTgM5h7mkUhutyiGcg8gcx/AuQ0/Ds+3KWZsfsxX87ndovAMf+P3H/aMDXbs9x+3WxT8ATmFmRlMArk8OLmMbRIJEC4bmHtO5gGYWw/mMgDdDDaKASzIUMEODQMeBhgAAMOSRSk=:5649\n" +
"^FT544,640^A1I,23,25^FH\\^CI28^FD"+total_qyt+"^FS^CI27\n" +
"^FT152,640^A1I,23,25^FH\\^CI28^FD"+qty+"^FS^CI27\n" +
"^FT469,856^A1I,23,25^FH\\^CI28^FD"+material_code+"^FS^CI27\n" +
"^FT548,335^A1I,23,25^FH\\^CI28^FD"+create_name+data+"^FS^CI27\n" +
"^PQ1,0,1,Y\n" +
"^XZ\n";
}
@@ -364,7 +374,9 @@ public class PdaPrintServiceImpl implements PdaPrintService {
SysParamServiceImpl sysParamService = SpringContextHolder.getBean(SysParamServiceImpl.class);
String record_no = sysParamService.findByCode("RECORD_NO1").getValue();
// 物料名称
String material_name = row.getString("material_name")+ "-"+row.getString("material_code");
String material_name = row.getString("material_name");
// 物料编码
String material_code = row.getString("material_code");
// 批次
String pcsn = row.getString("pcsn");
// 质量代码
@@ -372,8 +384,10 @@ public class PdaPrintServiceImpl implements PdaPrintService {
if (ObjectUtil.isNotEmpty(quality_code)) {
pcsn = pcsn + "-" + quality_code;
}
// 数量
String bucket_weight = NumberUtil.round(row.getString("bucket_weight"), 3).toString();
// 创建人
String create_name = SecurityUtils.getCurrentNickName() + DateUtil.today();
// 桶自重
String qty = NumberUtil.round(row.getString("bucket_weight"), 3).toString()+"KG";
// 桶号
String bucket_code = row.getString("bucket_code");
// 插入打印记录
@@ -458,7 +472,7 @@ public class PdaPrintServiceImpl implements PdaPrintService {
"^FT576,697^A1I,23,25^FH\\^CI28^FD"+bucket_code+"^FS^CI27\n" +
"^FO317,690^GFA,205,189,7,:Z64:eJwljjEKwkAURN/ywW1E2y3EvULKgIFcZSEXSGmnx/A4AcFTpIgEUglumWrXv7H4vGLmzwxAo0c2ybxsnvB2L0+wo0PArDUyQaxoB+grLmq+9kXjE5AIS+BWwxzoHLynApMC31HfA/MJXDBz2pApoANRiB0OPmIT57VqVfMPjhq906DSoLGlXdHeNzT/va5M5gfuwyjr:BA73\n" +
"^FO153,690^GFA,317,460,20,:Z64:eJyN0LFKA0EQBuAfArPNcNtucImv8NvoFcF7FSEvcGBjYaEIqfJQK4I2eYCUFwLW9wBCnN27mJA0TrcfuzOzP2Dle1xUrC+N+g+bi1DZIBGu07uOZiISay5eUwtt9Z6juZ7pvXtCCFqbzbIh/BnD0ZANZnZPs016YvGwAbRY6VeR+x03uP5RHuaq9dtxjRC1eTmxj2whEoNV2b5uVsXGfjOz7ed0ZVnM2RZztzbjcTldomqfQ5nRvH37jo2Yue3ap7IfJMcnVzKGlP+BclB/bpaJdwfD0SZnZm+rE8NgUQbz+/QLNlA+rg==:F877\n" +
"^FT150,697^A1I,23,25^FH\\^CI28^FD"+bucket_weight+"^FS^CI27\n" +
"^FT150,697^A1I,23,25^FH\\^CI28^FD"+qty+"^FS^CI27\n" +
"^FO715,634^GFA,193,182,7,:Z64:eJwdjTEOwjAMRV/kIRtdO+QWLJGolMP0EmyYhRGuFNQVcQKGSD0AHTugBqdenqVv/weV7oevhVSRCQ7+hoB3d6Tg9E3KFF6cYImhZefYIwtDgEvEbhh7kB1Sle8Hd83MocHNG2KoNDBa9SMjPstq69a+zQxHOqtm1GZg0maXZyYpXmHYBZjH5g++sSu6:E28C\n" +
"^FO545,631^GFA,309,460,20,:Z64:eJyN0L9KA0EQBvAPAnPNcNte8MgzfDZ6RfBeZSEvEEhjGRFS+VAbAtr4ACk3HFhfaRdnXEM0aZxtlh/MX8AijLiKtrs26j9sLkJlj0To/ZDsA4hI23HxlJbQB8bVulg1Mm3zI7RjPKQ0c0PzY2xiOhuK0U3dJiOxiPtiudSryeNAtxxTLKZWb+A7tF//sZ0b4fXcare325dTD7eZ2eF16rb0+cyqO+ux2kw30CaXPfrnj5DZi1vYfdq+Nh/Ezyc3AjtPBHwPexYaLs1uEqqT4WyTC7Pc+pehWCvfZnMcvwC491j6:81B6\n" +
"^FO317,632^GFA,217,196,7,:Z64:eJwtjjEKwkAURN/ywW3Cpk0R9AopAwq5SiAXSGllPIAH8BgeYUHwFCILaQVTbiGJP4sDw3z+wMyAoiKhVy4QsUuAN3LXh17yF2XIaDx4x54kq/faIhMSS4Ya52u6gs1YreKWG58nQ2gZS/MNrRlnsuCN9pQn6GCneWK9e7TYGXPpG/Xkesw12mqmSh5Tu+jO5px2HrR2giKt/gHlVS7b:0BB4\n" +
@@ -478,6 +492,8 @@ public class PdaPrintServiceImpl implements PdaPrintService {
"^FO582,213^GFA,237,285,15,:Z64:eJx9zjEOgkAQBdAxmyzNZG2/CZErUG7lWXZvwAkMhsJDeBiHUNh5hqWxho6CwkG0sGG6l5+ZP0RmEIl3Y22WEoicTxLHxlqugpI5SGyVQIUjMZUS625h+eNFU4IHk6PDlwzdNVJIvOrlYs6VVDmJsxI5LwRLXy/ESkivuw7YT9qLsu2bxrnce00tQpce5nZyn6/MkJ7hvBtfWQraqyO0TtCvtkgb9P8spjeReTug:A02F\n" +
"^FO145,453^GFA,565,726,33,:Z64:eJx10jFLAzEUAOAXAi9L2qwRT/0LAZcWxPsrEaGTQ0cne+DaH1An/8KBIA4OJ8K5BOduRg6cHOoiFcrFl7ur2oK5G0Luy3svlwfQDAug25mBrSHpIYBwDAiIaFgoAOj1zYe4ESOQYKTKEgI8ezo/qY74ZQcM8Ag0AUKiNsPsOa0+FSKBNAQYTy4zAqYBliIMM7dbleI65o51+YQVP6AgsDebq9OS3cy6FGuABB4yxEPU896bg+quA0USS7ZWhGkDPiEp+iMHrznImIER8BGgUfLxTYXbeNqRY68e/4KJjyke3/fFEYKOYOFFWG5G0LI8S3v3tI6jFcs3I4BNw1KWA/G1xGJOEbjZBvtmLEsN/hyrmSAwWGwBNAvpDHzc4YXmBIazFrTHTAOVlMuXBbvKsU9ghTvTtsj2R2kq8sRLZ/lujRgj4E7WRbAJi3dh4VTLwnKV08YfoMJqfVkWyqRXeFUbdE2Egwjw97otr6VMa5SG1vmFU6HuUnQN49m0WZCGUohy1Reg2iLblqOTJs0kGdOv7oOjKa7btGvaf8Y3AFWrhg==:9532\n" +
"^FO259,388^GFA,269,330,15,:Z64:eJyTb2AAgToGCCh4ACIZD0NEGRISwNxGKPcAmCvNCJM9ACIlm6F67cHCEv+gXMbD/Tb2DQbsfDYf/vAf+Md4mE0iEcjlkUg4w3OwjZ+ZTeIAQ4INj0Rim0Qy0BAwNw3KNTgM5h7mkUhutyiGcg8gcx/AuQ0/Ds+3KWZsfsxX87ndovAMf+P3H/aMDXbs9x+3WxT8ATmFmRlMArk8OLmMbRIJEC4bmHtO5gGYWw/mMgDdDDaKASzIUMEODQMeBhgAAMOSRSk=:5649\n" +
"^FT465,856^A1I,23,25^FH\\^CI28^FD"+material_code+"^FS^CI27\n" +
"^FT544,335^A1I,23,25^FH\\^CI28^FD"+create_name+"^FS^CI27\n" +
"^PQ1,0,1,Y\n" +
"^XZ\n";
byte[] zplBytes = zplContent.getBytes(StandardCharsets.UTF_8);

7
wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/impl/PointToPointServiceImpl.java
View File

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.nl.common.domain.query.PageQuery;
import org.nl.common.exception.BadRequestException;
import org.nl.wms.basedata_manage.service.IStructattrService;
import org.nl.wms.sch_manage.service.ISchBasePointService;
import org.nl.wms.sch_manage.service.PointToPointService;
import org.nl.wms.sch_manage.service.dao.SchBasePoint;
@@ -47,6 +48,8 @@ public class PointToPointServiceImpl implements PointToPointService {
@Resource
private ISchBasePointService iSchBasePointService;
@Resource
private IStructattrService iStructattrService;
@Override
public IPage<JSONObject> queryAll(Map whereJson, PageQuery page) {
@@ -61,14 +64,14 @@ public class PointToPointServiceImpl implements PointToPointService {
if (whereJson.getString("point_code1").equals(whereJson.getString("point_code2"))) {
throw new BadRequestException("起点和终点不能相同!");
}
SchBasePoint point_code1 = iSchBasePointService.getById(whereJson.getString("point_code1"));
/* SchBasePoint point_code1 = iSchBasePointService.getById(whereJson.getString("point_code1"));
if (ObjectUtil.isEmpty(point_code1)) {
throw new BadRequestException("起点不存在!【"+whereJson.getString("point_code1")+"】");
}
SchBasePoint point_code2 = iSchBasePointService.getById(whereJson.getString("point_code2"));
if (ObjectUtil.isEmpty(point_code2)) {
throw new BadRequestException("终点不存在!【"+whereJson.getString("point_code2")+"】");
}
}*/
// 创建点对点任务
JSONObject jsonTask = new JSONObject();

2
wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/AbstractTask.java
View File

@@ -142,7 +142,7 @@ public abstract class AbstractTask {
String taskCode = errObj.getString("task_code");
if (taskCode.equals(schBaseTask.getTask_code())) {
// 出错的任务就设置出错信息为备注，不是出错就设置下发
schBaseTask.setTask_status(TaskStatus.CREATED.getCode());
schBaseTask.setTask_status(TaskStatus.CREATE.getCode());
schBaseTask.setRemark(errObj.getString("message"));
break;
}

2
wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/CenterInTask.java
View File

@@ -52,7 +52,7 @@ public class CenterInTask extends AbstractTask {
SchBaseTask task = new SchBaseTask();
task.setTask_id(IdUtil.getStringId());
task.setTask_code(CodeUtil.getNewCode("TASK_CODE"));
task.setTask_status(TaskStatus.CREATED.getCode());
task.setTask_status(TaskStatus.CREATE.getCode());
task.setConfig_code(CenterInTask.class.getSimpleName());
task.setPoint_code1(json.getString("point_code1"));
task.setPoint_code2(json.getString("point_code2"));

2
wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/CoatingUpTask.java
View File

@@ -44,7 +44,7 @@ public class CoatingUpTask extends AbstractTask {
SchBaseTask task = new SchBaseTask();
task.setTask_id(IdUtil.getStringId());
task.setTask_code(CodeUtil.getNewCode("TASK_CODE"));
task.setTask_status(TaskStatus.CREATED.getCode());
task.setTask_status(TaskStatus.CREATE.getCode());
task.setConfig_code(CoatingUpTask.class.getSimpleName());
task.setPoint_code1(json.getString("point_code"));
task.setPoint_code2(json.getString("target"));

2
wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/EmptyDiskConveyTask.java
View File

@@ -54,7 +54,7 @@ public class EmptyDiskConveyTask extends AbstractTask {
SchBaseTask task = new SchBaseTask();
task.setTask_id(IdUtil.getStringId());
task.setTask_code(CodeUtil.getNewCode("TASK_CODE"));
task.setTask_status(TaskStatus.CREATED.getCode());
task.setTask_status(TaskStatus.CREATE.getCode());
task.setConfig_code(EmptyDiskConveyTask.class.getSimpleName());
task.setPoint_code1(json.getString("point_code1"));
task.setPoint_code2(json.getString("point_code2"));

2
wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/EmptyDiskEnterTask.java
View File

@@ -76,7 +76,7 @@ public class EmptyDiskEnterTask extends AbstractTask {
SchBaseTask task = new SchBaseTask();
task.setTask_id(IdUtil.getStringId());
task.setTask_code(CodeUtil.getNewCode("TASK_CODE"));
task.setTask_status(TaskStatus.CREATED.getCode());
task.setTask_status(TaskStatus.CREATE.getCode());
task.setConfig_code(EmptyDiskEnterTask.class.getSimpleName());
task.setPoint_code1(IOSConstant.CBJ01);
task.setPoint_code2(point.getPoint_code());

2
wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/PalletOutTask.java
View File

@@ -82,7 +82,7 @@ public class PalletOutTask extends AbstractTask {
SchBaseTask task = new SchBaseTask();
task.setTask_id(IdUtil.getStringId());
task.setTask_code(CodeUtil.getNewCode("TASK_CODE"));
task.setTask_status(TaskStatus.CREATED.getCode());
task.setTask_status(TaskStatus.CREATE.getCode());
task.setConfig_code(PalletOutTask.class.getSimpleName());
task.setPoint_code1(json.getString("point_code1"));
task.setPoint_code2(json.getString("point_code2"));

2
wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/PalletizingAddTask.java
View File

@@ -44,7 +44,7 @@ public class PalletizingAddTask extends AbstractTask {
SchBaseTask task = new SchBaseTask();
task.setTask_id(IdUtil.getStringId());
task.setTask_code(CodeUtil.getNewCode("TASK_CODE"));
task.setTask_status(TaskStatus.CREATED.getCode());
task.setTask_status(TaskStatus.CREATE.getCode());
task.setConfig_code(PalletizingAddTask.class.getSimpleName());
task.setPoint_code1(json.getString("point_code1"));
task.setPoint_code2(json.getString("point_code2"));

2
wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/PalletizingDownTask.java
View File

@@ -52,7 +52,7 @@ public class PalletizingDownTask extends AbstractTask {
SchBaseTask task = new SchBaseTask();
task.setTask_id(IdUtil.getStringId());
task.setTask_code(CodeUtil.getNewCode("TASK_CODE"));
task.setTask_status(TaskStatus.CREATED.getCode());
task.setTask_status(TaskStatus.CREATE.getCode());
task.setConfig_code(PalletizingDownTask.class.getSimpleName());
task.setPoint_code1(json.getString("device_code"));
task.setPoint_code2(point.getPoint_code());

2
wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/PreProcessingInTask.java
View File

@@ -62,7 +62,7 @@ public class PreProcessingInTask extends AbstractTask {
SchBaseTask task = new SchBaseTask();
task.setTask_id(IdUtil.getStringId());
task.setTask_code(CodeUtil.getNewCode("TASK_CODE"));
task.setTask_status(TaskStatus.CREATED.getCode());
task.setTask_status(TaskStatus.CREATE.getCode());
task.setConfig_code(PreProcessingInTask.class.getSimpleName());
task.setPoint_code1(json.getString("point_code"));
task.setPoint_code2(point.getPoint_code());

2
wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/ProduceInTask.java
View File

@@ -50,7 +50,7 @@ public class ProduceInTask extends AbstractTask {
SchBaseTask task = new SchBaseTask();
task.setTask_id(IdUtil.getStringId());
task.setTask_code(CodeUtil.getNewCode("TASK_CODE"));
task.setTask_status(TaskStatus.CREATED.getCode());
task.setTask_status(TaskStatus.CREATE.getCode());
task.setConfig_code(ProduceInTask.class.getSimpleName());
task.setPoint_code1(json.getString("point_code1"));
task.setPoint_code2(json.getString("point_code2"));

2
wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/RawInTask.java
View File

@@ -60,7 +60,7 @@ public class RawInTask extends AbstractTask {
SchBaseTask task = new SchBaseTask();
task.setTask_id(IdUtil.getStringId());
task.setTask_code(CodeUtil.getNewCode("TASK_CODE"));
task.setTask_status(TaskStatus.CREATED.getCode());
task.setTask_status(TaskStatus.CREATE.getCode());
task.setConfig_code(RawInTask.class.getSimpleName());
task.setPoint_code1(json.getString("point_code1"));
task.setPoint_code2(json.getString("point_code2"));

2
wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/TabletingInTask.java
View File

@@ -140,7 +140,7 @@ public class TabletingInTask extends AbstractTask {
SchBaseTask task = new SchBaseTask();
task.setTask_id(IdUtil.getStringId());
task.setTask_code(CodeUtil.getNewCode("TASK_CODE"));
task.setTask_status(TaskStatus.CREATED.getCode());
task.setTask_status(TaskStatus.CREATE.getCode());
task.setConfig_code(TabletingInTask.class.getSimpleName());
task.setPoint_code1(json.getString("point_code"));
task.setPoint_code2(point.getPoint_code());

2
wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/WrappingDownTask.java
View File

@@ -58,7 +58,7 @@ public class WrappingDownTask extends AbstractTask {
SchBaseTask task = new SchBaseTask();
task.setTask_id(IdUtil.getStringId());
task.setTask_code(CodeUtil.getNewCode("TASK_CODE"));
task.setTask_status(TaskStatus.CREATED.getCode());
task.setTask_status(TaskStatus.CREATE.getCode());
task.setConfig_code(WrappingDownTask.class.getSimpleName());
task.setPoint_code1(json.getString("device_code"));
task.setPoint_code2(basePoint.getPoint_code());

2
wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/WrappingUpTask.java
View File

@@ -58,7 +58,7 @@ public class WrappingUpTask extends AbstractTask {
SchBaseTask task = new SchBaseTask();
task.setTask_id(IdUtil.getStringId());
task.setTask_code(CodeUtil.getNewCode("TASK_CODE"));
task.setTask_status(TaskStatus.CREATED.getCode());
task.setTask_status(TaskStatus.CREATE.getCode());
task.setConfig_code(WrappingUpTask.class.getSimpleName());
task.setPoint_code1(basePoint.getPoint_code());
task.setPoint_code2(json.getString("device_code"));

25
wms/nladmin-ui/src/views/wms/basedata/bucked/index.vue
View File

@@ -40,20 +40,19 @@
<rrOperation />
</el-form>
</div>
<rrOperation />
<!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
<crudOperation :permission="permission">
<el-button
slot="right"
class="filter-item"
type="success"
icon="el-icon-printer"
size="mini"
:disabled="crud.selections.length !== 1"
@click="printTable"
>
桶标签
</el-button>
<!-- <el-button-->
<!-- slot="right"-->
<!-- class="filter-item"-->
<!-- type="success"-->
<!-- icon="el-icon-printer"-->
<!-- size="mini"-->
<!-- :disabled="crud.selections.length !== 1"-->
<!-- @click="printTable"-->
<!-- >-->
<!-- 桶标签-->
<!-- </el-button>-->
</crudOperation>
<el-dialog
:close-on-click-modal="false"
@@ -159,7 +158,7 @@
>
<template slot-scope="scope">
<udOperation
:is-visiable-del="false"
:disabled-dle="scope.row.qty != '0'"
:data="scope.row"
:permission="permission"
/>

23
wms/nladmin-ui/src/views/wms/basedata/groupbag/index.vue
View File

@@ -56,7 +56,6 @@
<rrOperation />
</el-form>
</div>
<rrOperation />
<!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
<crudOperation :permission="permission">
<!-- <el-button
@@ -70,17 +69,17 @@
>
复制新增
</el-button>-->
<el-button
slot="right"
class="filter-item"
type="success"
icon="el-icon-printer"
size="mini"
:disabled="crud.selections.length !== 1"
@click="printTable"
>
物料标签
</el-button>
<!-- <el-button-->
<!-- slot="right"-->
<!-- class="filter-item"-->
<!-- type="success"-->
<!-- icon="el-icon-printer"-->
<!-- size="mini"-->
<!-- :disabled="crud.selections.length !== 1"-->
<!-- @click="printTable"-->
<!-- >-->
<!-- 物料标签-->
<!-- </el-button>-->
</crudOperation>
<el-dialog
:close-on-click-modal="false"