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.JSONArray;
import com.alibaba.fastjson.JSONObject; 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.MaterialVo4Unit;
import com.jsh.erp.datasource.entities.Unit; import com.jsh.erp.datasource.entities.Unit;
import com.jsh.erp.service.depot.DepotService; import com.jsh.erp.service.depot.DepotService;
@@ -463,6 +464,11 @@ public class MaterialController {
BaseResponseInfo res = new BaseResponseInfo(); BaseResponseInfo res = new BaseResponseInfo();
try { try {
String[] mpArr = mpList.split(","); 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); List<MaterialVo4Unit> list = materialService.getMaterialByBarCode(barCode);
if(list!=null && list.size()>0) { if(list!=null && list.size()>0) {
for(MaterialVo4Unit mvo: list) { for(MaterialVo4Unit mvo: list) {

2
jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/MaterialMapperEx.java
View File

@@ -156,4 +156,6 @@ public interface MaterialMapperEx {
@Param("unit") String unit, @Param("unit") String unit,
@Param("unitId") Long unitId); @Param("unitId") Long unitId);
MaterialExtend getMaterialExtendBySerialNumber(
@Param("serialNumber") String serialNumber);
} }

4
jshERP-boot/src/main/java/com/jsh/erp/service/material/MaterialService.java
View File

@@ -1350,4 +1350,8 @@ public class MaterialService {
example.createCriteria().andIdIn(idList).andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED); example.createCriteria().andIdIn(idList).andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED);
return materialMapper.updateByExampleSelective(material, example); return materialMapper.updateByExampleSelective(material, example);
} }
public MaterialExtend getMaterialExtendBySerialNumber(String serialNumber) {
return materialMapperEx.getMaterialExtendBySerialNumber(serialNumber);
}
} }

11
jshERP-boot/src/main/resources/mapper_xml/MaterialMapperEx.xml
View File

@@ -742,4 +742,15 @@
and m.id != #{id} and m.id != #{id}
</if> </if>
</select> </select>
<select id="getMaterialExtendBySerialNumber" resultType="com.jsh.erp.datasource.entities.MaterialExtend">
select me.bar_code
from jsh_material m
left join jsh_material_extend me on m.id=me.material_id and ifnull(me.delete_flag,'0') !='1'
left join jsh_serial_number sn on sn.material_id=m.id and ifnull(sn.delete_flag,'0') !='1'
where sn.serial_number = #{serialNumber}
and me.default_flag=1
and ifnull(m.delete_flag,'0') !='1'
limit 0,1
</select>
</mapper> </mapper>