kelvin/wms-gj-java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
star 2024-11-07 16:42:53 +08:00
commit b9c5779d97
6 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ktg-admin/src/test/MdItemUnitTest.java
View File

@ -19,7 +19,7 @@ import java.util.List;
import java.util.Map; import java.util.Map;
/** /**
* 角色管理单元测试 * 物料管理单元测试
*/ */
@RunWith(SpringRunner.class) @RunWith(SpringRunner.class)
@SpringBootTest(classes = RuoYiApplication.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) @SpringBootTest(classes = RuoYiApplication.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)

2
ktg-admin/src/test/SysDeptUnitTest.java
View File

@ -15,7 +15,7 @@ import java.util.Iterator;
import java.util.List; import java.util.List;
/** /**
* 组织机构 * 组织机构单元测试
*/ */
@RunWith(SpringRunner.class) @RunWith(SpringRunner.class)
@SpringBootTest(classes = RuoYiApplication.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) @SpringBootTest(classes = RuoYiApplication.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)

2
ktg-admin/src/test/SysRoleUnitTest.java
View File

@ -14,7 +14,7 @@ import org.springframework.test.context.junit4.SpringRunner;
import java.util.List; import java.util.List;
/** /**
* 角色管理 * 角色管理单元测试
*/ */
@RunWith(SpringRunner.class) @RunWith(SpringRunner.class)
@SpringBootTest(classes = RuoYiApplication.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) @SpringBootTest(classes = RuoYiApplication.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)

2
ktg-admin/src/test/SysUserUnitTest.java
View File

@ -15,7 +15,7 @@ import java.util.List;
import java.util.stream.Collectors; import java.util.stream.Collectors;
/** /**
* 用户管理 * 用户管理单元测试
*/ */
@RunWith(SpringRunner.class) @RunWith(SpringRunner.class)
@SpringBootTest(classes = RuoYiApplication.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) @SpringBootTest(classes = RuoYiApplication.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)

2
ktg-admin/src/test/WmsBusinessTypeUnitTest.java
View File

@ -11,7 +11,7 @@ import org.springframework.test.context.junit4.SpringRunner;
import java.util.List; import java.util.List;
/** /**
* 出入库类型 * 出入库类型单元测试
*/ */
@RunWith(SpringRunner.class) @RunWith(SpringRunner.class)
@SpringBootTest(classes = RuoYiApplication.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) @SpringBootTest(classes = RuoYiApplication.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)

5
ktg-mes/src/main/java/com/ktg/mes/md/service/impl/WmsOutPlanServiceImpl.java
View File

@ -137,6 +137,11 @@ public class WmsOutPlanServiceImpl implements IWmsOutPlanService {
0 0
); );
// 校验库中数量是否足够
if (baseKnifeList.size() < wmsOutPlanDetail.getPlannedQuantity()) {
throw new RuntimeException("库存数量不足以支持本次出库");
}
// 更新出库计划明细 // 更新出库计划明细
this.wmsOutPlanMapper.updateWmsOutPlanDetailRealQuantityAndDetailStateByWmsOutPlanDetailId( this.wmsOutPlanMapper.updateWmsOutPlanDetailRealQuantityAndDetailStateByWmsOutPlanDetailId(
baseKnifeList.size(), baseKnifeList.size(),