在删除和修改出库的时候要同步修改

pom.xml

@@ -10,7 +10,7 @@
     </parent>
     <groupId>thyyxxk</groupId>
     <artifactId>web-server</artifactId>
-    <version>8.6</version>
+    <version>9.0</version>
     <name>web-server</name>
     <description>server for yibao-web</description>
 

src/main/java/thyyxxk/webserver/dao/his/datamodify/InOrOutOfWarehouseDao.java

@@ -78,7 +78,7 @@ public interface InOrOutOfWarehouseDao {
      * @return 返回分页的数据
      */
     @Select("<script>" +
-            "select charge_code,out_seri,draw_no,in_draw_no,in_date,group_no,group_no_out,dept_code,out_date,confirm_date," +
+            "select charge_code,out_seri,out_seri old_out_seri,draw_no,draw_no old_draw_no,in_draw_no,in_date,group_no,group_no_out,dept_code,out_date,confirm_date," +
             "out_amt,manu_no,  " +
             "dept_code_name = (select name from zd_unit_code where code = dept_code),  " +
             "group_no_name = (select group_name from  yp_zd_group_name where group_no = yp_out_detl.group_no) ," +
@@ -129,9 +129,16 @@ public interface InOrOutOfWarehouseDao {
             "group_no_out=#{groupNoOut},dept_code=#{deptCode},out_date=#{outDate},   " +
             "sys_date=#{outDate},   " +
             "confirm_date=#{confirmDate}   " +
-            "where out_seri=#{outSeri} and draw_no=#{oldDrawNo} and charge_code = #{chargeCode}")
+            "where out_seri=#{oldOutSeri} and draw_no=#{oldDrawNo} and charge_code = #{chargeCode}")
     void xiuGaiChuKu(YpOutDetl param);
 
+
+    @Update("update yp_in_detl_yf set " +
+            "manu_no=#{manuNo},buy_amt = #{outAmt},group_no=#{groupNo} " +
+            "where charge_code = #{chargeCode} and out_draw_no = #{oldDrawNo} and in_seri = #{oldOutSeri}")
+    void xiuGaiYaoFangRuKuXinXi(YpOutDetl param);
+
+
     /**
      * 删除出库的一条记录
      *
@@ -151,5 +158,10 @@ public interface InOrOutOfWarehouseDao {
                             @Param("outSeri") Integer outSeri,
                             @Param("inDrawNo") String inDrawNo);
 
+    @Delete("delete from yp_in_detl_yf  where out_draw_no=#{outDrawNo} and charge_code=#{chargeCode} and in_seri=#{inSeri}")
+    Integer shanChuYaoFangShuJu(@Param("outDrawNo") String outDrawNo,
+                                @Param("chargeCode") String chargeCode,
+                                @Param("inSeri") Integer inSeri);
+
 
 }

src/main/java/thyyxxk/webserver/entity/datamodify/YpOutDetl.java

@@ -15,6 +15,7 @@ public class YpOutDetl implements Serializable {
     private String groupNoName;
     private String groupNoOutName;
     private String oldDrawNo;
+    private String oldOutSeri;
 
     /**
      * outDate

src/main/java/thyyxxk/webserver/service/datamodify/InOrOutOfWarehouseService.java

@@ -88,16 +88,16 @@ public class InOrOutOfWarehouseService {
         log.info("修改入库信息：{},修改人：{}", param, TokenUtil.getTokenUserId());
         return ResultVoUtil.success(ExceptionEnum.SUCCESS_AND_NOTIFICATION, "修改成功");
     }
-    /* 出库的信息*/
+
+    /* 出库的信息 */
 
     /**
-     * 根据入库单号 或者 入库时间 来查询数据
+     * 根据条件查询出库单号
      *
      * @param param currentPage pageSize startTime endTime drawNo：出库单号
      * @return 返回分页的数据
      */
     public ResultVo<Map<String, Object>> queryChuKuXinXi(InOrOutOfWarehousePojo param) {
-        log.info("查询出库信息：{}", param);
         IPage<InOrOutOfWarehousePojo> page = new Page<>(param.getCurrentPage(), param.getPageSize());
         List<YpOutDetl> list = dao.queryChuKuXinXi(page, param);
         if (list.size() <= 0) {
@@ -130,7 +130,8 @@ public class InOrOutOfWarehouseService {
     public ResultVo<String> xiuGaiChuKuXinXi(YpOutDetl param) {
         log.info("修改出库信息：{},修改人：{}", param, TokenUtil.getTokenUserId());
         dao.xiuGaiChuKu(param);
-        return ResultVoUtil.success(ExceptionEnum.SUCCESS_AND_NOTIFICATION, "修改成功");
+        dao.xiuGaiYaoFangRuKuXinXi(param);
+        return ResultVoUtil.success(ExceptionEnum.SUCCESS_AND_NOTIFICATION, "修改成功。");
     }
 
     /**
@@ -145,7 +146,10 @@ public class InOrOutOfWarehouseService {
     public ResultVo<String> shanChuChuKuXinXi(String drawNo, String chargeCode, Integer outSeri, String inDrawNo) {
         log.info("删除出库信息：操作人：{}，出库号：{}，药品编码：{}，序号：{}，入库单号：{}", TokenUtil.getTokenUserId(), drawNo, chargeCode, outSeri, inDrawNo);
         dao.shanChuChuKuXinXin(drawNo, chargeCode, outSeri, inDrawNo);
+        if (dao.shanChuYaoFangShuJu(drawNo, chargeCode, outSeri) == 0) {
+            log.info("出库信息删除成功，但药房药品入库没有删除成功");
+            return ResultVoUtil.success(ExceptionEnum.SUCCESS_AND_NOTIFICATION, "出库单删除成功，但药房药品入库没有删除成功<br />原因：【系统找不到对应的信息】。");
+        }
         return ResultVoUtil.success(ExceptionEnum.SUCCESS_AND_NOTIFICATION, "删除成功。");
-
     }
 }