From 9e12f2d8980173ac3661140cdcfdc7bf8246855a Mon Sep 17 00:00:00 2001
From: hy2250089 <hy2250089@qq.com>
Date: Wed, 8 Jan 2020 14:51:21 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E6=96=99=E7=AE=A1=E7=90=86=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95=E4=BF=AE=E6=94=B92=EF=BC=9A=E6=8C=89=E7=85=A7?=
 =?UTF-8?q?=E6=97=A5=E6=9C=9F=E9=99=8D=E5=BA=8F=E6=9F=A5=E8=AF=A2=E3=80=81?=
 =?UTF-8?q?=E7=BC=96=E5=86=99=E5=88=A0=E9=99=A4=E7=89=A9=E6=96=99=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dao/MaterialsOutgoingLogMapper.java       |  2 +-
 .../manage/mapper/MaterialsInfoMapper.xml     |  4 ++--
 .../mapper/MaterialsOutgoingLogMapper.xml     | 11 +++++----
 .../manage/service/MaterialsInfoService.java  |  3 ++-
 .../service/MaterialsOutgoingLogService.java  |  2 +-
 .../impl/MaterialsInfoServiceImpl.java        | 11 +++++----
 .../impl/MaterialsOutgoingLogServiceImpl.java | 23 +++++++++++--------
 .../manage/web/MaterialsInfoController.java   |  8 +------
 .../web/MaterialsOutgoingLogController.java   |  4 ----
 9 files changed, 33 insertions(+), 35 deletions(-)

diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/dao/MaterialsOutgoingLogMapper.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/dao/MaterialsOutgoingLogMapper.java
index c7a64cb..48bf572 100644
--- a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/dao/MaterialsOutgoingLogMapper.java
+++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/dao/MaterialsOutgoingLogMapper.java
@@ -12,6 +12,6 @@ import java.util.List;
 public interface MaterialsOutgoingLogMapper extends Mapper<MaterialsOutgoingLog> {
     List<MaterialsOutgoingLogVo> findListByOneMaterial(MaterialsOutgoingLogParams params);
 
-    void deleteByOutgoingIds(List<Integer> ids);
+    void deleteByOutgoingIds(HashMap outgoingParam);
 
 }
\ No newline at end of file
diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/MaterialsInfoMapper.xml b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/MaterialsInfoMapper.xml
index c562421..546e98f 100644
--- a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/MaterialsInfoMapper.xml
+++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/MaterialsInfoMapper.xml
@@ -78,7 +78,7 @@
             <if test="companyId != null">
                 AND com.company_id = #{companyId}
             </if>
-        </where> order by materials.create_time DESC
+        </where> ORDER BY materials.create_time DESC
     </select>
 
     <select id="findDetailById" parameterType="com.deer.wms.produce.manage.model.MaterialsInfoParams"  resultMap="MatInfoDTOResultMap">
@@ -133,7 +133,7 @@
                 OR  materialsInfo.specification LIKE CONCAT('%', #{keywords}, '%')
                 OR  materialsInfo.unit_id LIKE CONCAT('%', #{keywords}, '%')
             </if>
-        </where>
+        </where> ORDER BY materialsInfo.create_time  
 
     </select>
 </mapper>
\ No newline at end of file
diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/MaterialsOutgoingLogMapper.xml b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/MaterialsOutgoingLogMapper.xml
index 3ff18fa..a73bfa1 100644
--- a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/MaterialsOutgoingLogMapper.xml
+++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/MaterialsOutgoingLogMapper.xml
@@ -50,11 +50,12 @@
         </where> ORDER BY outgoing.create_time DESC
     </select>
 
-    <delete id="deleteByOutgoingIds"  parameterType = "java.util.List">
-        DELETE FROM mt_alone_materials_outgoing_log WHERE id IN
-        <foreach collection="list" item="ids" open="(" separator="," close=")">
-          #{ids}
-        </foreach>
+    <delete id="deleteByOutgoingIds"  parameterType = "java.util.HashMap">
+        DELETE FROM mt_alone_materials_outgoing_log
+            where 1>2 OR company_id=#{companyId} AND id IN
+                <foreach collection="ids" item="id" open="(" separator="," close=")">
+                  #{id}
+                </foreach>
     </delete>
 
 </mapper>
\ No newline at end of file
diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/MaterialsInfoService.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/MaterialsInfoService.java
index 144a465..02bd1bc 100644
--- a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/MaterialsInfoService.java
+++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/MaterialsInfoService.java
@@ -1,5 +1,6 @@
 package com.deer.wms.produce.manage.service;
 
+import com.deer.wms.intercept.common.data.CurrentUser;
 import com.deer.wms.produce.manage.model.MaterialsInfo;
 import com.deer.wms.produce.manage.model.MaterialsInfoDto;
 import com.deer.wms.produce.manage.model.MaterialsInfoParams;
@@ -20,5 +21,5 @@ public interface MaterialsInfoService extends Service<MaterialsInfo, Integer> {
 
     List<MaterialsInfoVO> findMaterialsByKeyWords(MaterialsInfoParams params);
 
-    void deleteRelevantById(Integer materialsId);
+    void deleteRelevantById(Integer materialsId, CurrentUser currentUser);
 }
diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/MaterialsOutgoingLogService.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/MaterialsOutgoingLogService.java
index a369cba..047031e 100644
--- a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/MaterialsOutgoingLogService.java
+++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/MaterialsOutgoingLogService.java
@@ -21,5 +21,5 @@ public interface MaterialsOutgoingLogService extends Service<MaterialsOutgoingLo
 
     void save(MaterialsOutgoingLog materialsOutgoingLog, CurrentUser currentUser);
 
-    void deleteByOutgoingIds(List<Integer> ids);
+    void deleteByOutgoingIds(HashMap outgoingParam);
 }
diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/impl/MaterialsInfoServiceImpl.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/impl/MaterialsInfoServiceImpl.java
index 0e095d7..43e8509 100644
--- a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/impl/MaterialsInfoServiceImpl.java
+++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/impl/MaterialsInfoServiceImpl.java
@@ -1,5 +1,6 @@
 package com.deer.wms.produce.manage.service.impl;
 
+import com.deer.wms.intercept.common.data.CurrentUser;
 import com.deer.wms.produce.manage.dao.MaterialsInfoMapper;
 import com.deer.wms.produce.manage.model.*;
 import com.deer.wms.produce.manage.service.MaterialsInfoService;
@@ -52,7 +53,7 @@ public class MaterialsInfoServiceImpl extends AbstractService<MaterialsInfo, Int
     }
 
     @Override
-    public void deleteRelevantById(Integer materialsId) {
+    public void deleteRelevantById(Integer materialsId, CurrentUser currentUser) {
         materialsInfoMapper.deleteByPrimaryKey(materialsId);
         MaterialsStockInfo stock = materialsStockInfoService.findBy("materialsId", materialsId);
         if(null!=stock)
@@ -61,16 +62,18 @@ public class MaterialsInfoServiceImpl extends AbstractService<MaterialsInfo, Int
         params.setMaterialsId(materialsId);
         params.setCompanyId(1);
         List<MaterialsOutgoingLogVo> materialsOutgoingLogList = materialsOutgoingLogService.findListByOneMaterial(params);
-        System.out.println("=========="+materialsOutgoingLogList.size());
+
         if((null!=materialsOutgoingLogList) && (materialsOutgoingLogList.size()!=0)){
             List<Integer> ids = new ArrayList<Integer>();
             for (MaterialsOutgoingLogVo materialsOutgoingLogVo : materialsOutgoingLogList){
                 ids.add(materialsOutgoingLogVo.getId());
             }
 
-            System.out.println("----------"+ids.size());
             if((null!=ids) && (ids.size()!=0)) {
-                materialsOutgoingLogService.deleteByOutgoingIds(ids);
+                HashMap outgoingParam = new HashMap();
+                outgoingParam.put("companyId", 1);
+                outgoingParam.put("ids", ids);
+                materialsOutgoingLogService.deleteByOutgoingIds(outgoingParam);
             }
         }
 
diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/impl/MaterialsOutgoingLogServiceImpl.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/impl/MaterialsOutgoingLogServiceImpl.java
index be73b51..a59dfa3 100644
--- a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/impl/MaterialsOutgoingLogServiceImpl.java
+++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/impl/MaterialsOutgoingLogServiceImpl.java
@@ -39,18 +39,22 @@ public class MaterialsOutgoingLogServiceImpl extends AbstractService<MaterialsOu
     public void save(MaterialsOutgoingLog materialsOutgoingLog, CurrentUser currentUser) {
         Date date = new Date();
 
-        materialsOutgoingLog.setOperatorId(1);
+        materialsOutgoingLog.setOperatorId(currentUser.getUserId());
         materialsOutgoingLog.setCreateTime(date);
-        materialsOutgoingLog.setCompanyId(1);
+        materialsOutgoingLog.setVersion("1.1");
+        materialsOutgoingLog.setStatus(ProduceManageConstant.STATUS_AVAILABLE);
+        materialsOutgoingLog.setCompanyId(currentUser.getCompanyId());
         materialsOutgoingLogMapper.insert(materialsOutgoingLog);
 
         MaterialsStockInfo stock = materialsStockInfoService.findBy("materialsId", materialsOutgoingLog.getMaterialsId());
         if(stock==null){//如果是新的物料，库存表中没有该物料信息，则新增一条库存记录
             stock = new MaterialsStockInfo();
-            stock.setOperatorId(1);
+            stock.setOperatorId(currentUser.getUserId());
+            stock.setCreateTime(date);
+            stock.setVersion("1.1");
             stock.setMaterialsId(materialsOutgoingLog.getMaterialsId());
             stock.setUnitId(materialsOutgoingLog.getUnitId());
-            stock.setCreateTime(date);
+
             if(materialsOutgoingLog.getType() == ProduceManageConstant.TYPE_OUT) {
                 stock.setQuantity(0-materialsOutgoingLog.getQuantity());//新建物料的出库仓储数量为负数
             }else if(materialsOutgoingLog.getType() == ProduceManageConstant.TYPE_IN) {
@@ -58,14 +62,13 @@ public class MaterialsOutgoingLogServiceImpl extends AbstractService<MaterialsOu
             }
 
             stock.setPositionName(materialsOutgoingLog.getPositionName());
-            stock.setCompanyId(1);
+            stock.setCompanyId(currentUser.getCompanyId());
 
             materialsStockInfoService.save(stock);
         }else{//如果库存表中有该物料信息，则更新对应的库存记录
-            stock.setCreateTime(date);//日期取最新更新的日期
             MaterialsInfoParams params = new MaterialsInfoParams();//查询条件赋值
             params.setMaterialsId(materialsOutgoingLog.getMaterialsId());
-            params.setCompanyId(1);
+            params.setCompanyId(currentUser.getCompanyId());
 
             //设置库存数量：已有库存数量+入库数量（或已有库存数量-出库数量）
             Float totalQuantity = materialsStockInfoService.getStockQuantityByMaId(params);
@@ -79,7 +82,7 @@ public class MaterialsOutgoingLogServiceImpl extends AbstractService<MaterialsOu
             //设置库存位置：已有库存仓库,出入库记录对应仓库
             String inAndOutLogPosition = materialsOutgoingLog.getPositionName();
             String stockPosition = materialsStockInfoService.getStockPositionByMaId(params);
-            if(stockPosition!=null && !stockPosition.trim().equals("")) {
+            if((null!=stockPosition) && (!stockPosition.trim().equals(""))) {
                 stock.setPositionName(stockPosition + "," +inAndOutLogPosition);
             }else{
                 stock.setPositionName(inAndOutLogPosition);
@@ -90,7 +93,7 @@ public class MaterialsOutgoingLogServiceImpl extends AbstractService<MaterialsOu
     }
 
     @Override
-    public void deleteByOutgoingIds(List<Integer> ids) {
-        materialsOutgoingLogMapper.deleteByOutgoingIds(ids);
+    public void deleteByOutgoingIds(HashMap outgoingParam) {
+        materialsOutgoingLogMapper.deleteByOutgoingIds(outgoingParam);
     }
 }
diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/MaterialsInfoController.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/MaterialsInfoController.java
index 8f2dc94..3b3740e 100644
--- a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/MaterialsInfoController.java
+++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/MaterialsInfoController.java
@@ -42,12 +42,6 @@ public class MaterialsInfoController {
     @Autowired
     private MaterialsInfoService materialsInfoService;
 
-    @Autowired
-    private MaterialsStockInfoService materialsStockInfoService;
-
-    @Autowired
-    private MaterialsOutgoingLogService materialsOutgoingLogService;
-
     /**
      * hy正在用
      * 新增物料信息
@@ -94,7 +88,7 @@ public class MaterialsInfoController {
         //    return ResultGenerator.genFailResult(CommonCode.SERVICE_ERROR,"未登录错误",null );
         //}
 
-        materialsInfoService.deleteRelevantById(materialsId);
+        materialsInfoService.deleteRelevantById(materialsId, currentUser);
         return ResultGenerator.genSuccessResult();
     }
 
diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/MaterialsOutgoingLogController.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/MaterialsOutgoingLogController.java
index d75d2fd..29e1425 100644
--- a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/MaterialsOutgoingLogController.java
+++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/MaterialsOutgoingLogController.java
@@ -35,10 +35,6 @@ public class MaterialsOutgoingLogController {
     @Autowired
     private MaterialsOutgoingLogService materialsOutgoingLogService;
 
-    @Autowired
-    private MaterialsStockInfoService materialsStockInfoService;
-
-
     /**
      * hy正在用
      * 出入库操作，添加一条出入库记录，同时更新对应的库存信息