diff --git a/lms/nladmin-system/nlsso-server/pom.xml b/lms/nladmin-system/nlsso-server/pom.xml
index 1ddb8c3..bf6ef6d 100644
--- a/lms/nladmin-system/nlsso-server/pom.xml
+++ b/lms/nladmin-system/nlsso-server/pom.xml
@@ -43,7 +43,7 @@
org.dromara.dynamictp
dynamic-tp-spring-boot-starter-adapter-webserver
- 1.1.6.1
+ 1.1.7
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java
index fde49d7..8c7ff45 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java
@@ -67,6 +67,7 @@ import javax.annotation.PostConstruct;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.math.BigDecimal;
+import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
@@ -479,7 +480,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
*/
@Override
public ApplyTaskResponse applyLabelling(JSONObject param) {
- // 木托盘号(4)##物料编码(12)##数量(2-3)##吨量（单重X数量）##生产日期(2023/11/04)##客户编码##订单号(12)#型号##产品名称##客户名称**
+ // 木托盘号(4)##物料编码(12)##数量(2-3)##吨量（单重X数量）##生产日期(2023/11/04)##客户编码##订单号(12)#型号##产品名称##客户名称##批次号**
String requestNo = param.getString("requestNo");
ApplyTaskRequest baseRequest = param.toJavaObject(ApplyTaskRequest.class);
String vehicleCode = TaskUtils.defaultVehicleCode(baseRequest.getVehicle_code());
@@ -497,6 +498,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
if (ObjectUtil.isEmpty(baseMaterial)) {
throw new BadRequestException("物料id: " + materialId + " 不存在，请同步物料");
}
+ String pcsn = baseMaterial.getMaterial_code() + DateUtil.format(new Date(), "yyMMdd");
BigDecimal materialQty = ObjectUtil.isNotEmpty(groupInfo.getMaterial_qty())
? BigDecimal.valueOf(groupInfo.getMaterial_qty()) : BigDecimal.valueOf(0);
String singleWeightStr = baseMaterial.getSingle_weight();
@@ -515,12 +517,16 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
log.info("包装数据：{}", object);
String custerNo = object.getString("custer_no");
String orderNo = object.getString("order_no");
+ String smeltingUnit = object.getString("smelting_unit");
if (ObjectUtil.isEmpty(custerNo)) {
throw new BadRequestException("客户编码不能为空");
}
if (ObjectUtil.isEmpty(orderNo)) {
throw new BadRequestException("订单号不能为空");
}
+ if (ObjectUtil.isEmpty(smeltingUnit)) {
+ smeltingUnit = "";
+ }
CusterDo custer;
// 都是数据就是id，否则就是名称
if (custerNo.matches("\\d+")) {
@@ -538,7 +544,8 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
.append(orderNo).append("##")
.append(baseMaterial.getMaterial_spec() + "~" + baseMaterial.getMaterial_model()).append("##")
.append(baseMaterial.getMaterial_name()).append("##")
- .append(custer.getCuster_name()).append("**");
+ .append(custer.getCuster_name()).append(smeltingUnit).append("##")
+ .append(pcsn).append("**");
log.info("打印的唛头信息：{}", sb);
MesPackDto mesPackDto = new MesPackDto();
mesPackDto.setMSGID(IdUtil.getSnowflake(1, 1).nextIdStr());
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/dao/mapper/MesRequestMapper.xml b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/dao/mapper/MesRequestMapper.xml
index 1c29cb5..e993d3e 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/dao/mapper/MesRequestMapper.xml
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/dao/mapper/MesRequestMapper.xml
@@ -390,7 +390,7 @@