From 5a87de50b2b65daf200a5482285e2fcd4a72d892 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com> Date: Mon, 16 May 2022 18:28:04 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=95=86=E5=93=81=E6=A8=A1?= =?UTF-8?q?=E5=9D=97=EF=BC=8C=E8=A7=A3=E5=86=B3=E4=BF=AE=E6=94=B9=E6=9D=A1?= =?UTF-8?q?=E7=A0=81=E7=9A=84=E9=80=BB=E8=BE=91=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../erp/controller/MaterialController.java | 13 ++--- .../datasource/mappers/MaterialMapperEx.java | 8 ++- .../erp/service/material/MaterialService.java | 17 ++++--- .../materialExtend/MaterialExtendService.java | 49 ++++++++----------- .../resources/mapper_xml/MaterialMapperEx.xml | 25 +++------- 5 files changed, 47 insertions(+), 65 deletions(-) diff --git a/jshERP-boot/src/main/java/com/jsh/erp/controller/MaterialController.java b/jshERP-boot/src/main/java/com/jsh/erp/controller/MaterialController.java index 30bb09111..ddd20d54e 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/controller/MaterialController.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/controller/MaterialController.java @@ -304,13 +304,11 @@ public class MaterialController { @GetMapping(value = "/exportExcel") @ApiOperation(value = "生成excel表格") public void exportExcel(@RequestParam(value = "categoryId", required = false) String categoryId, - @RequestParam(value = "barCode", required = false) String barCode, - @RequestParam(value = "name", required = false) String name, - @RequestParam(value = "standard", required = false) String standard, - @RequestParam(value = "model", required = false) String model, + @RequestParam(value = "materialParam", required = false) String materialParam, @RequestParam(value = "color", required = false) String color, @RequestParam(value = "weight", required = false) String weight, @RequestParam(value = "expiryNum", required = false) String expiryNum, + @RequestParam(value = "enabled", required = false) String enabled, @RequestParam(value = "enableSerialNumber", required = false) String enableSerialNumber, @RequestParam(value = "enableBatchNumber", required = false) String enableBatchNumber, @RequestParam(value = "remark", required = false) String remark, @@ -321,10 +319,9 @@ public class MaterialController { if(StringUtil.isNotEmpty(mpList)){ mpArr= mpList.split(","); } - List dataList = materialService.findByAll(StringUtil.toNull(barCode), StringUtil.toNull(name), - StringUtil.toNull(standard), StringUtil.toNull(model), StringUtil.toNull(color), StringUtil.toNull(weight), - StringUtil.toNull(expiryNum), StringUtil.toNull(enableSerialNumber), StringUtil.toNull(enableBatchNumber), - StringUtil.toNull(remark), StringUtil.toNull(categoryId)); + List dataList = materialService.exportExcel(StringUtil.toNull(materialParam), StringUtil.toNull(color), + StringUtil.toNull(weight), StringUtil.toNull(expiryNum), StringUtil.toNull(enabled), StringUtil.toNull(enableSerialNumber), + StringUtil.toNull(enableBatchNumber), StringUtil.toNull(remark), StringUtil.toNull(categoryId)); String[] names = {"条码", "名称", "规格", "型号", "颜色", "类别", "扩展信息", "单位", "基础重量", "保质期", "采购价", "零售价", "销售价", "最低售价", "备注", "状态", "序列号", "批号"}; String title = "商品信息"; List objects = new ArrayList<>(); diff --git a/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/MaterialMapperEx.java b/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/MaterialMapperEx.java index de7dec00e..60b57e4a8 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/MaterialMapperEx.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/MaterialMapperEx.java @@ -60,14 +60,12 @@ public interface MaterialMapperEx { int findBySelectWithBarCodeCount(@Param("idList") List idList, @Param("q") String q); - List findByAll( - @Param("barCode") String barCode, - @Param("name") String name, - @Param("standard") String standard, - @Param("model") String model, + List exportExcel( + @Param("materialParam") String materialParam, @Param("color") String color, @Param("weight") String weight, @Param("expiryNum") String expiryNum, + @Param("enabled") String enabled, @Param("enableSerialNumber") String enableSerialNumber, @Param("enableBatchNumber") String enableBatchNumber, @Param("remark") String remark, diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/material/MaterialService.java b/jshERP-boot/src/main/java/com/jsh/erp/service/material/MaterialService.java index 080023378..5b058826a 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/service/material/MaterialService.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/service/material/MaterialService.java @@ -430,9 +430,8 @@ public class MaterialService { return result; } - public List findByAll(String barCode, String name, String standard, String model, String color, - String weight, String expiryNum, String enableSerialNumber, String enableBatchNumber, - String remark, String categoryId)throws Exception { + public List exportExcel(String materialParam, String color, String weight, String expiryNum, String enabled, + String enableSerialNumber, String enableBatchNumber, String remark, String categoryId)throws Exception { List resList = new ArrayList<>(); List list =null; try{ @@ -440,8 +439,8 @@ public class MaterialService { if(StringUtil.isNotEmpty(categoryId)){ idList = getListByParentId(Long.parseLong(categoryId)); } - list= materialMapperEx.findByAll(barCode, name, standard, model, color, weight, expiryNum, - enableSerialNumber, enableBatchNumber, remark, idList); + list= materialMapperEx.exportExcel(materialParam, color, weight, expiryNum, enabled, enableSerialNumber, + enableBatchNumber, remark, idList); }catch(Exception e){ JshException.readFail(logger, e); } @@ -654,9 +653,13 @@ public class MaterialService { } //批量更新库存 batchDeleteInitialStockByMaterialList(deleteStockMaterialIdList); - materialInitialStockMapperEx.batchInsert(insertInitialStockMaterialList); + if(insertInitialStockMaterialList.size()>0) { + materialInitialStockMapperEx.batchInsert(insertInitialStockMaterialList); + } batchDeleteCurrentStockByMaterialList(deleteStockMaterialIdList); - materialCurrentStockMapperEx.batchInsert(insertCurrentStockMaterialList); + if(insertCurrentStockMaterialList.size()>0) { + materialCurrentStockMapperEx.batchInsert(insertCurrentStockMaterialList); + } logService.insertLog("商品", new StringBuffer(BusinessConstants.LOG_OPERATION_TYPE_IMPORT).append(mList.size()).append(BusinessConstants.LOG_DATA_UNIT).toString(), ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest()); diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/materialExtend/MaterialExtendService.java b/jshERP-boot/src/main/java/com/jsh/erp/service/materialExtend/MaterialExtendService.java index 9350b7d74..5159b7926 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/service/materialExtend/MaterialExtendService.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/service/materialExtend/MaterialExtendService.java @@ -85,8 +85,8 @@ public class MaterialExtendService { JSONArray meArr = obj.getJSONArray("meList"); JSONArray insertedJson = new JSONArray(); JSONArray updatedJson = new JSONArray(); - JSONArray deletedJson = new JSONArray(); - List barCodeList=new ArrayList<>(); + JSONArray deletedJson = obj.getJSONArray("meDeleteIdList"); + JSONArray sortJson = JSONArray.parseArray(sortList); if (null != meArr) { if("insert".equals(type)){ for (int i = 0; i < meArr.size(); i++) { @@ -97,23 +97,25 @@ public class MaterialExtendService { for (int i = 0; i < meArr.size(); i++) { JSONObject tempJson = meArr.getJSONObject(i); String barCode = tempJson.getString("barCode"); - barCodeList.add(barCode); - MaterialExtend materialExtend = getInfoByBarCode(barCode); - if (materialExtend.getBarCode() == null) { + String tempId = tempJson.getString("id"); + if(tempId.length()>19){ insertedJson.add(tempJson); } else { updatedJson.add(tempJson); } } - List materialExtendList = getMeListByBarCodeAndMid(barCodeList, materialId); - for (MaterialExtend meObj : materialExtendList) { - JSONObject deleteObj = new JSONObject(); - deleteObj.put("id", meObj.getId()); - deletedJson.add(deleteObj); - } } } - JSONArray sortJson = JSONArray.parseArray(sortList); + if (null != deletedJson) { + StringBuffer bf=new StringBuffer(); + for (int i = 0; i < deletedJson.size(); i++) { + bf.append(deletedJson.getString(i)); + if(i<(deletedJson.size()-1)){ + bf.append(","); + } + } + this.batchDeleteMaterialExtendByIds(bf.toString(), request); + } if (null != insertedJson) { for (int i = 0; i < insertedJson.size(); i++) { MaterialExtend materialExtend = new MaterialExtend(); @@ -149,17 +151,6 @@ public class MaterialExtendService { this.insertMaterialExtend(materialExtend); } } - if (null != deletedJson) { - StringBuffer bf=new StringBuffer(); - for (int i = 0; i < deletedJson.size(); i++) { - JSONObject tempDeletedJson = JSONObject.parseObject(deletedJson.getString(i)); - bf.append(tempDeletedJson.getLong("id")); - if(i<(deletedJson.size()-1)){ - bf.append(","); - } - } - this.batchDeleteMaterialExtendByIds(bf.toString(), request); - } if (null != updatedJson) { for (int i = 0; i < updatedJson.size(); i++) { JSONObject tempUpdatedJson = JSONObject.parseObject(updatedJson.getString(i)); @@ -379,11 +370,13 @@ public class MaterialExtendService { * @throws Exception */ public List getMeListByBarCodeAndMid(List barCodeList, Long mId)throws Exception { - MaterialExtend materialExtend = new MaterialExtend(); - MaterialExtendExample example = new MaterialExtendExample(); - example.createCriteria().andBarCodeNotIn(barCodeList).andMaterialIdEqualTo(mId) - .andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED); - List list = materialExtendMapper.selectByExample(example); + List list = new ArrayList<>(); + if(barCodeList.size()>0) { + MaterialExtendExample example = new MaterialExtendExample(); + example.createCriteria().andBarCodeNotIn(barCodeList).andMaterialIdEqualTo(mId) + .andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED); + list = materialExtendMapper.selectByExample(example); + } return list; } } diff --git a/jshERP-boot/src/main/resources/mapper_xml/MaterialMapperEx.xml b/jshERP-boot/src/main/resources/mapper_xml/MaterialMapperEx.xml index 4f8249be1..f1f478caf 100644 --- a/jshERP-boot/src/main/resources/mapper_xml/MaterialMapperEx.xml +++ b/jshERP-boot/src/main/resources/mapper_xml/MaterialMapperEx.xml @@ -59,7 +59,7 @@ and m.enable_batch_number = #{enableBatchNumber} - + and m.enabled = #{enabled} @@ -323,7 +323,7 @@ and ifnull(m.delete_flag,'0') !='1' - select m.*,u.name unitName, mc.name categoryName,me.bar_code,me.commodity_unit,me.purchase_decimal, me.commodity_decimal, me.wholesale_decimal, me.low_decimal FROM jsh_material m @@ -332,21 +332,9 @@ left JOIN jsh_material_category mc on m.category_id = mc.id and ifnull(mc.delete_Flag,'0') !='1' where 1=1 and me.default_flag=1 - - - and me.bar_code like #{bindBarCode} - - - - and m.name like #{bindName} - - - - and m.standard like #{bindStandard} - - - - and m.model like #{bindModel} + + + and (me.bar_code like #{bindKey} or m.name like #{bindKey} or m.standard like #{bindKey} or m.model like #{bindKey}) @@ -358,6 +346,9 @@ and m.expiry_num = #{expiryNum} + + and m.enabled = #{enabled} + and m.enable_serial_number = #{enableSerialNumber}