From b39fd7840ab7addc275ea8cc16225d39be843846 Mon Sep 17 00:00:00 2001 From: jishenghua <752718920@qq.com> Date: Thu, 27 Mar 2025 22:18:39 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=9B=B8=E5=85=B3=E6=8A=A5?= =?UTF-8?q?=E8=A1=A8=E7=9A=84=E6=89=A9=E5=B1=95=E5=AD=97=E6=AE=B5=EF=BC=8C?= =?UTF-8?q?=E4=BD=BF=E5=85=B6=E5=88=86=E4=B8=BA3=E4=B8=AA=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E5=88=86=E5=88=AB=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../erp/controller/DepotItemController.java | 35 +++++++++---------- .../com/jsh/erp/service/DepotHeadService.java | 35 ++++++++++--------- .../com/jsh/erp/service/DepotItemService.java | 21 ----------- .../com/jsh/erp/service/MaterialService.java | 2 +- 4 files changed, 36 insertions(+), 57 deletions(-) diff --git a/jshERP-boot/src/main/java/com/jsh/erp/controller/DepotItemController.java b/jshERP-boot/src/main/java/com/jsh/erp/controller/DepotItemController.java index cd06d728b..7bead6ca3 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/controller/DepotItemController.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/controller/DepotItemController.java @@ -332,7 +332,7 @@ public class DepotItemController { @RequestParam("beginTime") String beginTime, @RequestParam("endTime") String endTime, @RequestParam("materialParam") String materialParam, - @RequestParam("mpList") String mpList, + @RequestParam(value = "mpList", required = false) String mpList, HttpServletRequest request)throws Exception { BaseResponseInfo res = new BaseResponseInfo(); Map map = new HashMap<>(); @@ -347,7 +347,6 @@ public class DepotItemController { List depotList = parseListByDepotIds(depotIds); List dataList = depotItemService.getInOutStock(StringUtil.toNull(materialParam), categoryIdList, endTime,(currentPage-1)*pageSize, pageSize); - String[] mpArr = mpList.split(","); int total = depotItemService.getInOutStockCount(StringUtil.toNull(materialParam), categoryIdList, endTime); map.put("total", total); //存放数据json数组 @@ -364,8 +363,9 @@ public class DepotItemController { item.put("materialMfrs", diEx.getMMfrs()); item.put("materialBrand", diEx.getBrand()); //扩展信息 - String materialOther = depotItemService.getOtherInfo(mpArr, diEx); - item.put("materialOther", materialOther); + item.put("otherField1", diEx.getMOtherField1()); + item.put("otherField2", diEx.getMOtherField2()); + item.put("otherField3", diEx.getMOtherField3()); item.put("unitId", diEx.getUnitId()); item.put("unitName", null!=diEx.getUnitId() ? diEx.getMaterialUnit()+"[多单位]" : diEx.getMaterialUnit()); BigDecimal prevSum = depotItemService.getStockByParamWithDepotList(depotList,mId,null,beginTime); @@ -509,7 +509,7 @@ public class DepotItemController { @RequestParam(value = "categoryId", required = false) Long categoryId, @RequestParam(value = "organizationId", required = false) Long organizationId, @RequestParam("materialParam") String materialParam, - @RequestParam("mpList") String mpList, + @RequestParam(value = "mpList",required = false) String mpList, HttpServletRequest request)throws Exception { BaseResponseInfo res = new BaseResponseInfo(); Map map = new HashMap(); @@ -529,7 +529,6 @@ public class DepotItemController { Boolean forceFlag = systemConfigService.getForceApprovalFlag(); List dataList = depotItemService.getListWithBuyOrSale(StringUtil.toNull(materialParam), "buy", beginTime, endTime, creatorArray, organId, organArray, categoryList, depotList, forceFlag, (currentPage-1)*pageSize, pageSize); - String[] mpArr = mpList.split(","); int total = depotItemService.getListWithBuyOrSaleCount(StringUtil.toNull(materialParam), "buy", beginTime, endTime, creatorArray, organId, organArray, categoryList, depotList, forceFlag); map.put("total", total); @@ -548,8 +547,9 @@ public class DepotItemController { item.put("materialModel", diEx.getMModel()); item.put("materialStandard", diEx.getMStandard()); //扩展信息 - String materialOther = depotItemService.getOtherInfo(mpArr, diEx); - item.put("materialOther", materialOther); + item.put("otherField1", diEx.getMOtherField1()); + item.put("otherField2", diEx.getMOtherField2()); + item.put("otherField3", diEx.getMOtherField3()); item.put("materialColor", diEx.getMColor()); item.put("materialBrand", diEx.getBrand()); item.put("materialMfrs", diEx.getMMfrs()); @@ -602,7 +602,7 @@ public class DepotItemController { @RequestParam(value = "categoryId", required = false) Long categoryId, @RequestParam(value = "organizationId", required = false) Long organizationId, @RequestParam("materialParam") String materialParam, - @RequestParam("mpList") String mpList, + @RequestParam(value = "mpList", required = false) String mpList, HttpServletRequest request)throws Exception { BaseResponseInfo res = new BaseResponseInfo(); Map map = new HashMap(); @@ -622,7 +622,6 @@ public class DepotItemController { Boolean forceFlag = systemConfigService.getForceApprovalFlag(); List dataList = depotItemService.getListWithBuyOrSale(StringUtil.toNull(materialParam), "retail", beginTime, endTime, creatorArray, organId, organArray, categoryList, depotList, forceFlag, (currentPage-1)*pageSize, pageSize); - String[] mpArr = mpList.split(","); int total = depotItemService.getListWithBuyOrSaleCount(StringUtil.toNull(materialParam), "retail", beginTime, endTime, creatorArray, organId, organArray, categoryList, depotList, forceFlag); map.put("total", total); @@ -641,8 +640,9 @@ public class DepotItemController { item.put("materialModel", diEx.getMModel()); item.put("materialStandard", diEx.getMStandard()); //扩展信息 - String materialOther = depotItemService.getOtherInfo(mpArr, diEx); - item.put("materialOther", materialOther); + item.put("otherField1", diEx.getMOtherField1()); + item.put("otherField2", diEx.getMOtherField2()); + item.put("otherField3", diEx.getMOtherField3()); item.put("materialColor", diEx.getMColor()); item.put("materialBrand", diEx.getBrand()); item.put("materialMfrs", diEx.getMMfrs()); @@ -696,7 +696,7 @@ public class DepotItemController { @RequestParam(value = "categoryId", required = false) Long categoryId, @RequestParam(value = "organizationId", required = false) Long organizationId, @RequestParam("materialParam") String materialParam, - @RequestParam("mpList") String mpList, + @RequestParam(value = "mpList", required = false) String mpList, HttpServletRequest request)throws Exception { BaseResponseInfo res = new BaseResponseInfo(); Map map = new HashMap(); @@ -716,7 +716,6 @@ public class DepotItemController { Boolean forceFlag = systemConfigService.getForceApprovalFlag(); List dataList = depotItemService.getListWithBuyOrSale(StringUtil.toNull(materialParam), "sale", beginTime, endTime, creatorArray, organId, organArray, categoryList, depotList, forceFlag, (currentPage-1)*pageSize, pageSize); - String[] mpArr = mpList.split(","); int total = depotItemService.getListWithBuyOrSaleCount(StringUtil.toNull(materialParam), "sale", beginTime, endTime, creatorArray, organId, organArray, categoryList, depotList, forceFlag); map.put("total", total); @@ -735,8 +734,9 @@ public class DepotItemController { item.put("materialModel", diEx.getMModel()); item.put("materialStandard", diEx.getMStandard()); //扩展信息 - String materialOther = depotItemService.getOtherInfo(mpArr, diEx); - item.put("materialOther", materialOther); + item.put("otherField1", diEx.getMOtherField1()); + item.put("otherField2", diEx.getMOtherField2()); + item.put("otherField3", diEx.getMOtherField3()); item.put("materialColor", diEx.getMColor()); item.put("materialBrand", diEx.getBrand()); item.put("materialMfrs", diEx.getMMfrs()); @@ -796,7 +796,7 @@ public class DepotItemController { @RequestParam("materialParam") String materialParam, @RequestParam(value = "depotId", required = false) Long depotId, @RequestParam(value = "categoryId", required = false) Long categoryId, - @RequestParam("mpList") String mpList)throws Exception { + @RequestParam(value = "mpList", required = false) String mpList)throws Exception { BaseResponseInfo res = new BaseResponseInfo(); Map map = new HashMap(); try { @@ -824,7 +824,6 @@ public class DepotItemController { diEx.setMOtherField1(disw.getMOtherField1()); diEx.setMOtherField2(disw.getMOtherField2()); diEx.setMOtherField3(disw.getMOtherField3()); - disw.setMaterialOther(depotItemService.getOtherInfo(mpArr, diEx)); disw.setMaterialUnit(getUName(disw.getMaterialUnit(), disw.getUnitName())); if(null!=disw.getLowSafeStock() && disw.getCurrentNumber().compareTo(disw.getLowSafeStock())<0) { disw.setLowCritical(disw.getLowSafeStock().subtract(disw.getCurrentNumber())); diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/DepotHeadService.java b/jshERP-boot/src/main/java/com/jsh/erp/service/DepotHeadService.java index 4ff3ccd15..fd3a386e9 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/service/DepotHeadService.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/service/DepotHeadService.java @@ -1416,15 +1416,14 @@ public class DepotHeadService { //导出明细数据 if(idList.size()>0) { List dataList = depotItemMapperEx.getBillDetailListByIds(idList); - String[] mpArr = mpList.split(","); String twoTip = ""; String sheetTwoStr = ""; if ("采购".equals(subType)) { twoTip = "供应商单据明细"; - sheetTwoStr = "供应商,单据编号,单据日期,仓库名称,条码,名称,规格,型号,颜色,品牌,制造商,扩展信息,单位,序列号,批号,有效期,多属性,数量,单价,金额,税率(%),税额,价税合计,重量,备注"; + sheetTwoStr = "供应商,单据编号,单据日期,仓库名称,条码,名称,规格,型号,颜色,品牌,制造商," + mpList + ",单位,序列号,批号,有效期,多属性,数量,单价,金额,税率(%),税额,价税合计,重量,备注"; } else if ("销售".equals(subType)) { twoTip = "客户单据明细"; - sheetTwoStr = "客户,单据编号,单据日期,仓库名称,条码,名称,规格,型号,颜色,品牌,制造商,扩展信息,单位,序列号,批号,有效期,多属性,数量,单价,金额,税率(%),税额,价税合计,重量,备注"; + sheetTwoStr = "客户,单据编号,单据日期,仓库名称,条码,名称,规格,型号,颜色,品牌,制造商," + mpList + ",单位,序列号,批号,有效期,多属性,数量,单价,金额,税率(%),税额,价税合计,重量,备注"; } if (StringUtil.isNotEmpty(beginTime) && StringUtil.isNotEmpty(endTime)) { twoTip = twoTip + "（" + beginTime + "至" + endTime + "）"; @@ -1446,21 +1445,23 @@ public class DepotHeadService { objs[8] = diEx.getMColor(); objs[9] = diEx.getBrand(); objs[10] = diEx.getMMfrs(); - objs[11] = depotItemService.getOtherInfo(mpArr, diEx); - objs[12] = diEx.getMaterialUnit(); - objs[13] = diEx.getSnList(); - objs[14] = diEx.getBatchNumber(); - objs[15] = Tools.parseDateToStr(diEx.getExpirationDate()); - objs[16] = diEx.getSku(); - objs[17] = parseDecimalToStr(diEx.getOperNumber(), 2); - objs[18] = parseDecimalToStr(roleService.parseBillPriceByLimit(diEx.getUnitPrice(), billCategory, priceLimit, request), 2); - objs[19] = parseDecimalToStr(roleService.parseBillPriceByLimit(diEx.getAllPrice(), billCategory, priceLimit, request), 2); - objs[20] = parseDecimalToStr(roleService.parseBillPriceByLimit(diEx.getTaxRate(), billCategory, priceLimit, request), 2); - objs[21] = parseDecimalToStr(roleService.parseBillPriceByLimit(diEx.getTaxMoney(), billCategory, priceLimit, request), 2); - objs[22] = parseDecimalToStr(roleService.parseBillPriceByLimit(diEx.getTaxLastMoney(), billCategory, priceLimit, request), 2); + objs[11] = diEx.getMOtherField1(); + objs[12] = diEx.getMOtherField2(); + objs[13] = diEx.getMOtherField3(); + objs[14] = diEx.getMaterialUnit(); + objs[15] = diEx.getSnList(); + objs[16] = diEx.getBatchNumber(); + objs[17] = Tools.parseDateToStr(diEx.getExpirationDate()); + objs[18] = diEx.getSku(); + objs[19] = parseDecimalToStr(diEx.getOperNumber(), 2); + objs[20] = parseDecimalToStr(roleService.parseBillPriceByLimit(diEx.getUnitPrice(), billCategory, priceLimit, request), 2); + objs[21] = parseDecimalToStr(roleService.parseBillPriceByLimit(diEx.getAllPrice(), billCategory, priceLimit, request), 2); + objs[22] = parseDecimalToStr(roleService.parseBillPriceByLimit(diEx.getTaxRate(), billCategory, priceLimit, request), 2); + objs[23] = parseDecimalToStr(roleService.parseBillPriceByLimit(diEx.getTaxMoney(), billCategory, priceLimit, request), 2); + objs[24] = parseDecimalToStr(roleService.parseBillPriceByLimit(diEx.getTaxLastMoney(), billCategory, priceLimit, request), 2); BigDecimal allWeight = diEx.getBasicNumber() == null || diEx.getWeight() == null ? BigDecimal.ZERO : diEx.getBasicNumber().multiply(diEx.getWeight()); - objs[23] = parseDecimalToStr(allWeight, 2); - objs[24] = diEx.getRemark(); + objs[25] = parseDecimalToStr(allWeight, 2); + objs[26] = diEx.getRemark(); billDetail.add(objs); } ExcelUtils.exportObjectsManySheet(wtwb, twoTip, sheetTwoArr, "单据明细", 1, billDetail); diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/DepotItemService.java b/jshERP-boot/src/main/java/com/jsh/erp/service/DepotItemService.java index c03174f8d..e4354c1ce 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/service/DepotItemService.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/service/DepotItemService.java @@ -1409,25 +1409,4 @@ public class DepotItemService { BigDecimal stock = depotItemMapperEx.getCurrentStockByParam(depotId, mId); return stock!=null? stock: BigDecimal.ZERO; } - - /** - * 获取扩展信息 - * - * @return - */ - public String getOtherInfo(String[] mpArr, DepotItemVo4WithInfoEx diEx)throws Exception { - String materialOther = ""; - for (int i = 0; i < mpArr.length; i++) { - if (mpArr[i].equals("自定义1")) { - materialOther = materialOther + ((diEx.getMOtherField1() == null || diEx.getMOtherField1().equals("")) ? "" : "(" + diEx.getMOtherField1() + ")"); - } - if (mpArr[i].equals("自定义2")) { - materialOther = materialOther + ((diEx.getMOtherField2() == null || diEx.getMOtherField2().equals("")) ? "" : "(" + diEx.getMOtherField2() + ")"); - } - if (mpArr[i].equals("自定义3")) { - materialOther = materialOther + ((diEx.getMOtherField3() == null || diEx.getMOtherField3().equals("")) ? "" : "(" + diEx.getMOtherField3() + ")"); - } - } - return materialOther; - } } diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/MaterialService.java b/jshERP-boot/src/main/java/com/jsh/erp/service/MaterialService.java index 649c22672..d9318b738 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/service/MaterialService.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/service/MaterialService.java @@ -480,7 +480,7 @@ public class MaterialService { otherMaterialMap.putIfAbsent(me.getMaterialId(), me); } String nameStr = "名称*,规格,型号,颜色,品牌,类别,基础重量(kg),保质期(天),基本单位*,副单位,基本条码*,副条码,比例,多属性," + - "采购价,零售价,销售价,最低售价,状态*,序列号,批号,仓位货架,制造商,自定义1,自定义2,自定义3,备注"; + "采购价,零售价,销售价,最低售价,状态*,序列号,批号,仓位货架,制造商,扩展1,扩展2,扩展3,备注"; List nameList = StringUtil.strToStringList(nameStr); //仓库列表 List depotList = depotService.getAllList();