zyr/FT546MWS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

20206.5.26 早8;52

Browse Source 
修改扫描二维码获取单据数据
修后台将二维码传到后台字段变更为barCode
This commit is contained in:
1009473166@qq.com
2026-05-26 08:53:09 +08:00
parent 368d615674
commit 49ddd8fd21
6 changed files with 34 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
ruoyi-admin/src/main/java/com/ruoyi/pda/controller/PdaController.java
View File

@@ -6,6 +6,7 @@ import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.in.stockindetail.domain.InStockinDetail;
import com.ruoyi.in.stockindetail.service.IInStockinDetailService;
import com.ruoyi.job.mydojobdetail.domain.MydoJobDetail;
@@ -54,16 +55,18 @@ public class PdaController extends BaseController {
}
/**
* 通过单据码查询物料详情
* 通过单据码查询物料详情 TODO 修改单据码为barCode 前端需同步修改
*/
@RequestMapping("/selectDetailById")
@ResponseBody
public AjaxResult selectDetailById(String inStockinDetailId) {
InStockinDetail inStockinDetail = iInStockinDetailService.selectInStockinDetailByStockinDetailId(inStockinDetailId);
if (inStockinDetail != null) {
inStockinDetail.setQuantity(String.valueOf(Integer.valueOf(inStockinDetail.getQuantity()) - Integer.valueOf(inStockinDetail.getScanNum())));
}
return AjaxResult.success(inStockinDetail);
public AjaxResult selectDetailById(String barCode) {
List<InStockinDetail> stockinDetails = iInStockinDetailService.selectStockInByDetailByBarCode(barCode);
stockinDetails.stream().forEach(inStockinDetail -> {
Integer quantity = StringUtils.hasText(inStockinDetail.getQuantity()) ? Integer.valueOf(inStockinDetail.getQuantity()) : 0;
Integer scanNum = StringUtils.hasText(inStockinDetail.getScanNum()) ? Integer.valueOf(inStockinDetail.getScanNum()) : 0;
inStockinDetail.setQuantity(String.valueOf(quantity - scanNum));
});
return AjaxResult.success(stockinDetails);
}
/**
@@ -308,11 +311,10 @@ public class PdaController extends BaseController {
String stockinDetailId = trayCodeMsg.getStockinDetailId();
OutStockoutDetail outStockoutDetail = outStockoutDetailService.selectOutStockoutDetailByStockoutDetailId(stockinDetailId);
String productId = outStockoutDetail.getProductId();
Integer integer=pdaService.selectBasStockHcCount(trayCode,productId);
if (integer>0)
{
Integer integer = pdaService.selectBasStockHcCount(trayCode, productId);
if (integer > 0) {
return AjaxResult.success();
}else {
} else {
return AjaxResult.error("无该物料");
}