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

优化订单中明细的excel导入

Browse Source
This commit is contained in:
季圣华
2023-05-23 22:03:01 +08:00
parent 305ff78630
commit 1fe69cf1d4
2 changed files with 57 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
jshERP-boot/src/main/java/com/jsh/erp/service/depotItem/DepotItemService.java
View File

@@ -1127,6 +1127,7 @@ public class DepotItemService {
for (Map<String, String> detailMap: detailList) { for (Map<String, String> detailMap: detailList) {
JSONObject item = new JSONObject(); JSONObject item = new JSONObject();
String barCode = detailMap.get("barCode"); String barCode = detailMap.get("barCode");
if(StringUtil.isNotEmpty(barCode)) {
MaterialVo4Unit m = materialMap.get(barCode); MaterialVo4Unit m = materialMap.get(barCode);
if(m!=null) { if(m!=null) {
item.put("barCode", barCode); item.put("barCode", barCode);
@@ -1185,6 +1186,7 @@ public class DepotItemService {
String.format(ExceptionConstants.DEPOT_ITEM_BARCODE_IS_NOT_EXIST_MSG, barCode)); String.format(ExceptionConstants.DEPOT_ITEM_BARCODE_IS_NOT_EXIST_MSG, barCode));
} }
} }
}
map.put("rows", arr); map.put("rows", arr);
return map; return map;
} }

2
jshERP-boot/src/main/resources/mapper_xml/DepotItemMapperEx.xml
View File

@@ -966,7 +966,7 @@
<select id="getBillItemByParam" resultType="com.jsh.erp.datasource.entities.MaterialVo4Unit"> <select id="getBillItemByParam" resultType="com.jsh.erp.datasource.entities.MaterialVo4Unit">
select m.id, m.name, m.standard, m.model, me.id meId,me.commodity_unit commodityUnit, select m.id, m.name, m.standard, m.model, me.id meId,me.commodity_unit commodityUnit,
me.purchase_decimal purchaseDecimal, me.wholesale_decimal wholesaleDecimal, me.bar_code mBarCode me.purchase_decimal purchaseDecimal, me.wholesale_decimal wholesaleDecimal, me.bar_code mBarCode, me.sku
from jsh_material m 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_material_extend me on m.id=me.material_id and ifnull(me.delete_Flag,'0') !='1'
where 1=1 where 1=1