From 48b09084bfafcaf29cfa12a1db92e0495ab907a9 Mon Sep 17 00:00:00 2001 From: erdanergou Date: Mon, 10 Apr 2023 10:16:40 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=BA=E7=89=A9=E6=96=99=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E6=93=8D=E4=BD=9C=E4=BA=BA=E5=91=98=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/MaterialController.java | 16 ++++++- .../mapper/MaterialMapper.xml | 9 ++-- .../service/DepositoryRecordService.java | 8 +--- .../impl/DepositoryRecordServiceImpl.java | 48 ------------------- .../service/impl/ExcelServiceImpl.java | 1 + .../mapper/MaterialMapper.xml | 9 ++-- 6 files changed, 28 insertions(+), 63 deletions(-) diff --git a/src/main/java/com/dreamchaser/depository_manage/controller/MaterialController.java b/src/main/java/com/dreamchaser/depository_manage/controller/MaterialController.java index bc69567b..90499d45 100644 --- a/src/main/java/com/dreamchaser/depository_manage/controller/MaterialController.java +++ b/src/main/java/com/dreamchaser/depository_manage/controller/MaterialController.java @@ -257,7 +257,13 @@ public class MaterialController { * @return */ @PostMapping("/material_add") - public RestResponse materialAdd(@RequestBody Map map) { + public RestResponse materialAdd(@RequestBody Map map,HttpServletRequest request) { + String token = request.getHeader("user-token"); + if (token == null) { + token = (String) request.getSession().getAttribute("userToken"); + } + UserByPort userToken = AuthenticationTokenPool.getUserToken(token); + map.put("uid",userToken.getId()); return CrudUtil.insertHandle(materialService.insertMaterial(map), 1); } @@ -287,7 +293,13 @@ public class MaterialController { * @return */ @PostMapping("/material_edit") - public RestResponse updateDepository(@RequestBody Map map) { + public RestResponse updateDepository(@RequestBody Map map,HttpServletRequest request) { + String token = request.getHeader("user-token"); + if (token == null) { + token = (String) request.getSession().getAttribute("userToken"); + } + UserByPort userToken = AuthenticationTokenPool.getUserToken(token); + map.put("uid",userToken.getId()); if (map.containsKey("state")) { map.put("state", 1); } else { diff --git a/src/main/java/com/dreamchaser/depository_manage/mapper/MaterialMapper.xml b/src/main/java/com/dreamchaser/depository_manage/mapper/MaterialMapper.xml index 3a317fc3..ed4b6836 100644 --- a/src/main/java/com/dreamchaser/depository_manage/mapper/MaterialMapper.xml +++ b/src/main/java/com/dreamchaser/depository_manage/mapper/MaterialMapper.xml @@ -761,7 +761,7 @@ INSERT INTO material ( id, depository_id, mname, quantity, price, - type_id,code,unit,version,texture,amounts,depositoryCode,producedDate,shelfLife,brand,productionPlace,remark + type_id,code,unit,version,texture,amounts,depositoryCode,producedDate,shelfLife,brand,productionPlace,remark,uid ) VALUES ( #{id}, @@ -804,7 +804,8 @@ #{shelfLife}, #{brand}, #{productionPlace}, - #{remark} + #{remark}, + #{uid} ) @@ -938,6 +939,9 @@ depository_id = #{depositoryId}, + + uid = #{uid}, + mname = #{mname}, @@ -986,7 +990,6 @@ brand = #{brand}, - remark = #{remark} diff --git a/src/main/java/com/dreamchaser/depository_manage/service/DepositoryRecordService.java b/src/main/java/com/dreamchaser/depository_manage/service/DepositoryRecordService.java index 8d7e77cf..f78929aa 100644 --- a/src/main/java/com/dreamchaser/depository_manage/service/DepositoryRecordService.java +++ b/src/main/java/com/dreamchaser/depository_manage/service/DepositoryRecordService.java @@ -445,13 +445,7 @@ public interface DepositoryRecordService { */ String createCode(String depositoryName, String key, String type, String mainDeparmentName); - /** - * 将刚入库的记录删除 - * - * @param map - * @return - */ - Integer deleteApplicaionInPlace(Map map); + /** diff --git a/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java b/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java index 25d88236..ab2ce15f 100644 --- a/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java +++ b/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java @@ -872,54 +872,6 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { return placeMapper.UpdatePlace(placeById); } - /** - * 将刚入库的记录删除 - * - * @param map - * @return - */ - @Override - public Integer deleteApplicaionInPlace(Map map) { - String code = map.get("code").toString(); - Integer quantity = ObjectFormatUtil.toInteger(map.get("quantity")); - Integer mid = ObjectFormatUtil.toInteger(map.get("mid")); - Integer depositoryId = ObjectFormatUtil.toInteger(map.get("depositoryId")); - // 获取材料基本信息 - Material materialById = materialMapper.findMaterialById(mid); - Object oldPrice1 = map.get("oldPrice"); - Double oldPrice = 0.0; - if (oldPrice1 != null) { - oldPrice = Double.parseDouble(oldPrice1.toString()); - } - Double price = Double.parseDouble(map.get("price").toString()); - Integer id = ObjectFormatUtil.toInteger(map.get("id")); - String deleteType = map.get("delete").toString(); - Map params = new HashMap<>(); - params.put("code", materialById.getCode()); - params.put("depositoryId", depositoryId); - List materialByCondition = materialMapper.findMaterialByCondition(params); - if (materialByCondition.size() < 1) { - throw new MyException("出现未知错误，联系开发人员"); - } - if ("in".equals(deleteType)) { - // 删除入库记录 - depositoryRecordMapper.deleteApplicationInRecordById(id); - // 将库存还原 - Material material = materialByCondition.get(0); - Map update = new HashMap<>(); - update.put("quantity", material.getQuantity() - quantity * 100); - update.put("price", oldPrice); - update.put("amounts", material.getAmounts() - quantity * price); - update.put("id", material.getId()); - return materialMapper.updateMaterial(update); - - } else if ("out".equals(deleteType)) { - return null; - } else { - throw new MyException("请求参数错误"); - } - - } /** * 插入一条出库子订单 diff --git a/src/main/java/com/dreamchaser/depository_manage/service/impl/ExcelServiceImpl.java b/src/main/java/com/dreamchaser/depository_manage/service/impl/ExcelServiceImpl.java index 140f2f91..594efdac 100644 --- a/src/main/java/com/dreamchaser/depository_manage/service/impl/ExcelServiceImpl.java +++ b/src/main/java/com/dreamchaser/depository_manage/service/impl/ExcelServiceImpl.java @@ -759,6 +759,7 @@ public class ExcelServiceImpl implements ExcelService { param.put("id", excelVo.getId()); param.put("brand", excelVo.getBrand()); param.put("price", excelVo.getPrice() == null ? "0" : excelVo.getPrice()); + param.put("uid",userByPort.getId()); materialService.insertMaterial(param); success.add(excelVo); if ((i + 1) % 100 == 0 || excelVosForMaterial.size() - 1 == i) { diff --git a/target/classes/com/dreamchaser/depository_manage/mapper/MaterialMapper.xml b/target/classes/com/dreamchaser/depository_manage/mapper/MaterialMapper.xml index 3a317fc3..ed4b6836 100644 --- a/target/classes/com/dreamchaser/depository_manage/mapper/MaterialMapper.xml +++ b/target/classes/com/dreamchaser/depository_manage/mapper/MaterialMapper.xml @@ -761,7 +761,7 @@ INSERT INTO material ( id, depository_id, mname, quantity, price, - type_id,code,unit,version,texture,amounts,depositoryCode,producedDate,shelfLife,brand,productionPlace,remark + type_id,code,unit,version,texture,amounts,depositoryCode,producedDate,shelfLife,brand,productionPlace,remark,uid ) VALUES ( #{id}, @@ -804,7 +804,8 @@ #{shelfLife}, #{brand}, #{productionPlace}, - #{remark} + #{remark}, + #{uid} ) @@ -938,6 +939,9 @@ depository_id = #{depositoryId}, + + uid = #{uid}, + mname = #{mname}, @@ -986,7 +990,6 @@ brand = #{brand}, - remark = #{remark}