|
@@ -20,13 +20,13 @@ public interface MzZdYpYshMapper {
|
|
|
"<when test='pageSize!=null'>",
|
|
|
" top ${pageSize} ",
|
|
|
"</when>",
|
|
|
- "code,serial,name,specification,charge_amount,manufactory,mini_unit,group_no,stock_amount_virtual,drug_win,yp_type=71 ",
|
|
|
+ "code,serial,name,specification,charge_amount,manufactory,mini_unit,group_no,stock_amount_virtual,drug_win,national_code,yp_type=71 ",
|
|
|
" FROM view_mz_zd_yp_ysh WITH(NOLOCK) ",
|
|
|
"where stock_amount_virtual <![CDATA[>]]> 0 and (case when bill_code='TC' or group_no='00' then '71' else group_no end)=#{groupNo} ",
|
|
|
"<when test='commonParams!=null'>",
|
|
|
" and (py_code like #{commonParams} collate Chinese_PRC_CI_AS or d_code like #{commonParams} collate Chinese_PRC_CI_AS or code like #{commonParams} collate Chinese_PRC_CI_AS or name like #{commonParams} collate Chinese_PRC_CI_AS or class_code like #{commonParams} collate Chinese_PRC_CI_AS ) ",
|
|
|
"</when>",
|
|
|
- "GROUP BY code,serial, name,specification,charge_amount,manufactory,mini_unit,group_no,stock_amount_virtual,drug_win order by stock_amount_virtual desc",
|
|
|
+ "GROUP BY code,serial, name,specification,charge_amount,manufactory,mini_unit,group_no,stock_amount_virtual,drug_win,national_code order by stock_amount_virtual desc",
|
|
|
"</script>"})
|
|
|
List<MzZdYpYsh> selectMzZdYpYshByCommonParamsAndGroupNo(@Param("commonParams") String commonParams, @Param("groupNo") String groupNo, @Param("pageSize") Integer pageSize);
|
|
|
|
|
@@ -47,7 +47,7 @@ public interface MzZdYpYshMapper {
|
|
|
"<when test='pageSize!=null'>",
|
|
|
" top ${pageSize} ",
|
|
|
"</when>",
|
|
|
- " code=rtrim(a.charge_code),serial=rtrim(a.serial),name=rtrim(b.name),specification=b.specification,charge_amount=a.pack_retprice,manufactory=c.name,mini_unit=b.mini_unit,group_no=a.group_no,stock_amount_virtual=a.stock_amount_virtual,drug_win=1,yp_type=91 ",
|
|
|
+ " code=rtrim(a.charge_code),serial=rtrim(a.serial),name=rtrim(b.name),specification=b.specification,charge_amount=a.pack_retprice,manufactory=c.name,mini_unit=b.mini_unit,group_no=a.group_no,stock_amount_virtual=a.stock_amount_virtual,drug_win=1,national_code=b.national_code,yp_type=91 ",
|
|
|
" FROM yp_base_yf a WITH(NOLOCK) LEFT JOIN yp_zd_dict b WITH(NOLOCK) on a.charge_code = b.code and a.serial = b.serial LEFT JOIN yp_zd_manufactory c on a.charge_code = c.code ",
|
|
|
"where a.visible_flag_mz=0 and a.stock_amount_virtual <![CDATA[>]]> 0 and a.group_no ='91' ",
|
|
|
"<when test='commonParams!=null'>",
|
|
@@ -70,7 +70,7 @@ public interface MzZdYpYshMapper {
|
|
|
"<when test='pageSize!=null'>",
|
|
|
" top ${pageSize} ",
|
|
|
"</when>",
|
|
|
- " code=rtrim(code),serial,name,specification,charge_amount,manufactory=yb_comment,mini_unit,group_no,stock_amount_virtual,drug_win,yp_type=111 ",
|
|
|
+ " code=rtrim(code),serial,name,specification,charge_amount,manufactory=yb_comment,mini_unit,group_no,stock_amount_virtual,drug_win,national_code,yp_type=111 ",
|
|
|
" FROM view_mz_zd_yp_dm WITH(NOLOCK) ",
|
|
|
"where stock_amount_virtual <![CDATA[>]]> 0 ",
|
|
|
"<when test='commonParams!=null'>",
|
|
@@ -94,7 +94,7 @@ public interface MzZdYpYshMapper {
|
|
|
"<when test='pageSize!=null'>",
|
|
|
" top ${pageSize} ",
|
|
|
"</when>",
|
|
|
- " code=rtrim(code),serial,name,specification,charge_amount,manufactory=yb_comment,mini_unit,group_no,stock_amount_virtual,drug_win,yp_type=131 ",
|
|
|
+ " code=rtrim(code),serial,name,specification,charge_amount,manufactory=yb_comment,mini_unit,group_no,stock_amount_virtual,drug_win,national_code,yp_type=131 ",
|
|
|
" FROM view_mz_zd_yp_dm_j2 WITH(NOLOCK) ",
|
|
|
"where stock_amount_virtual <![CDATA[>]]> 0 ",
|
|
|
"<when test='commonParams!=null'>",
|