bonus
/
devicesmgt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev' of http://192.168.0.56:3000/bonus/devicesmgt into dev

This commit is contained in:
zhouzy062 2024-04-02 16:02:25 +08:00
parent eead748fae 6fd2b89fe8
commit 7a8b15a320
3 changed files with 28 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/LeaseOutDetailsController.java
View File

@ -1,5 +1,6 @@
package com.bonus.sgzb.app.controller; package com.bonus.sgzb.app.controller;
import cn.hutool.core.collection.CollUtil;
import com.bonus.sgzb.app.domain.LeaseApplyDetails; import com.bonus.sgzb.app.domain.LeaseApplyDetails;
import com.bonus.sgzb.app.domain.TmTask; import com.bonus.sgzb.app.domain.TmTask;
import com.bonus.sgzb.app.service.LeaseOutDetailsService; import com.bonus.sgzb.app.service.LeaseOutDetailsService;
@ -140,8 +141,12 @@ public class LeaseOutDetailsController extends BaseController {
@Log(title = "领料出库", businessType = BusinessType.UPDATE) @Log(title = "领料出库", businessType = BusinessType.UPDATE)
@PostMapping("/submitOutRfid") @PostMapping("/submitOutRfid")
public AjaxResult submitOutRfid(@RequestBody List<LeaseOutDetails> recordList) { public AjaxResult submitOutRfid(@RequestBody List<LeaseOutDetails> recordList) {
if (CollUtil.isEmpty(recordList)){
return AjaxResult.error("请选择要出库的机具");
}else {
return leaseOutDetailsService.submitOutRfid(recordList); return leaseOutDetailsService.submitOutRfid(recordList);
} }
}
/** /**

2
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/InventoryAndWarehousingServiceImpl.java
View File

@ -55,7 +55,7 @@ public class InventoryAndWarehousingServiceImpl implements InventoryAndWarehousi
while (codeList.size() < dto.getNum()) { while (codeList.size() < dto.getNum()) {
String code = FieldGenerator.generateField(); String code = FieldGenerator.generateField();
int count = selectByCode(code); int count = selectByCode(code);
if (count == 0) { if (count == 0 && !codeList.contains(code)) {
codeList.add(code); codeList.add(code);
} }
} }