出库添加两个修改的字段。

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

@@ -29,7 +29,10 @@ public interface InOrOutOfWarehouseDao {
             "purchaser_name = (select  name from a_employee_mi where code = purchaser)," +
             "charge_code_name = (select name from yp_zd_dict where isnull(del_flag,0) = 0 " +
             "and serial = yp_in_detl.serial  and code = charge_code),* " +
-            "from yp_in_detl where in_date >= #{param.startTime} and in_date<=#{param.endTime} " +
+            "from yp_in_detl where 1=1 " +
+            "<if test=\"param.startTime!=null and param.startTime!=''\">" +
+            "and in_date &gt;= #{param.startTime} and in_date&lt;=#{param.endTime} " +
+            "</if>" +
             "<if test=\"param.inDocuNo!=null and param.inDocuNo!=''\">" +
             "and in_docu_no=#{param.inDocuNo}" +
             "</if>" +
@@ -52,13 +55,17 @@ public interface InOrOutOfWarehouseDao {
 
 
     @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,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) ," +
             "group_no_out_name = (select group_name from  yp_zd_group_name where group_no = yp_out_detl.group_no) ," +
             "charge_code_name = (select name from yp_zd_dict where  " +
             "code = charge_code and serial = yp_out_detl.serial)  " +
-            "from yp_out_detl where out_date &gt;= #{param.startTime} and out_date&lt;=#{param.endTime} " +
+            "from yp_out_detl where 1=1 " +
+            "<if test=\"param.startTime!=null and param.startTime!=''\">" +
+            "and out_date &gt;= #{param.startTime} and out_date&lt;=#{param.endTime} " +
+            "</if>" +
             "<if test=\"param.drawNo!=null and param.drawNo!=''\">" +
             "and draw_no=#{param.drawNo}" +
             "</if>" +
@@ -73,7 +80,9 @@ public interface InOrOutOfWarehouseDao {
     List<GetDropdownBox> queryGroupNo();
 
     @Update("update yp_out_detl set draw_no=#{drawNo},out_seri=#{outSeri},in_draw_no=#{inDrawNo},   " +
-            "in_date=#{inDate},group_no=#{groupNo},group_no_out=#{groupNoOut},dept_code=#{deptCode},out_date=#{outDate},   " +
+            "in_date=#{inDate},group_no=#{groupNo}," +
+            "out_amt=#{outAmt},manu_no=#{manuNo}," +
+            "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}")

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

@@ -76,6 +76,7 @@ public class InOrOutOfWarehouseService {
         log.info("查询出库数据：{}", param);
         IPage<InOrOutOfWarehousePojo> page = new Page<>(param.getCurrentPage(), param.getPageSize());
         List<YpOutDetl> list = dao.queryChuKuXinXi(page, param);
+        System.out.println(list);
         if (list.size() > 0) {
             Map<String, Object> map = new HashMap<>(Capacity.TWO);
             map.put("data", list);
@@ -95,6 +96,6 @@ public class InOrOutOfWarehouseService {
     public ResultVo<String> xiuGaiChuKuXinXi(YpOutDetl param) {
         log.info("修改出库信息：{},修改人：{}", param, TokenUtil.getTokenUserId());
         dao.xiuGaiChuKu(param);
-        return ResultVoUtil.success("修改成功");
+        return ResultVoUtil.success(ExceptionEnum.SUCCESS_AND_NOTIFICATION, "修改成功");
     }
 }