入库审批第一次尝试

src/main/java/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.xml

@@ -50,6 +50,7 @@
         <result column="mname" property="mname" jdbcType="VARCHAR"/>
         <result column="quantity" property="quantity" jdbcType="INTEGER"/>
         <result column="mid" property="mid" jdbcType="INTEGER"/>
+        <result column="did" property="depositoryId" jdbcType="INTEGER"/>
         <result column="flagForGroup" property="flagForGroup" jdbcType="INTEGER"/>
         <result column="price" property="price" jdbcType="VARCHAR"/>
         <result column="tname" property="materialTypeName" jdbcType="VARCHAR"/>
@@ -69,6 +70,7 @@
         <result column="mdepositoryCode" property="mdepositoryCode" jdbcType="VARCHAR"/>
         <result column="airapproverPass" property="airapproverPass" jdbcType="INTEGER"/>
         <result column="airapproverTime" property="airapproverTime" jdbcType="INTEGER"/>
+        <result column="airmproducedDate" property="mproducedDate" jdbcType="INTEGER"/>
         <result column="airapproverId" property="airapproverId" jdbcType="VARCHAR"/>
         <result column="airstate" property="airstate" jdbcType="VARCHAR"/>
         <result column="airapproverMessage" property="airapproverMessage" jdbcType="VARCHAR"/>
@@ -146,7 +148,7 @@
     </sql>
 
     <sql id="ApplicationInRecordInfo">
-        airid,mname,quantity,price,tname,applicant_time,aircode,dname,applicant_id,applyRemark,mcode,mversion,munit,mtexture,mkingdeecode,mdepositoryCode,airUnit,flagForGroup,mid,airPlaceId,airapproverPass,airapproverTime,airapproverId,airstate,airapproverMessage
+        airid,did,airmproducedDate,mname,quantity,price,tname,applicant_time,aircode,dname,applicant_id,applyRemark,mcode,mversion,munit,mtexture,mkingdeecode,mdepositoryCode,airUnit,flagForGroup,mid,airPlaceId,airapproverPass,airapproverTime,airapproverId,airstate,airapproverMessage
     </sql>
 
     <sql id="ApplicationOutRecordInfo">
@@ -883,7 +885,7 @@
 
     <!--    插入一条入库记录-->
     <insert id="insertApplicationInRecord" parameterType="map" useGeneratedKeys="true" keyProperty="id">
-        insert into application_in_record (id,mid,quantity,price,applicant_id,applicant_time,depository_id,code,applyRemark,unit,flagForGroup,placeId,approverPass,approverTime,approverId,state,approverMessage)
+        insert into application_in_record (id,mid,quantity,price,applicant_id,applicant_time,depository_id,code,applyRemark,unit,flagForGroup,placeId,approverPass,approverTime,approverId,state,approverMessage,mproducedDate)
         values(
             #{id},
             #{mid},
@@ -901,7 +903,8 @@
             #{approverTime},
             #{approverId},
             #{state},
-            #{approverMessage}
+            #{approverMessage},
+            #{producedDate}
         )
     </insert>
 

src/main/java/com/dreamchaser/depository_manage/pojo/ApplicationInRecordP.java

@@ -50,6 +50,12 @@ public class ApplicationInRecordP {
     private String depositoryName;
 
 
+    /**
+     * 仓库id
+     */
+    private Integer depositoryId;
+
+
     /**
      * 提交备注
      */
@@ -132,4 +138,10 @@ public class ApplicationInRecordP {
      */
     private String airapproverMessage;
 
+
+    /**
+     * 入库时填写的生产日期
+     */
+    private Long mproducedDate;
+
 }

src/main/java/com/dreamchaser/depository_manage/service/SplitUnitService.java

@@ -16,6 +16,7 @@ public interface SplitUnitService {
 
     /**
      * 用于添加一条拆单记录
+     *
      * @param map 待添加数据
      * @return
      */
@@ -23,6 +24,7 @@ public interface SplitUnitService {
 
     /**
      * 用于添加一条拆单库存处理记录
+     *
      * @param map 待添加数据
      * @return
      */
@@ -34,6 +36,7 @@ public interface SplitUnitService {
 
     /**
      * 根据条件查询对应拆单详细信息
+     *
      * @param map 查询条件
      * @return
      */
@@ -41,6 +44,7 @@ public interface SplitUnitService {
 
     /**
      * 根据条件查询对应拆单数量
+     *
      * @param map 查询条件
      * @return
      */
@@ -48,6 +52,7 @@ public interface SplitUnitService {
 
     /**
      * 根据主键删除拆单信息（软删除）
+     *
      * @param id 待删除id
      * @return
      */
@@ -55,6 +60,7 @@ public interface SplitUnitService {
 
     /**
      * 根据主键删除拆单信息（硬删除）
+     *
      * @param id 待删除id
      * @return
      */
@@ -62,6 +68,7 @@ public interface SplitUnitService {
 
     /**
      * 根据条件修改拆单信息
+     *
      * @param map 待修改数据
      * @return
      */
@@ -70,6 +77,7 @@ public interface SplitUnitService {
 
     /**
      * 根据主键id获取拆单信息
+     *
      * @param id 待查询主键
      * @return
      */
@@ -77,6 +85,7 @@ public interface SplitUnitService {
 
     /**
      * 根据主键id获取拆单详细信息
+     *
      * @param id 待查询主键
      * @return
      */
@@ -84,6 +93,7 @@ public interface SplitUnitService {
 
     /**
      * 根据物料id查询对应的拆单记录
+     *
      * @param mid 待查询物料id
      * @return
      */
@@ -92,6 +102,7 @@ public interface SplitUnitService {
 
     /**
      * 通过物料id与拆单前的计量单位获取对应拆单记录
+     *
      * @param map 查询条件
      * @return
      */
@@ -100,6 +111,7 @@ public interface SplitUnitService {
 
     /**
      * 根据库存id获取对应拆单库存处理记录
+     *
      * @param Iid 待查询库存id
      * @return
      */
@@ -107,6 +119,7 @@ public interface SplitUnitService {
 
     /**
      * 用于计算当前拆单单位与目标拆单单位之间的进率
+     *
      * @param splitInfo         待查询拆单记录
      * @param parentSplitInfoId 目标拆单单位
      * @return
@@ -128,6 +141,7 @@ public interface SplitUnitService {
 
     /**
      * 根据库存id与拆单记录id获取对应拆单库存处理记录
+     *
      * @param Iid 待查询库存id
      * @param sid 待查询拆单id
      * @return
@@ -147,6 +161,7 @@ public interface SplitUnitService {
 
     /**
      * 根据父级查询拆单记录
+     *
      * @param parentId 待查询父级
      * @return
      */
@@ -155,8 +170,21 @@ public interface SplitUnitService {
 
     /**
      * 用于查找当前拆单是否正在使用
+     *
      * @param sid 待查询id
      * @return
      */
     boolean findAllSplitInfoForbidden(Integer sid);
+
+    /**
+     * 用于审批通过或无需审批时修改库存
+     *
+     * @param quantity                    库存数量
+     * @param splitInventory              拆单库存记录
+     * @param map                         调剂
+     * @param splitInfoForUnit            拆单记录
+     * @param placeAndMaterialByMidAndPid 物料库位对应关系
+     * @return
+     */
+    Integer realInInventoryToDepository(Double quantity, SplitInventory splitInventory, Map<String, Object> map, SplitInfo splitInfoForUnit, MaterialAndPlace placeAndMaterialByMidAndPid);
 }

src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java

@@ -134,6 +134,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
             } else {
                 producedDate = DateUtil.DateTimeByDayToTimeStamp(s.toString());
             }
+            map.put("producedDate", producedDate);
         }
         Map<String, Object> param = new HashMap<>();
         param.put("depositoryId", depositoryId);
@@ -184,6 +185,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
 
     /**
      * 用于入库申请时，更新物料库存计量
+     *
      * @param map                 入库数据
      * @param materialByCondition 当前仓库是否存在该物料
      * @param quantity            入库数量
@@ -202,8 +204,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
             mt.setProducedDate(producedDate);
             materialMapper.updateInventory(mt);
             newMid = mt.getId();
-        }
+        } else {
-        else {
             Map<String, Object> insert = new HashMap<>();
             Material materialById = materialMapper.findMaterialById(mid);
             insert.put("depositoryId", depositoryId);
@@ -692,6 +693,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
 
     /**
      * 用于入库后修改相关数据信息
+     *
      * @param map          入库数据
      * @param quantity     数量
      * @param materialById 入库物料
@@ -726,8 +728,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
             materialAndProducedDateByMidAndProducedDate.setInventory(materialAndProducedDateByMidAndProducedDate.getInventory() + quantity);
             // 修改
             materialMapper.updateMaterialAndProducedDate(materialAndProducedDateByMidAndProducedDate);
-        }
+        } else {
-        else {
             insertProducedDate.put("quantity", quantity);
             insertProducedDate.put("inventory", quantity);
             insertProducedDate.put("expendnum", 0);
@@ -743,8 +744,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
         param.put("mname", materialById.getMname());
         if (Integer.compare(placeById.getId(), 0) == 0) {
             param.put("depositoryId", map.get("depositoryId"));
-        }
+        } else {
-        else {
             param.put("depositoryId", placeById.getDid());
         }
         List<Inventory> inventory = materialMapper.findInventory(param);
@@ -761,8 +761,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
             insert.put("quantity", quantity);
             // 插入记录
             placeMapper.addMaterialOnPlace(insert);
-        }
+        } else {
-        else {
             placeAndMaterialByMidAndPid.setQuantity(placeAndMaterialByMidAndPid.getQuantity() + quantity);
             // 修改数量
             placeMapper.updateMaterialAndPlace(placeAndMaterialByMidAndPid);
@@ -2045,6 +2044,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
 
     /**
      * 用于企业微信的物料入库审批处理
+     *
      * @param mainId               需要进行审批的单号
      * @param approvalInfo_details 审批详情
      * @param userAgent            加密后的user-agent
@@ -2065,11 +2065,16 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
         Map<String, Object> map = new HashMap<>();
         map.put("approverId", userByPort.getId());
         map.put("approverTime", System.currentTimeMillis());
-        if ("2".equals(spStatus)) {
+
         // 如果同意
-            map.put("approverPass",1);
         for (String sid : split
         ) {
+            if ("2".equals(spStatus)) {
+                map.put("approverPass", 1);
+            } else {
+                // 如果驳回
+                map.put("approverPass", 2);
+            }
             if (!"".equals(sid)) {
                 Integer id = ObjectFormatUtil.toInteger(sid);
                 // 获取具体入库订单
@@ -2078,17 +2083,84 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
                 Material materialById = materialMapper.findMaterialById(recordP.getMid());
                 if (materialById.getUnit().equals(recordP.getAirUnit())) {
                     // 如果是基础单位
+
+
+                    Map<String, Object> param = new HashMap<>();
+                    param.put("depositoryId", recordP.getDepositoryId());
+                    param.put("mcode", materialById.getCode());
+                    // 判断该仓库中有无该物物料
+                    List<Inventory> materialByCondition = materialMapper.findInventory(param);
+
+                    // 用于调用入库方法而创建的
                     Map<String, Object> paramForUpdateInventory = new HashMap<>();
-//                        paramForUpdateInventory.put("")
+                    paramForUpdateInventory.put("mid", recordP.getMid());
-//                        updateOrInsertInventory()
+                    paramForUpdateInventory.put("quantity", recordP.getQuantity());
+
+
+                    // 修改仓库库存
+                    Long mproducedDate = recordP.getMproducedDate();
+                    if (mproducedDate == null) {
+                        mproducedDate = 0L;
+                    }
+                    Integer newMid = updateOrInsertInventory(paramForUpdateInventory, materialByCondition, (double) recordP.getQuantity(), materialById.getId(), recordP.getDepositoryId(), mproducedDate);
+                    // 修改库位库存
+                    paramForUpdateInventory.put("newInMid", newMid);
+                    paramForUpdateInventory.put("id", recordP.getId());
+                    paramForUpdateInventory.put("producedDate", recordP.getMproducedDate());
+                    paramForUpdateInventory.put("depositoryId", recordP.getDepositoryId());
+                    Place placeById = placeMapper.findPlaceById(recordP.getPlaceId());
+                    updateInventoryInfoForApproval(paramForUpdateInventory, recordP.getQuantity(), materialById, placeById);
                 } else {
                     // 如果是拆单单位
+
+                    // 查询拆单记录
+                    Map<String, Object> paramForSplitInfo = new HashMap<>();
+                    paramForSplitInfo.put("newUnit", recordP.getAirUnit());
+                    paramForSplitInfo.put("mid", recordP.getMid());
+                    // 查询当前拆单是否存在
+                    SplitInfo splitInfoForUnit = splitUnitMapper.findSplitInfoByMidAndUnit(paramForSplitInfo);
+                    if (splitInfoForUnit != null) {
+                        // 如果该拆单记录存在
+                        // 定义库存拆单记录
+                        SplitInventory splitInventory = null;
+                        // 定义对应的库存记录
+                        Inventory inventory = null;
+
+                        // 定义对应库存所在库位
+                        MaterialAndPlace placeAndMaterialByMidAndPid = null;
+                        // 用于存储拆单库存处理操作的数据
+                        Map<String, Object> paramForInsertSplitInventory = new HashMap<>();
+
+                        Map<String, Object> paramForInventory = new HashMap<>();
+                        paramForInventory.put("depositoryId", recordP.getDepositoryId());
+                        paramForInventory.put("mid", recordP.getMid());
+                        // 判断该仓库中有无该物物料
+                        List<Inventory> inventoryList = materialMapper.findInventory(paramForInventory);
+
+                        if (inventoryList.size() > 0) {
+                            inventory = inventoryList.get(0);
+
+                            // 用于查找该库存对应库位
+                            Map<String, Object> paramForInventoryToPlace = new HashMap<>();
+                            paramForInventoryToPlace.put("pid", recordP.getPlaceId());
+                            paramForInventoryToPlace.put("mid", inventory.getId());
+
+                            placeAndMaterialByMidAndPid = placeMapper.findPlaceAndMaterialByMidAndPid(paramForInventoryToPlace);
+                            if (placeAndMaterialByMidAndPid != null) {
+                                paramForInsertSplitInventory.put("iid", placeAndMaterialByMidAndPid.getId());
+
+                                // 查询当前库存是否有该拆单的处理记录
+                                splitInventory = splitUnitMapper.findSplitInventoryByIidAndSid(paramForInsertSplitInventory);
                             }
                         }
+
+                        splitUnitService.realInInventoryToDepository((double) recordP.getQuantity(), splitInventory, map, splitInfoForUnit, placeAndMaterialByMidAndPid);
+
                     }
-        }else{
+                }
-            // 如果驳回
+            }
-            map.put("approverPass",2);
+            map.put("id", sid);
+            depositoryRecordMapper.updateApplicationInRecord(map);
         }
     }
 
@@ -2407,8 +2479,6 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
                 }
 
 
-
-
                 // 开启流程通知其他人忽略审批流程
                 new Thread(new Runnable() {
                     @Override
@@ -3609,8 +3679,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
                 Material materialById = materialMapper.findMaterialById(mid);
                 if (materialById.getPrice() != null) {
                     sum += (materialById.getPrice() / 100) * recordMin.getQuantity();
-                }
+                } else {
-                else{
                     sum += 0;
                 }
             }

src/main/java/com/dreamchaser/depository_manage/service/impl/SplitUnitServiceImpl.java

@@ -101,8 +101,6 @@ public class SplitUnitServiceImpl implements SplitUnitService {
         Integer result = 0;
 
         if (splitInfoForUnit != null) {
-            // 获取当前进制
-            Integer scale = splitInfoForUnit.getQuantity();
 
             // 获取当前处理的类型
             String type = (String) map.get("type");
@@ -182,7 +180,16 @@ public class SplitUnitServiceImpl implements SplitUnitService {
     }
 
 
-    Integer realInInventoryToDepository(Double quantity, SplitInventory splitInventory, Map<String, Object> map, SplitInfo splitInfoForUnit, MaterialAndPlace placeAndMaterialByMidAndPid) {
+    /**
+     * 用于审批通过或无需审批时修改库存
+     * @param quantity 库存数量
+     * @param splitInventory 拆单库存记录
+     * @param map 调剂
+     * @param splitInfoForUnit 拆单记录
+     * @param placeAndMaterialByMidAndPid 物料库位对应关系
+     * @return
+     */
+    public Integer realInInventoryToDepository(Double quantity, SplitInventory splitInventory, Map<String, Object> map, SplitInfo splitInfoForUnit, MaterialAndPlace placeAndMaterialByMidAndPid) {
         Integer result = 0;
 
         // 获取当前进制

target/classes/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.xml

@@ -50,6 +50,7 @@
         <result column="mname" property="mname" jdbcType="VARCHAR"/>
         <result column="quantity" property="quantity" jdbcType="INTEGER"/>
         <result column="mid" property="mid" jdbcType="INTEGER"/>
+        <result column="did" property="depositoryId" jdbcType="INTEGER"/>
         <result column="flagForGroup" property="flagForGroup" jdbcType="INTEGER"/>
         <result column="price" property="price" jdbcType="VARCHAR"/>
         <result column="tname" property="materialTypeName" jdbcType="VARCHAR"/>
@@ -69,6 +70,7 @@
         <result column="mdepositoryCode" property="mdepositoryCode" jdbcType="VARCHAR"/>
         <result column="airapproverPass" property="airapproverPass" jdbcType="INTEGER"/>
         <result column="airapproverTime" property="airapproverTime" jdbcType="INTEGER"/>
+        <result column="airmproducedDate" property="mproducedDate" jdbcType="INTEGER"/>
         <result column="airapproverId" property="airapproverId" jdbcType="VARCHAR"/>
         <result column="airstate" property="airstate" jdbcType="VARCHAR"/>
         <result column="airapproverMessage" property="airapproverMessage" jdbcType="VARCHAR"/>
@@ -146,7 +148,7 @@
     </sql>
 
     <sql id="ApplicationInRecordInfo">
-        airid,mname,quantity,price,tname,applicant_time,aircode,dname,applicant_id,applyRemark,mcode,mversion,munit,mtexture,mkingdeecode,mdepositoryCode,airUnit,flagForGroup,mid,airPlaceId,airapproverPass,airapproverTime,airapproverId,airstate,airapproverMessage
+        airid,did,airmproducedDate,mname,quantity,price,tname,applicant_time,aircode,dname,applicant_id,applyRemark,mcode,mversion,munit,mtexture,mkingdeecode,mdepositoryCode,airUnit,flagForGroup,mid,airPlaceId,airapproverPass,airapproverTime,airapproverId,airstate,airapproverMessage
     </sql>
 
     <sql id="ApplicationOutRecordInfo">
@@ -883,7 +885,7 @@
 
     <!--    插入一条入库记录-->
     <insert id="insertApplicationInRecord" parameterType="map" useGeneratedKeys="true" keyProperty="id">
-        insert into application_in_record (id,mid,quantity,price,applicant_id,applicant_time,depository_id,code,applyRemark,unit,flagForGroup,placeId,approverPass,approverTime,approverId,state,approverMessage)
+        insert into application_in_record (id,mid,quantity,price,applicant_id,applicant_time,depository_id,code,applyRemark,unit,flagForGroup,placeId,approverPass,approverTime,approverId,state,approverMessage,mproducedDate)
         values(
             #{id},
             #{mid},
@@ -901,7 +903,8 @@
             #{approverTime},
             #{approverId},
             #{state},
-            #{approverMessage}
+            #{approverMessage},
+            #{producedDate}
         )
     </insert>