FeiDaBaoKai/wms_serve_xugongteji
13
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
陆一凡 2025-03-15 13:50:08 +08:00
parent b957b5a688
commit e40990ee77
3 changed files with 49 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppPmsController.java
View File

@ -69,7 +69,6 @@ public class AppPmsController extends BaseController {
if (groupedByGoodsCode.values().stream().anyMatch(list -> list.size() > 1)) {
return error("物料编号不能重复");
}
// 判断数据是否缺失
for(PmsOrderInRequest orderInRequest : orderInRequestList) {
if (StringUtils.isEmpty(orderInRequest.getGoodsId())
@ -91,15 +90,60 @@ public class AppPmsController extends BaseController {
appPmsOrderIn.setGoodsCode(orderInRequest.getGoodsCode());
appPmsOrderIn.setCreateTime(new Date());
appPmsOrderIn.setUpdateTime(new Date());
appPmsOrderIn.setCreateBy(getUsername());
appPmsOrderIn.setCreateBy("手动入库");
appPmsOrderIn.setRemark("手动入库通知");
appPmsOrderInService.insertAppPmsOrderIn(appPmsOrderIn);
appPmsOrderInService.insertAppPmsOrderIn(appPmsOrderIn);
}
return AjaxResult.success("success");
}
/**
* 其他物料入库单请求
*/
@ApiOperation("其他物料入库单请求")
@Log(title = "其他物料入库单请求", skipAuth = true)
@PostMapping("/orderInOthers")
@Anonymous
public AjaxResult manualOrderInOthers(@RequestBody PmsOrderInRequest orderInRequest) {
logger.info("手动入库单请求：{}", JSONObject.toJSONString(orderInRequest));
// 判断数据是否缺失
if (StringUtils.isEmpty(orderInRequest.getGoodsId())
|| StringUtils.isEmpty(orderInRequest.getGoodsDesc())
|| orderInRequest.getGoodsNum() == null || orderInRequest.getGoodsNum() <=0) {
return error("缺少请求数据。");
}
// 构造入库单
AppPmsOrderIn appPmsOrderIn = getAppPmsOrderInOthers(orderInRequest);
int result = appPmsOrderInService.insertAppPmsOrderIn(appPmsOrderIn);
if (result <= 0) {
return error("创建入库单失败");
}
return AjaxResult.success("success",appPmsOrderIn);
}
private static AppPmsOrderIn getAppPmsOrderInOthers(PmsOrderInRequest orderInRequest) {
AppPmsOrderIn appPmsOrderIn = new AppPmsOrderIn();
String orderId= OrderCodeFactory.getOrderCode("RK", "");
BeanUtils.copyProperties(orderInRequest, appPmsOrderIn);
appPmsOrderIn.setId(OrderCodeFactory.getOrderCode("",""));
appPmsOrderIn.setListId(orderId);
appPmsOrderIn.setOrderType(orderInRequest.getOrderType());
appPmsOrderIn.setOrderId(UUID.randomUUID().toString());
appPmsOrderIn.setGoodsNum(BigDecimal.valueOf(orderInRequest.getGoodsNum()));
appPmsOrderIn.setUsedNum(BigDecimal.ZERO);
appPmsOrderIn.setRemainingNum(BigDecimal.valueOf(orderInRequest.getGoodsNum()));
appPmsOrderIn.setOrderStatus(0);
appPmsOrderIn.setGoodsCode(orderInRequest.getGoodsCode());
appPmsOrderIn.setCreateTime(new Date());
appPmsOrderIn.setUpdateTime(new Date());
appPmsOrderIn.setCreateBy("其他物料入库");
appPmsOrderIn.setRemark("其他物料入库通知");
return appPmsOrderIn;
}
/**
* 更新手动入库单请求
*/

2
ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
View File

@ -114,7 +114,7 @@ public class SecurityConfig
requests.antMatchers("/login", "/register", "/captchaImage").permitAll()
// 静态资源，可匿名访问
.antMatchers(HttpMethod.GET, "/", "/*.html", "/**/*.html", "/**/*.css", "/**/*.js", "/profile/**").permitAll()
.antMatchers("/swagger-ui.html", "/swagger-resources/**", "/webjars/**", "/*/api-docs", "/druid/**","/app/pms/orderIn", "/app/pmsOrderOut/**", "/app/task/sendLocation", "/app/task/taskResult","/app/task/createOutRequest", "/system/storage/**", "/app/location/count/**", "/app/vehicle/**", "/app/goods/getGoodsInfoByCode/**").permitAll()
.antMatchers("/swagger-ui.html", "/swagger-resources/**", "/webjars/**", "/*/api-docs", "/druid/**","/app/pms/orderIn", "/app/pmsOrderOut/**", "/app/task/sendLocation", "/app/task/taskResult","/app/task/createOutRequest", "/system/storage/**", "/app/location/count/**", "/app/vehicle/**", "/app/goods/getGoodsInfoByCode/**","/app/pms/**").permitAll()
// 除上面外的所有请求全部需要鉴权认证
.anyRequest().authenticated();
})

2
ruoyi-system/src/main/java/com/ruoyi/app/service/impl/AppPmsOrderInServiceImpl.java
View File

@ -167,7 +167,7 @@ public class AppPmsOrderInServiceImpl implements IAppPmsOrderInService
}
update.setRemainingNum(subtract);
appPmsOrderInMapper.updateAppPmsOrderIn(update);
insertNum ++;
insertNum++;
}
return insertNum;
}