jiangs/transitPlatForm
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

自助开单界面,打印，作废功能

Browse Source
This commit is contained in:
jiangs 2026-03-13 15:44:33 +08:00
parent 1e5fd5866f
commit 9d565a5d7f
6 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pf_common/src/main/java/com/transitPlatForm/common/core/domain/entity/reg/RegApply.java
View File

@ -54,4 +54,5 @@ public class RegApply {
private String Status;
private String applyid;
private String reqDetailName;
private String bz;
}

1
pf_common/src/main/java/com/transitPlatForm/common/core/domain/entity/reg/RegApplyDetail.java
View File

@ -28,4 +28,5 @@ public class RegApplyDetail {
private BigDecimal amount;
private String itemclass;
private String classid;
private String barcode;
}

8
pf_interfaceCommon/src/main/resources/mapper/RegApplyDetailMapper.xml
View File

@ -23,12 +23,8 @@
</insert>
<select id="queryList" resultType="com.transitPlatForm.common.core.domain.entity.reg.RegApplyDetail">
select * from reg_apply_detail
<where>
<if test="applyid != null and applyid != ''">and applyid = #{applyid}</if>
<if test="uid != null and uid != ''">and uid = #{uid}</if>
</where>
select * from reg_apply_detail where applyid = #{applyid}
<if test="uid != null">and uid = #{uid}</if>
</select>
<update id="update">

8
pf_interfaceCommon/src/main/resources/mapper/RegApplyMapper.xml
View File

@ -43,6 +43,7 @@
<if test="applyid != null and applyid !=''">applyid,</if>
<if test="Status != null and Status !=''">Status,</if>
<if test="reqDetailName != null and reqDetailName !=''">reqDetailName,</if>
<if test="bz != null and bz !=''">bz,</if>
create_by,create_time
)
values (
@ -85,15 +86,13 @@
<if test="applyid != null and applyid !=''">#{applyid},</if>
<if test="Status != null and Status !=''">#{Status},</if>
<if test="reqDetailName != null and reqDetailName !=''">#{reqDetailName},</if>
<if test="bz != null and bz !=''">#{bz},</if>
#{create_by},#{create_time}
)
</insert>
<select id="queryOne" resultType="com.transitPlatForm.common.core.domain.entity.reg.RegApply">
select * from reg_apply
<where>
<if test="applyid != null and applyid != ''">and applyid = #{applyid}</if>
</where>
select * from reg_apply where applyid = #{applyid}
</select>
<update id="update">
@ -141,6 +140,7 @@
<if test="update_time != null">update_time = #{update_time},</if>
<if test="Status != null and Status != ''">Status = #{Status},</if>
<if test="reqDetailName != null and reqDetailName != ''">reqDetailName = #{reqDetailName},</if>
<if test="bz != null and bz != ''">bz = #{bz},</if>
applyid = #{applyid}
</set>
where applyid = #{applyid}

15
pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/impl/RegRequestInfoServiceImpl.java
View File

@ -1,14 +1,18 @@
package com.transitPlatForm.transitPF.service.impl;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.json.JSONUtil;
import com.transitPlatForm.common.core.domain.Result;
import com.transitPlatForm.common.core.domain.entity.reg.*;
import com.transitPlatForm.common.utils.SecurityUtils;
import com.transitPlatForm.interfaceCommon.mapper.CommonMapper;
import com.transitPlatForm.interfaceCommon.mapper.RegApplyDetailMapper;
import com.transitPlatForm.interfaceCommon.mapper.RegApplyMapper;
import com.transitPlatForm.interfaceCommon.utils.CommonUtil;
import com.transitPlatForm.interfaceCommon.utils.LisUtil;
import com.transitPlatForm.interfaceCommon.utils.LoginConfigParamUtil;
import com.transitPlatForm.interfaceCommon.websocket.WebSocketMessage;
import com.transitPlatForm.transitPF.mapper.RegRequestInfoMapper;
import com.transitPlatForm.transitPF.mapper.RegTransitSampleMapper;
import com.transitPlatForm.transitPF.pojo.DTO.RegRequestInfoDTO;
@ -148,9 +152,9 @@ public class RegRequestInfoServiceImpl implements RegRequestInfoService {
if(barcodeList.contains(transitSampleDetail.getBarcode())) continue;
barcodeList.add(transitSampleDetail.getBarcode());
}
Result result = printBar(barcodeList);
if(!result.equals("0")) return result;
for (String barCode: barcodeList) {
Result result = printBar(barCode);
if(!result.equals("0")) return result;
//修改状态
applicationContext.getBean(RegRequestInfoServiceImpl.class).updatePrintStatus(applyId,barCode);
@ -185,7 +189,7 @@ public class RegRequestInfoServiceImpl implements RegRequestInfoService {
*/
public Result createBarcode(String applyId){
String ls_nopriceitems = "";
if(applyId == null || applyId.equals("")) return new Result("-1","申请单号不能为空！");
RegApply regApply = regApplyMapper.queryOne(applyId);
if(regApply == null) return new Result("0","没有找到申请单信息！");
RegApplyDetail regApplyDetail1 = new RegApplyDetail();
@ -252,6 +256,7 @@ public class RegRequestInfoServiceImpl implements RegRequestInfoService {
reqSqdInfo.put("sample_SrcHospBarcode",itemClass); //条码类别
reqSqdInfo.put("sample_UserCode",regApply.getUserCode());
reqSqdInfo.put("sample_UserName",regApply.getUserName());
reqSqdInfo.put("sample_bz",regApply.getBz());
reqSqdInfo.put("detail_OrderItemCode",regApplyDetail.getOrderItemCode());
reqSqdInfo.put("detail_OrderItemName",regApplyDetail.getOrderItemName());
@ -362,6 +367,7 @@ public class RegRequestInfoServiceImpl implements RegRequestInfoService {
regTransitSample.setCheckPUR(jymd);
regTransitSample.setCreate_by(LisUtil.isBank(stringObjectMap.get("sample_UserCode")));
regTransitSample.setCreate_time(commonUtil.getCurrentTime());
regTransitSample.setExpressNum(LisUtil.isBank(stringObjectMap.get("sample_bz")));
regTransitSampleList.add(k,regTransitSample);
}
@ -423,7 +429,7 @@ public class RegRequestInfoServiceImpl implements RegRequestInfoService {
* 打印条码
* @param barcode
*/
public Result printBar(String barcode){
public Result printBar(List<String> barcode){
return null;
}
@ -446,6 +452,7 @@ public class RegRequestInfoServiceImpl implements RegRequestInfoService {
public List<String> getBarcodeList(String applyId){
List<String> barcodeList = new ArrayList<>();
if(applyId == null || applyId.equals("")) return barcodeList;
RegTransitSampleDetail regTransitSampleDetail = new RegTransitSampleDetail();
regTransitSampleDetail.setApplyid(applyId);
List<RegTransitSampleDetail> regTransitSampleDetailList = regTransitSampleMapper.getRegTransitSampleDetail(regTransitSampleDetail);

5
pf_transitPF/src/main/resources/mapper/RegRequestInfoMapper.xml
View File

@ -6,12 +6,13 @@
<select id="queryRegRequestInfo" resultType="com.transitPlatForm.common.core.domain.entity.reg.RegApply">
<![CDATA[select * from reg_apply where OrderTime >= #{begdate} and OrderTime <= #{enddate} ]]>
<if test="patId != null and patId != ''"> and PatId = #{patId}</if>
<if test="brxm != null and brxm != ''">and PatName like '%'+brxm+'%'</if>
<if test="brxm != null and brxm != ''">and PatName like '%'+#{brxm}+'%'</if>
<if test="status != null and status != ''">and Status = #{status}</if>
</select>
<select id="queryReqDetail" resultType="com.transitPlatForm.common.core.domain.entity.reg.RegApplyDetail">
select a.*,b.itemclass, c.classid from reg_apply_detail a,reg_item b,reg_itemclass c where a.applyid = #{applyId} and a.OrderItemCode = b.itemcode and c.itemclass_code = b.itemclass
select a.*,b.itemclass, c.classid,d.barcode from reg_apply_detail a left join reg_TransitSample_detail d on (d.applyid = a.applyid and d.applyDetailId = a.uid),reg_item b,reg_itemclass c
where a.applyid = #{applyid} and a.OrderItemCode = b.itemcode and c.itemclass_code = b.itemclass
</select>
<select id="getItemInfo" resultType="map">