root/rl_mg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

opt: 工单

Browse Source
This commit is contained in:
liyongde
2023-10-30 13:32:44 +08:00
parent 30e62c7737
commit 760edf13f3
7 changed files with 37 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/material/service/dao/mapper/MdBaseMaterialMapper.java
View File

@@ -14,7 +14,7 @@ public interface MdBaseMaterialMapper extends BaseMapper<MdBaseMaterial> {
/**
* 根据库存获取物料信息
* @param pages
* @param whereJson
* @param query
* @return
*/
IPage<MdBaseMaterial> queryByInventory(IPage<MdBaseMaterial> pages, MdBaseMaterialQuery query);

2
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/material/service/dao/mapper/MdBaseMaterialMapper.xml
View File

@@ -33,6 +33,8 @@
CTE.material_code,
CTE.material_name,
CTE.material_spec,
CTE.material_model,
CTE.pack_method,
CTE.total_material_qty,
CTE.half_material_code,
CTE.raw_material_code,

2
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java
View File

@@ -438,7 +438,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
*/
@Override
public ApplyTaskResponse applyLabelling(JSONObject param) {
// 木托盘号##物料编码##数量##吨量（单重X数量）##生产日期##客户名称##订单号
// 木托盘号(4)##物料编码(12)##数量(2-3)##吨量（单重X数量）##生产日期(11)##客户名称##订单号(12)
String requestNo = param.getString("requestNo");
ApplyTaskRequest baseRequest = param.toJavaObject(ApplyTaskRequest.class);
if (baseRequest.getVehicle_code() == null) {

2
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/controller/PdmBdWorkorderController.java
View File

@@ -1,5 +1,6 @@
package org.nl.wms.pdm.workorder.controller;
import cn.dev33.satoken.annotation.SaIgnore;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
@@ -69,6 +70,7 @@ public class PdmBdWorkorderController {
@PostMapping
@Log("新增工单管理")
@ApiOperation("新增工单管理")
@SaIgnore
//@SaCheckPermission("@el.check('pdmBdWorkorder:add')")
public ResponseEntity<Object> create(@Validated @RequestBody PdmBdWorkorder entity){
pdmBdWorkorderService.create(entity);

20
lms/nladmin-system/nlsso-server/src/test/java/org/nl/point/test.java
View File

@@ -12,6 +12,7 @@ import org.junit.jupiter.api.Test;
import org.nl.common.exception.BadRequestException;
import org.nl.wms.ext.acs.service.dto.to.wms.ApplyDeviceDto;
import org.nl.wms.ext.acs.service.dto.to.wms.ApplyTaskRequest;
import org.nl.wms.sch.group.service.ISchBaseVehiclematerialgroupService;
import org.nl.wms.sch.region.service.ISchBaseRegionService;
import org.nl.wms.sch.region.service.dao.SchBaseRegion;
import org.nl.wms.sch.task.service.dao.SchBaseTask;
@@ -34,6 +35,8 @@ import java.util.List;
public class test {
@Autowired
private ISchBaseRegionService regionService;
@Autowired
private ISchBaseVehiclematerialgroupService vehiclematerialgroupService;
@Test
@Transactional(rollbackFor = Exception.class)
@@ -132,4 +135,21 @@ public class test {
// 断言格式化后的日期是否符合预期
Assert.assertEquals("20231030", formattedDate);
}
@Test
public void testGetInventoryQtyByMaterialId() {
// 执行被测方法
int actualQty = vehiclematerialgroupService.getInventoryQtyByMaterialId("030504010003");
System.out.println(actualQty);
}
@Test
public void testSplit() {
// 执行被测方法
String str = "木托盘号(4)##物料编码(12)##数量(2-3)##吨量（单重X数量）##生产日期(11)##客户名称##订单号(12)";
String[] split = str.split("##");
for (int i = 0; i < split.length; i++) {
System.out.println(split[i]);
}
}
}