purovps/jshERP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

单据扫码：支持序列号查询，先根据序列号查询条码，如果查不到就直接查条码

Browse Source
This commit is contained in:
季圣华
2023-05-24 22:32:41 +08:00
parent dca981467e
commit 39bdda9002
4 changed files with 23 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
jshERP-boot/src/main/java/com/jsh/erp/controller/MaterialController.java
View File

@@ -2,6 +2,7 @@ package com.jsh.erp.controller;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.jsh.erp.datasource.entities.MaterialExtend;
import com.jsh.erp.datasource.entities.MaterialVo4Unit;
import com.jsh.erp.datasource.entities.Unit;
import com.jsh.erp.service.depot.DepotService;
@@ -463,6 +464,11 @@ public class MaterialController {
BaseResponseInfo res = new BaseResponseInfo();
try {
String[] mpArr = mpList.split(",");
//支持序列号查询，先根据序列号查询条码，如果查不到就直接查条码
MaterialExtend materialExtend = materialService.getMaterialExtendBySerialNumber(barCode);
if(materialExtend!=null && StringUtil.isNotEmpty(materialExtend.getBarCode())) {
barCode = materialExtend.getBarCode();
}
List<MaterialVo4Unit> list = materialService.getMaterialByBarCode(barCode);
if(list!=null && list.size()>0) {
for(MaterialVo4Unit mvo: list) {