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

opt: 载具号

Browse Source
This commit is contained in:
liyongde
2025-12-05 17:58:03 +08:00
parent c9a861772d
commit 0e52c0b9da
5 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -123,7 +123,8 @@ public class DefaultPdaBuildParamService implements PdaBuildParamService {
table.put("group_id", ObjectUtil.isEmpty(row.getString("group_id"))
? row.getString("id") : row.getString("group_id"));
table.put("storagevehicle_code", ObjectUtil.isEmpty(row.getString("vehicle_code"))
? row.getString("bucket_code") : row.getString("vehicle_code"));
? ObjectUtil.isEmpty(row.getString("bucket_code")) ? param.getString("vehicle_code")
: row.getString("bucket_code") : row.getString("vehicle_code"));
table.put("material_id", row.getString("material_id"));
table.put("pcsn", row.getString("pcsn"));
table.put("qty", row.getBigDecimal("qty"));
@@ -131,7 +132,7 @@ public class DefaultPdaBuildParamService implements PdaBuildParamService {
table.put("qty_unit_id", row.getString("qty_unit_id"));
table.put("qty_unit_name", row.getString("qty_unit_name"));
table.put("status", "01");
table.put("bag_no", row.getString("bag_no"));
table.put("bag_code", row.getString("bag_code"));
table.put("material_code", row.getString("material_code"));
table.put("material_name", row.getString("material_name"));
table.put("material_spec", row.getString("material_spec"));

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

@@ -96,6 +96,7 @@ public class PdaPreTreatmentServiceImpl implements PdaPreTreatmentService {
}
// 0 组盘
defaultPdaBuildParam.doGroupPallet(param, startPoint);
param.put("vehicle_code", startPoint.getVehicle_code());
param.put("bill_type", IOSEnum.IN_BILL_TYPE.code("原辅料入库"));
// 1 创建入库单、明细、分配明细
Map<String, Object> invObj = defaultPdaBuildParam.doBuildInvObj(param, startPoint, sectattr);

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

@@ -26,6 +26,7 @@ import org.nl.wms.warehouse_management.service.IRawAssistIStorService;
import org.nl.wms.warehouse_management.service.dao.IOStorInvDis;
import org.nl.wms.warehouse_management.service.dao.mapper.IOStorInvDisMapper;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
@@ -120,8 +121,8 @@ public class CenterInTask extends AbstractTask {
this.cancelTask(taskObj);
}
}
private void cancelTask(SchBaseTask taskObj) {
@Transactional(rollbackFor = Exception.class)
public void cancelTask(SchBaseTask taskObj) {
// 取消任务
taskService.update(new LambdaUpdateWrapper<SchBaseTask>()
.set(SchBaseTask::getIs_delete, BaseDataEnum.IS_YES_NOT.code("是"))
@@ -143,8 +144,8 @@ public class CenterInTask extends AbstractTask {
taskObj.setRemark("已取消");
taskService.updateById(taskObj);
}
private void finishTask(SchBaseTask taskObj) {
@Transactional(rollbackFor = Exception.class)
public void finishTask(SchBaseTask taskObj) {
// 任务完成
taskObj.setTask_status(TaskStatus.FINISHED.getCode());
taskObj.setRemark("已完成");

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

@@ -121,7 +121,7 @@ public class RawInTask extends AbstractTask {
}
}
private void cancelTask(SchBaseTask taskObj) {
public void cancelTask(SchBaseTask taskObj) {
// 取消任务
taskService.update(new LambdaUpdateWrapper<SchBaseTask>()
.set(SchBaseTask::getIs_delete, BaseDataEnum.IS_YES_NOT.code("是"))
@@ -144,7 +144,7 @@ public class RawInTask extends AbstractTask {
taskService.updateById(taskObj);
}
private void finishTask(SchBaseTask taskObj) {
public void finishTask(SchBaseTask taskObj) {
// 任务完成
taskObj.setTask_status(TaskStatus.FINISHED.getCode());
taskObj.setRemark("已完成");

7
wms/nladmin-system/nlsso-server/src/test/java/org/nl/ApplicationTest.java
View File

@@ -4,8 +4,11 @@ import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson2.TypeReference;
import org.junit.jupiter.api.Test;
import org.nl.wms.sch_manage.service.util.AbstractTask;
import org.nl.wms.sch_manage.service.util.TaskFactory;
import org.springframework.boot.test.context.SpringBootTest;
import javax.annotation.Resource;
import java.util.Map;
/**
@@ -16,8 +19,12 @@ import java.util.Map;
@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
public class ApplicationTest {
@Resource
private TaskFactory taskFactory;
@Test
void contextLoads() {
AbstractTask centerInTask = taskFactory.getTask("CenterInTask");
}
@Test