Merge branch 'master' into 'master'

追溯码销售上传增加结算id查询

See merge request lighter/web-server!158

src/main/java/thyyxxk/webserver/dao/his/medicine/YpSelinfoSoldDao.java

@@ -71,6 +71,9 @@ public interface YpSelinfoSoldDao extends BaseMapper<YpSelinfoSold> {
             " <if test=\"dto.chargeCode != null and dto.chargeCode != ''\"> " +
             " and so.charge_code = #{dto.chargeCode} " +
             " </if> " +
+            " <if test=\"dto.setlId != null and dto.setlId != ''\"> " +
+            " and so.setl_id = #{dto.setlId} " +
+            " </if> " +
             " <if test=\"dto.uploadFlag != null and dto.uploadFlag != ''\"> " +
             " and so.upload_flag = #{dto.uploadFlag} " +
             " </if> " +
@@ -90,6 +93,9 @@ public interface YpSelinfoSoldDao extends BaseMapper<YpSelinfoSold> {
             " <if test=\"dto.chargeCode != null and dto.chargeCode != ''\"> " +
             " and bo.charge_code = #{dto.chargeCode} " +
             " </if> " +
+            " <if test=\"dto.setlId != null and dto.setlId != ''\"> " +
+            " and bo.setl_id = #{dto.setlId} " +
+            " </if> " +
             " <if test=\"dto.uploadFlag != null and dto.uploadFlag != ''\"> " +
             " and bo.upload_flag = #{dto.uploadFlag} " +
             " </if> " +

src/main/java/thyyxxk/webserver/dao/his/medicine/YpTracCodgDao.java

@@ -132,6 +132,9 @@ public interface YpTracCodgDao {
             " <if test=\"dto.chargeCode != null and dto.chargeCode != ''\"> " +
             " and fy.charge_item_code = #{dto.chargeCode} " +
             " </if> " +
+            " <if test=\"dto.setlId != null and dto.setlId != ''\"> " +
+            " and si.setl_id = #{dto.setlId} " +
+            " </if> " +
             " order by fy.charge_date " +
             "</script>")
     List<YpSelinfoSold> selectYpSelinfoSoldDetailByXyf(@Param("dto") YpCodgUpload dto);
@@ -157,6 +160,9 @@ public interface YpTracCodgDao {
             " <if test=\"dto.chargeCode != null and dto.chargeCode != ''\"> " +
             " and so.charge_code = #{dto.chargeCode} " +
             " </if> " +
+            " <if test=\"dto.setlId != null and dto.setlId != ''\"> " +
+            " and so.setl_id = #{dto.setlId} " +
+            " </if> " +
             " order by fy.confirm_time " +
             "</script>")
     List<YpSelinfoSold> selectYpSelinfoSoldThDetailByXyf(@Param("dto") YpCodgUpload dto);

src/main/java/thyyxxk/webserver/entity/medicine/YpCodgUpload.java

@@ -20,6 +20,7 @@ public class YpCodgUpload {
     private String patNo;
     private String chargeCode;
     private String groupNo;
+    // 3：销售数据； 4：销售退货数据
     private String type;
     private String fixmedinsBchno;
     private String invDataType;
@@ -28,7 +29,8 @@ public class YpCodgUpload {
      * 101: 调拨入库  102: 调拨出库   103: 盘盈  104: 盘损  105: 销毁  106: 其他入库  107: 其他出库
      */
     private String invChgType;
-
+    // 结算id
+    private String setlId;
     private String times;
     private String receiptNo;
     private String orderNo;

src/main/java/thyyxxk/webserver/service/medicine/YpSelinfoSoldService.java

@@ -56,8 +56,10 @@ public class YpSelinfoSoldService {
     public ResultVo<List<YpSelinfoSold>> selectYpSelinfoResult(YpCodgUpload dto) {
         List<YpSelinfoSold> purcinfoList;
         if("3".equals(dto.getType())){
+            // 销售上传数据
             purcinfoList = dao.selectYpSelinfoSoldResult(dto);
         } else {
+            // 销售退货上传数据
             purcinfoList = dao.selectYpSelinfoSoldTkResult(dto);
         }
         return ResultVoUtil.success(purcinfoList);

src/main/java/thyyxxk/webserver/service/medicine/YpTracCodgService.java

@@ -417,8 +417,10 @@ public class YpTracCodgService {
         List<YpSelinfoSold> selinfoList = new ArrayList<>();
         if(YpDictConstant.MZ_XYF_NO.equals(dto.getGroupNo())){
             if("3".equals(dto.getType())){
+                // 销售待上传数据
                 selinfoList = dao.selectYpSelinfoSoldDetailByXyf(dto);
             } else if("4".equals(dto.getType())){
+                // 销售退货待上传数据
                 selinfoList = dao.selectYpSelinfoSoldThDetailByXyf(dto);
             }
         }