From aa72b0bce28b453323f5525b225eeb96fce375da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com> Date: Fri, 9 Sep 2022 00:25:03 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=BA=8F=E5=88=97=E5=8F=B7?= =?UTF-8?q?=E5=92=8C=E6=89=B9=E5=8F=B7=E9=80=89=E6=8B=A9=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E7=9A=84=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../erp/controller/DepotItemController.java | 8 +++++- .../controller/SerialNumberController.java | 28 +++++++++++++------ .../datasource/entities/SerialNumberEx.java | 22 +++++++++++++++ .../datasource/mappers/DepotItemMapperEx.java | 1 + .../mappers/SerialNumberMapperEx.java | 6 ++-- .../service/depotItem/DepotItemService.java | 4 +-- .../serialNumber/SerialNumberService.java | 13 ++++----- .../mapper_xml/DepotItemMapperEx.xml | 6 ++-- .../mapper_xml/SerialNumberMapperEx.xml | 16 ++++++++--- 9 files changed, 77 insertions(+), 27 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 09f1ac50..3bf9dfa9 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 @@ -709,6 +709,7 @@ public class DepotItemController { @GetMapping(value = "/getBatchNumberList") @ApiOperation(value = "获取批次商品列表信息") public BaseResponseInfo getBatchNumberList(@RequestParam("name") String name, + @RequestParam("depotItemId") Long depotItemId, @RequestParam("depotId") Long depotId, @RequestParam("barCode") String barCode, @RequestParam(value = "batchNumber", required = false) String batchNumber, @@ -716,8 +717,13 @@ public class DepotItemController { BaseResponseInfo res = new BaseResponseInfo(); Map map = new HashMap<>(); try { + String number = ""; + if(depotItemId != null) { + DepotItem depotItem = depotItemService.getDepotItem(depotItemId); + number = depotHeadService.getDepotHead(depotItem.getHeaderId()).getNumber(); + } List reslist = new ArrayList<>(); - List list = depotItemService.getBatchNumberList(name, depotId, barCode, batchNumber); + List list = depotItemService.getBatchNumberList(number, name, depotId, barCode, batchNumber); for(DepotItemVoBatchNumberList bn: list) { if(bn.getTotalNum()!=null && bn.getTotalNum().compareTo(BigDecimal.ZERO)>0) { reslist.add(bn); diff --git a/jshERP-boot/src/main/java/com/jsh/erp/controller/SerialNumberController.java b/jshERP-boot/src/main/java/com/jsh/erp/controller/SerialNumberController.java index 093b1208..13c0dfba 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/controller/SerialNumberController.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/controller/SerialNumberController.java @@ -1,17 +1,14 @@ package com.jsh.erp.controller; -import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; -import com.jsh.erp.constants.ExceptionConstants; -import com.jsh.erp.datasource.entities.SerialNumber; +import com.jsh.erp.datasource.entities.DepotItem; import com.jsh.erp.datasource.entities.SerialNumberEx; -import com.jsh.erp.exception.BusinessParamCheckingException; -import com.jsh.erp.exception.BusinessRunTimeException; +import com.jsh.erp.service.depotHead.DepotHeadService; +import com.jsh.erp.service.depotItem.DepotItemService; import com.jsh.erp.service.serialNumber.SerialNumberService; import com.jsh.erp.utils.BaseResponseInfo; -import com.jsh.erp.utils.Constants; import com.jsh.erp.utils.ErpInfo; -import com.jsh.erp.utils.StringUtil; +import com.jsh.erp.utils.Tools; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.slf4j.Logger; @@ -40,6 +37,10 @@ public class SerialNumberController { @Resource private SerialNumberService serialNumberService; + @Resource + private DepotHeadService depotHeadService; + @Resource + private DepotItemService depotItemService; /** * create by: cjl @@ -84,6 +85,7 @@ public class SerialNumberController { @GetMapping(value = "/getEnableSerialNumberList") @ApiOperation(value = "获取序列号商品") public BaseResponseInfo getEnableSerialNumberList(@RequestParam("name") String name, + @RequestParam("depotItemId") Long depotItemId, @RequestParam("depotId") Long depotId, @RequestParam("barCode") String barCode, @RequestParam("page") Integer currentPage, @@ -92,8 +94,16 @@ public class SerialNumberController { BaseResponseInfo res = new BaseResponseInfo(); Map map = new HashMap<>(); try { - List list = serialNumberService.getEnableSerialNumberList(name, depotId, barCode, (currentPage-1)*pageSize, pageSize); - Long total = serialNumberService.getEnableSerialNumberCount(name, depotId, barCode); + String number = ""; + if(depotItemId != null) { + DepotItem depotItem = depotItemService.getDepotItem(depotItemId); + number = depotHeadService.getDepotHead(depotItem.getHeaderId()).getNumber(); + } + List list = serialNumberService.getEnableSerialNumberList(number, name, depotId, barCode, (currentPage-1)*pageSize, pageSize); + for(SerialNumberEx serialNumberEx: list) { + serialNumberEx.setCreateTimeStr(Tools.getCenternTime(serialNumberEx.getCreateTime())); + } + Long total = serialNumberService.getEnableSerialNumberCount(number, name, depotId, barCode); map.put("rows", list); map.put("total", total); res.code = 200; diff --git a/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/SerialNumberEx.java b/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/SerialNumberEx.java index 5750fad2..1d3c8ce2 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/SerialNumberEx.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/SerialNumberEx.java @@ -1,5 +1,7 @@ package com.jsh.erp.datasource.entities; +import java.util.Date; + /** * Description * @@ -30,6 +32,10 @@ public class SerialNumberEx extends SerialNumber{ private String depotName; + private String createTimeStr; + + private String updateTimeStr; + public String getMaterialCode() { return materialCode; } @@ -85,4 +91,20 @@ public class SerialNumberEx extends SerialNumber{ public void setDepotName(String depotName) { this.depotName = depotName; } + + public String getCreateTimeStr() { + return createTimeStr; + } + + public void setCreateTimeStr(String createTimeStr) { + this.createTimeStr = createTimeStr; + } + + public String getUpdateTimeStr() { + return updateTimeStr; + } + + public void setUpdateTimeStr(String updateTimeStr) { + this.updateTimeStr = updateTimeStr; + } } diff --git a/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/DepotItemMapperEx.java b/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/DepotItemMapperEx.java index 86c6fb22..5bbbd6e8 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/DepotItemMapperEx.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/DepotItemMapperEx.java @@ -163,6 +163,7 @@ public interface DepotItemMapperEx { @Param("goToType") String goToType); List getBatchNumberList( + @Param("number") String number, @Param("name") String name, @Param("depotId") Long depotId, @Param("barCode") String barCode, diff --git a/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/SerialNumberMapperEx.java b/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/SerialNumberMapperEx.java index 8d356c1f..6250f81e 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/SerialNumberMapperEx.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/SerialNumberMapperEx.java @@ -44,12 +44,14 @@ public interface SerialNumberMapperEx { int batchDeleteSerialNumberByIds(@Param("updateTime") Date updateTime, @Param("updater") Long updater, @Param("ids") String ids[]); - List getEnableSerialNumberList(@Param("name") String name, + List getEnableSerialNumberList(@Param("number") String number, + @Param("name") String name, @Param("depotId") Long depotId, @Param("barCode") String barCode, @Param("offset") Integer offset, @Param("rows") Integer rows); - Long getEnableSerialNumberCount(@Param("name") String name, + Long getEnableSerialNumberCount(@Param("number") String number, + @Param("name") String name, @Param("depotId") Long depotId, @Param("barCode") String barCode); } diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/depotItem/DepotItemService.java b/jshERP-boot/src/main/java/com/jsh/erp/service/depotItem/DepotItemService.java index f72c8b15..39914d78 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/service/depotItem/DepotItemService.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/service/depotItem/DepotItemService.java @@ -955,8 +955,8 @@ public class DepotItemService { return count; } - public List getBatchNumberList(String name, Long depotId, String barCode, String batchNumber){ - return depotItemMapperEx.getBatchNumberList(name, depotId, barCode, batchNumber); + public List getBatchNumberList(String number, String name, Long depotId, String barCode, String batchNumber){ + return depotItemMapperEx.getBatchNumberList(StringUtil.toNull(number), name, depotId, barCode, batchNumber); } public Long getCountByMaterialAndDepot(Long mId, Long depotId) { diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/serialNumber/SerialNumberService.java b/jshERP-boot/src/main/java/com/jsh/erp/service/serialNumber/SerialNumberService.java index d0aaeab3..9d718838 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/service/serialNumber/SerialNumberService.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/service/serialNumber/SerialNumberService.java @@ -7,6 +7,7 @@ import com.jsh.erp.datasource.entities.*; import com.jsh.erp.datasource.mappers.*; import com.jsh.erp.exception.BusinessRunTimeException; import com.jsh.erp.exception.JshException; +import com.jsh.erp.service.depotHead.DepotHeadService; import com.jsh.erp.service.depotItem.DepotItemService; import com.jsh.erp.service.log.LogService; import com.jsh.erp.service.material.MaterialService; @@ -42,8 +43,6 @@ public class SerialNumberService { @Resource private MaterialMapperEx materialMapperEx; @Resource - private MaterialMapper materialMapper; - @Resource private MaterialService materialService; @Resource private UserService userService; @@ -374,20 +373,20 @@ public class SerialNumberService { return result; } - public List getEnableSerialNumberList(String name, Long depotId, String barCode, Integer offset, Integer rows)throws Exception { - List list =null; + public List getEnableSerialNumberList(String number, String name, Long depotId, String barCode, Integer offset, Integer rows)throws Exception { + List list =null; try{ - list = serialNumberMapperEx.getEnableSerialNumberList(StringUtil.toNull(name), depotId, barCode, offset, rows); + list = serialNumberMapperEx.getEnableSerialNumberList(StringUtil.toNull(number), StringUtil.toNull(name), depotId, barCode, offset, rows); }catch(Exception e){ JshException.readFail(logger, e); } return list; } - public Long getEnableSerialNumberCount(String name, Long depotId, String barCode)throws Exception { + public Long getEnableSerialNumberCount(String number, String name, Long depotId, String barCode)throws Exception { Long count = 0L; try{ - count = serialNumberMapperEx.getEnableSerialNumberCount(StringUtil.toNull(name), depotId, barCode); + count = serialNumberMapperEx.getEnableSerialNumberCount(StringUtil.toNull(number), StringUtil.toNull(name), depotId, barCode); }catch(Exception e){ JshException.readFail(logger, e); } diff --git a/jshERP-boot/src/main/resources/mapper_xml/DepotItemMapperEx.xml b/jshERP-boot/src/main/resources/mapper_xml/DepotItemMapperEx.xml index e7b48f7f..f06ad9e0 100644 --- a/jshERP-boot/src/main/resources/mapper_xml/DepotItemMapperEx.xml +++ b/jshERP-boot/src/main/resources/mapper_xml/DepotItemMapperEx.xml @@ -687,8 +687,7 @@ select id, bar_code, name, standard, model, batch_number, expiration_date, sum(oper_number) total_num from (select di.batch_number id, me.bar_code, m.name, m.standard, m.model,di.batch_number,di.expiration_date, di.oper_number*(case dh.type when '入库' then 1 when '出库' then -1 end) as oper_number - from - jsh_depot_head dh + from jsh_depot_head dh left join jsh_depot_item di on dh.id=di.header_id left join jsh_material m on m.id=di.material_id and ifnull(m.delete_flag, '0') != '1' left join jsh_material_extend me on me.material_id=m.id and ifnull(me.delete_flag,'0') !='1' @@ -703,6 +702,9 @@ and di.batch_number= #{batchNumber} + + and dh.number!= #{number} + and m.enable_batch_number =1 and di.delete_flag!=1) tb group by batch_number diff --git a/jshERP-boot/src/main/resources/mapper_xml/SerialNumberMapperEx.xml b/jshERP-boot/src/main/resources/mapper_xml/SerialNumberMapperEx.xml index acc5bb0b..899482c3 100644 --- a/jshERP-boot/src/main/resources/mapper_xml/SerialNumberMapperEx.xml +++ b/jshERP-boot/src/main/resources/mapper_xml/SerialNumberMapperEx.xml @@ -158,9 +158,9 @@ ) - select - ser.id, ser.serial_number + ser.id, ser.serial_number, ser.in_bill_no, ser.create_time, ser.update_time FROM jsh_serial_number ser left join jsh_material m on m.id=ser.material_id and ifnull(m.delete_flag, '0') != '1' left join jsh_material_extend me on me.material_id=m.id and ifnull(me.delete_flag,'0') !='1' @@ -175,7 +175,11 @@ and me.bar_code= #{barCode} - and ser.is_sell = '0' + and (ser.is_sell = '0' + + or ser.out_bill_no = #{number} + + ) and ifnull(ser.delete_flag,'0') !='1' order by ser.id desc @@ -199,7 +203,11 @@ and me.bar_code= #{barCode} - and ser.is_sell = '0' + and (ser.is_sell = '0' + + or ser.out_bill_no = #{number} + + ) and ifnull(ser.delete_flag,'0') !='1' \ No newline at end of file