Merge branch 'dev-1.1.4' into 'dev-1.1.4'

优化追溯码显示

See merge request lihong/thmz_system!118

src/main/java/cn/hnthyy/thmz/mapper/his/yp/YpManuBarCodeMapper.java

@@ -65,4 +65,14 @@ public interface YpManuBarCodeMapper {
     @Update(" update yp_manu_bar_code set manu_no = #{manuNo} where in_docu_no = #{inDocuNo} and charge_code = #{chargeCode} ")
     int updateYpManuBarInfoByInDocuNo(@Param("inDocuNo") String inDocuNo, @Param("chargeCode") String chargeCode, @Param("manuNo") String manuNo);
 
+    /**
+     * @Description 根据关键字查询追溯码
+     * @Author hsh
+     * @param inDocuNo 药单号 chargeCode 药品编码 manuNo 生产批号
+     * @return
+     * @Date 2025/4/7 0007 9:42
+     */
+    @Select(" select * from yp_manu_bar_code where in_docu_no = #{inDocuNo} and charge_code = #{chargeCode} and manu_no = #{manuNo} ")
+    YpManuBarCode selectYpManuBarInfoByCode(@Param("inDocuNo") String inDocuNo, @Param("chargeCode") String chargeCode, @Param("manuNo") String manuNo);
+
 }

src/main/java/cn/hnthyy/thmz/service/impl/his/yp/YpInDetlServiceImpl.java

@@ -83,6 +83,10 @@ public class YpInDetlServiceImpl implements YpInDetlService {
             BeanUtils.copyProperties(inDetl, ypInDetlVo);
             ypInDetlVo.setSupplyName(ypZdSupplyMapper.selectNameByCode(inDetl.getSupplyCode()));
             ypInDetlVo.setManufactoryName(ypZdManufactoryMapper.selectYpZdManufactoryByCode(inDetl.getManuCode()));
+            YpManuBarCode barCode = ypManuBarCodeMapper.selectYpManuBarInfoByCode(inDetl.getInDocuNo(), inDetl.getChargeCode(), inDetl.getManuNo());
+            if(null != barCode){
+                ypInDetlVo.setDrugTracCodg(barCode.getDrugTracCodg());
+            }
             ypInDetlVos.add(ypInDetlVo);
         });
         return ypInDetlVos;